← 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: 2010-02-16 00:53:04 UTC
  • mfrom: (4997.1.3 find-branches-local)
  • Revision ID: pqm@pqm.ubuntu.com-20100216005304-1p8xafkhiizh6ugi
(Jelmer) Add BzrDir.list_branches().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2008 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,
38
37
    test_foreign,
39
38
    test_server,
40
39
    )
41
40
from bzrlib.transport import memory
42
41
 
43
42
 
44
 
load_tests = scenarios.load_tests_apply_scenarios
 
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
45
65
 
46
66
 
47
67
class TestPush(tests.TestCaseWithTransport):
104
124
        transport.delete('branch_b/c')
105
125
        out, err = self.run_bzr('push', working_dir='branch_a')
106
126
        path = branch_a.get_push_location()
 
127
        self.assertEquals(out,
 
128
                          'Using saved push location: %s\n'
 
129
                          % urlutils.local_path_from_url(path))
107
130
        self.assertEqual(err,
108
 
                         'Using saved push location: %s\n'
109
131
                         'All changes applied successfully.\n'
110
 
                         'Pushed up to revision 2.\n'
111
 
                         % urlutils.local_path_from_url(path))
 
132
                         'Pushed up to revision 2.\n')
112
133
        self.assertEqual(path,
113
134
                         branch_b.bzrdir.root_transport.base)
114
135
        # test explicit --remember
125
146
        b2 = branch.Branch.open('pushed-location')
126
147
        self.assertEndsWith(b2.base, 'pushed-location/')
127
148
 
128
 
    def test_push_no_tree(self):
129
 
        # bzr push --no-tree of a branch with working trees
130
 
        b = self.make_branch_and_tree('push-from')
131
 
        self.build_tree(['push-from/file'])
132
 
        b.add('file')
133
 
        b.commit('commit 1')
134
 
        out, err = self.run_bzr('push --no-tree -d push-from push-to')
135
 
        self.assertEqual('', out)
136
 
        self.assertEqual('Created new branch.\n', err)
137
 
        self.assertPathDoesNotExist('push-to/file')
138
 
 
139
149
    def test_push_new_branch_revision_count(self):
140
150
        # bzr push of a branch with revisions to a new location
141
151
        # should print the number of revisions equal to the length of the
148
158
        self.assertEqual('', out)
149
159
        self.assertEqual('Created new branch.\n', err)
150
160
 
151
 
    def test_push_quiet(self):
152
 
        # test that using -q makes output quiet
153
 
        t = self.make_branch_and_tree('tree')
154
 
        self.build_tree(['tree/file'])
155
 
        t.add('file')
156
 
        t.commit('commit 1')
157
 
        self.run_bzr('push -d tree pushed-to')
158
 
        path = t.branch.get_push_location()
159
 
        out, err = self.run_bzr('push', working_dir="tree")
160
 
        self.assertEqual('Using saved push location: %s\nNo new revisions to push.\n' % urlutils.local_path_from_url(path), err)
161
 
        out, err = self.run_bzr('push -q', working_dir="tree")
162
 
        self.assertEqual('', out)
163
 
        self.assertEqual('', err)
164
 
 
165
161
    def test_push_only_pushes_history(self):
166
162
        # Knit branches should only push the history for the current revision.
167
163
        format = bzrdir.BzrDirMetaFormat1()
212
208
        t.commit(allow_pointless=True,
213
209
                message='first commit')
214
210
        self.run_bzr('push -d from to-one')
215
 
        self.assertPathExists('to-one')
 
211
        self.failUnlessExists('to-one')
216
212
        self.run_bzr('push -d %s %s'
217
213
            % tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
218
 
        self.assertPathExists('to-two')
219
 
 
220
 
    def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
221
 
        # See https://bugs.launchpad.net/bzr/+bug/465517
222
 
        target_repo = self.make_repository('target')
223
 
        source = self.make_branch_builder('source')
224
 
        source.start_series()
225
 
        source.build_snapshot('A', None, [
226
 
            ('add', ('', 'root-id', 'directory', None))])
227
 
        source.build_snapshot('B', ['A'], [])
228
 
        source.build_snapshot('C', ['A'], [])
229
 
        source.finish_series()
230
 
        self.run_bzr('push target -d source')
231
 
        self.addCleanup(target_repo.lock_read().unlock)
232
 
        # We should have pushed 'C', but not 'B', since it isn't in the
233
 
        # ancestry
234
 
        self.assertEqual([('A',), ('C',)], sorted(target_repo.revisions.keys()))
 
214
        self.failUnlessExists('to-two')
235
215
 
236
216
    def test_push_smart_non_stacked_streaming_acceptance(self):
237
217
        self.setup_smart_server_with_call_log()
260
240
        # being too low. If rpc_count increases, more network roundtrips have
261
241
        # become necessary for this use case. Please do not adjust this number
262
242
        # upwards without agreement from bzr's network support maintainers.
263
 
        self.assertLength(13, self.hpss_calls)
 
243
        self.assertLength(14, self.hpss_calls)
264
244
        remote = branch.Branch.open('public')
265
245
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
266
246
 
337
317
                     working_dir='tree')
338
318
        new_tree = workingtree.WorkingTree.open('new/tree')
339
319
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
340
 
        self.assertPathExists('new/tree/a')
 
320
        self.failUnlessExists('new/tree/a')
341
321
 
342
322
    def test_push_use_existing(self):
343
323
        """'bzr push --use-existing-dir' can push into an existing dir.
358
338
        new_tree = workingtree.WorkingTree.open('target')
359
339
        self.assertEqual(tree.last_revision(), new_tree.last_revision())
360
340
        # The push should have created target/a
361
 
        self.assertPathExists('target/a')
 
341
        self.failUnlessExists('target/a')
362
342
 
363
343
    def test_push_use_existing_into_empty_bzrdir(self):
364
344
        """'bzr push --use-existing-dir' into a dir with an empty .bzr dir
681
661
    _default_wd = 'local'
682
662
    _default_errors = ['Working tree ".*/local/" has uncommitted '
683
663
                       'changes \(See bzr status\)\.',]
684
 
    _default_additional_error = 'Use --no-strict to force the push.\n'
685
 
    _default_additional_warning = 'Uncommitted changes will not be pushed.'
686
 
 
 
664
    _default_pushed_revid = 'modified'
687
665
 
688
666
    def assertPushFails(self, args):
689
 
        out, err = self.run_bzr_error(self._default_errors,
690
 
                                      self._default_command + args,
691
 
                                      working_dir=self._default_wd, retcode=3)
692
 
        self.assertContainsRe(err, self._default_additional_error)
 
667
        self.run_bzr_error(self._default_errors, self._default_command + args,
 
668
                           working_dir=self._default_wd, retcode=3)
693
669
 
694
 
    def assertPushSucceeds(self, args, with_warning=False, revid_to_push=None):
695
 
        if with_warning:
696
 
            error_regexes = self._default_errors
697
 
        else:
698
 
            error_regexes = []
699
 
        out, err = self.run_bzr(self._default_command + args,
700
 
                                working_dir=self._default_wd,
701
 
                                error_regexes=error_regexes)
702
 
        if with_warning:
703
 
            self.assertContainsRe(err, self._default_additional_warning)
704
 
        else:
705
 
            self.assertNotContainsRe(err, self._default_additional_warning)
706
 
        branch_from = branch.Branch.open(self._default_wd)
707
 
        if revid_to_push is None:
708
 
            revid_to_push = branch_from.last_revision()
709
 
        branch_to = branch.Branch.open('to')
710
 
        repo_to = branch_to.repository
711
 
        self.assertTrue(repo_to.has_revision(revid_to_push))
712
 
        self.assertEqual(revid_to_push, branch_to.last_revision())
 
670
    def assertPushSucceeds(self, args, pushed_revid=None):
 
671
        self.run_bzr(self._default_command + args,
 
672
                     working_dir=self._default_wd)
 
673
        if pushed_revid is None:
 
674
            pushed_revid = self._default_pushed_revid
 
675
        tree_to = workingtree.WorkingTree.open('to')
 
676
        repo_to = tree_to.branch.repository
 
677
        self.assertTrue(repo_to.has_revision(pushed_revid))
 
678
        self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
713
679
 
714
680
 
715
681
 
738
704
        self.assertPushSucceeds([])
739
705
 
740
706
 
741
 
strict_push_change_scenarios = [
742
 
    ('uncommitted',
743
 
        dict(_changes_type= '_uncommitted_changes')),
744
 
    ('pending-merges',
745
 
        dict(_changes_type= '_pending_merges')),
746
 
    ('out-of-sync-trees',
747
 
        dict(_changes_type= '_out_of_sync_trees')),
748
 
    ]
749
 
 
750
 
 
751
707
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
752
708
                                TestPushStrictMixin):
753
709
 
754
 
    scenarios = strict_push_change_scenarios 
755
710
    _changes_type = None # Set by load_tests
756
711
 
757
712
    def setUp(self):
787
742
        self._default_wd = 'checkout'
788
743
        self._default_errors = ["Working tree is out of date, please run"
789
744
                                " 'bzr update'\.",]
 
745
        self._default_pushed_revid = 'modified-in-local'
790
746
 
791
747
    def test_push_default(self):
792
 
        self.assertPushSucceeds([], with_warning=True)
 
748
        self.assertPushFails([])
793
749
 
794
750
    def test_push_with_revision(self):
795
 
        self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
 
751
        self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
796
752
 
797
753
    def test_push_no_strict(self):
798
754
        self.assertPushSucceeds(['--no-strict'])
806
762
 
807
763
    def test_push_bogus_config_var_ignored(self):
808
764
        self.set_config_push_strict("I don't want you to be strict")
809
 
        self.assertPushSucceeds([], with_warning=True)
 
765
        self.assertPushFails([])
810
766
 
811
767
    def test_push_no_strict_command_line_override_config(self):
812
768
        self.set_config_push_strict('yES')
819
775
        self.assertPushSucceeds([])
820
776
 
821
777
 
822
 
class TestPushForeign(tests.TestCaseWithTransport):
 
778
class TestPushForeign(blackbox.ExternalBase):
823
779
 
824
780
    def setUp(self):
825
781
        super(TestPushForeign, self).setUp()