← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-09 08:51:29 UTC
  • mfrom: (5638.2.2 537442-annotate-removed)
  • Revision ID: pqm@pqm.ubuntu.com-20110209085129-0qspgtdaj4gfu2qr
(vila) Annotate deleted files if they can be found in the specified
 revision. (Andrew King)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
34
34
from bzrlib.tests import (
35
35
    blackbox,
36
36
    http_server,
 
37
    scenarios,
37
38
    test_foreign,
38
39
    test_server,
39
40
    )
40
41
from bzrlib.transport import memory
41
42
 
42
43
 
43
 
def load_tests(standard_tests, module, loader):
44
 
    """Multiply tests for the push command."""
45
 
    result = loader.suiteClass()
46
 
 
47
 
    # one for each king of change
48
 
    changes_tests, remaining_tests = tests.split_suite_by_condition(
49
 
        standard_tests, tests.condition_isinstance((
50
 
                TestPushStrictWithChanges,
51
 
                )))
52
 
    changes_scenarios = [
53
 
        ('uncommitted',
54
 
         dict(_changes_type= '_uncommitted_changes')),
55
 
        ('pending-merges',
56
 
         dict(_changes_type= '_pending_merges')),
57
 
        ('out-of-sync-trees',
58
 
         dict(_changes_type= '_out_of_sync_trees')),
59
 
        ]
60
 
    tests.multiply_tests(changes_tests, changes_scenarios, result)
61
 
    # No parametrization for the remaining tests
62
 
    result.addTests(remaining_tests)
63
 
 
64
 
    return result
 
44
load_tests = scenarios.load_tests_apply_scenarios
65
45
 
66
46
 
67
47
class TestPush(tests.TestCaseWithTransport):
146
126
        b2 = branch.Branch.open('pushed-location')
147
127
        self.assertEndsWith(b2.base, 'pushed-location/')
148
128
 
 
129
    def test_push_no_tree(self):
 
130
        # bzr push --no-tree of a branch with working trees
 
131
        b = self.make_branch_and_tree('push-from')
 
132
        self.build_tree(['push-from/file'])
 
133
        b.add('file')
 
134
        b.commit('commit 1')
 
135
        out, err = self.run_bzr('push --no-tree -d push-from push-to')
 
136
        self.assertEqual('', out)
 
137
        self.assertEqual('Created new branch.\n', err)
 
138
        self.failIfExists('push-to/file')
 
139
 
149
140
    def test_push_new_branch_revision_count(self):
150
141
        # bzr push of a branch with revisions to a new location
151
142
        # should print the number of revisions equal to the length of the
240
231
        # being too low. If rpc_count increases, more network roundtrips have
241
232
        # become necessary for this use case. Please do not adjust this number
242
233
        # upwards without agreement from bzr's network support maintainers.
243
 
        self.assertLength(14, self.hpss_calls)
 
234
        self.assertLength(13, self.hpss_calls)
244
235
        remote = branch.Branch.open('public')
245
236
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
246
237
 
718
709
        self.assertPushSucceeds([])
719
710
 
720
711
 
 
712
strict_push_change_scenarios = [
 
713
    ('uncommitted',
 
714
        dict(_changes_type= '_uncommitted_changes')),
 
715
    ('pending-merges',
 
716
        dict(_changes_type= '_pending_merges')),
 
717
    ('out-of-sync-trees',
 
718
        dict(_changes_type= '_out_of_sync_trees')),
 
719
    ]
 
720
 
 
721
 
721
722
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
722
723
                                TestPushStrictMixin):
723
724
 
 
725
    scenarios = strict_push_change_scenarios 
724
726
    _changes_type = None # Set by load_tests
725
727
 
726
728
    def setUp(self):