/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2009-07-29 21:35:05 UTC
  • mfrom: (4576 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4577.
  • Revision ID: john@arbash-meinel.com-20090729213505-tkqsvy1zfpocu75w
Merge bzr.dev 4576 in prep for NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
35
35
from bzrlib.transport import memory
36
36
 
37
37
 
 
38
def load_tests(standard_tests, module, loader):
 
39
    """Multiply tests for the push command."""
 
40
    result = loader.suiteClass()
 
41
 
 
42
    # one for each king of change
 
43
    changes_tests, remaining_tests = tests.split_suite_by_condition(
 
44
        standard_tests, tests.condition_isinstance((
 
45
                TestPushStrictWithChanges,
 
46
                )))
 
47
    changes_scenarios = [
 
48
        ('uncommitted',
 
49
         dict(_changes_type= '_uncommitted_changes')),
 
50
        ('pending-merges',
 
51
         dict(_changes_type= '_pending_merges')),
 
52
        ('out-of-sync-trees',
 
53
         dict(_changes_type= '_out_of_sync_trees')),
 
54
        ]
 
55
    tests.multiply_tests(changes_tests, changes_scenarios, result)
 
56
    # No parametrization for the remaining tests
 
57
    result.addTests(remaining_tests)
 
58
 
 
59
    return result
 
60
 
 
61
 
38
62
class TestPush(tests.TestCaseWithTransport):
39
63
 
40
64
    def test_push_error_on_vfs_http(self):
86
110
                           working_dir='branch_a', retcode=3)
87
111
        self.assertEquals(out,
88
112
                ('','bzr: ERROR: These branches have diverged.  '
89
 
                    'Try using "merge" and then "push".\n'))
 
113
                 'See "bzr help diverged-branches" for more information.\n'))
90
114
        self.assertEquals(osutils.abspath(branch_a.get_push_location()),
91
115
                          osutils.abspath(branch_b.bzrdir.root_transport.base))
92
116
 
215
239
        remote = branch.Branch.open('public')
216
240
        self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
217
241
 
 
242
    def test_push_smart_tags_streaming_acceptance(self):
 
243
        self.setup_smart_server_with_call_log()
 
244
        t = self.make_branch_and_tree('from')
 
245
        rev_id = t.commit(allow_pointless=True, message='first commit')
 
246
        t.branch.tags.set_tag('new-tag', rev_id)
 
247
        self.reset_smart_call_log()
 
248
        self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
 
249
        # This figure represent the amount of work to perform this use case. It
 
250
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
251
        # being too low. If rpc_count increases, more network roundtrips have
 
252
        # become necessary for this use case. Please do not adjust this number
 
253
        # upwards without agreement from bzr's network support maintainers.
 
254
        self.assertLength(11, self.hpss_calls)
 
255
 
 
256
    def test_push_smart_with_default_stacking_url_path_segment(self):
 
257
        # If the default stacked-on location is a path element then branches
 
258
        # we push there over the smart server are stacked and their
 
259
        # stacked_on_url is that exact path segment. Added to nail bug 385132.
 
260
        self.setup_smart_server_with_call_log()
 
261
        self.make_branch('stack-on', format='1.9')
 
262
        self.make_bzrdir('.').get_config().set_default_stack_on(
 
263
            '/stack-on')
 
264
        self.make_branch('from', format='1.9')
 
265
        out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
 
266
        b = branch.Branch.open(self.get_url('to'))
 
267
        self.assertEqual('/extra/stack-on', b.get_stacked_on_url())
 
268
 
 
269
    def test_push_smart_with_default_stacking_relative_path(self):
 
270
        # If the default stacked-on location is a relative path then branches
 
271
        # we push there over the smart server are stacked and their
 
272
        # stacked_on_url is a relative path. Added to nail bug 385132.
 
273
        self.setup_smart_server_with_call_log()
 
274
        self.make_branch('stack-on', format='1.9')
 
275
        self.make_bzrdir('.').get_config().set_default_stack_on('stack-on')
 
276
        self.make_branch('from', format='1.9')
 
277
        out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
 
278
        b = branch.Branch.open(self.get_url('to'))
 
279
        self.assertEqual('../stack-on', b.get_stacked_on_url())
 
280
 
218
281
    def create_simple_tree(self):
219
282
        tree = self.make_branch_and_tree('tree')
220
283
        self.build_tree(['tree/a'])
450
513
        # subsequent log is accurate
451
514
        self.assertNotContainsRe(out, 'rev1')
452
515
 
 
516
    def test_push_from_subdir(self):
 
517
        t = self.make_branch_and_tree('tree')
 
518
        self.build_tree(['tree/dir/', 'tree/dir/file'])
 
519
        t.add('dir', 'dir/file')
 
520
        t.commit('r1')
 
521
        out, err = self.run_bzr('push ../../pushloc', working_dir='tree/dir')
 
522
        self.assertEqual('', out)
 
523
        self.assertEqual('Created new branch.\n', err)
 
524
 
453
525
 
454
526
class RedirectingMemoryTransport(memory.MemoryTransport):
455
527
 
456
528
    def mkdir(self, relpath, mode=None):
457
 
        from bzrlib.trace import mutter
458
529
        if self._cwd == '/source/':
459
530
            raise errors.RedirectRequested(self.abspath(relpath),
460
531
                                           self.abspath('../target'),
467
538
            return super(RedirectingMemoryTransport, self).mkdir(
468
539
                relpath, mode)
469
540
 
 
541
    def get(self, relpath):
 
542
        if self.clone(relpath)._cwd == '/infinite-loop/':
 
543
            raise errors.RedirectRequested(self.abspath(relpath),
 
544
                                           self.abspath('../infinite-loop'),
 
545
                                           is_permanent=True)
 
546
        else:
 
547
            return super(RedirectingMemoryTransport, self).get(relpath)
 
548
 
470
549
    def _redirected_to(self, source, target):
471
550
        # We do accept redirections
472
551
        return transport.get_transport(target)
530
609
             % re.escape(destination_url)],
531
610
            ['push', '-d', 'tree', destination_url], retcode=3)
532
611
        self.assertEqual('', out)
 
612
 
 
613
 
 
614
class TestPushStrictMixin(object):
 
615
 
 
616
    def make_local_branch_and_tree(self):
 
617
        self.tree = self.make_branch_and_tree('local')
 
618
        self.build_tree_contents([('local/file', 'initial')])
 
619
        self.tree.add('file')
 
620
        self.tree.commit('adding file', rev_id='added')
 
621
        self.build_tree_contents([('local/file', 'modified')])
 
622
        self.tree.commit('modify file', rev_id='modified')
 
623
 
 
624
    def set_config_push_strict(self, value):
 
625
        # set config var (any of bazaar.conf, locations.conf, branch.conf
 
626
        # should do)
 
627
        conf = self.tree.branch.get_config()
 
628
        conf.set_user_option('push_strict', value)
 
629
 
 
630
    _default_command = ['push', '../to']
 
631
    _default_wd = 'local'
 
632
    _default_errors = ['Working tree ".*/local/" has uncommitted '
 
633
                       'changes \(See bzr status\)\.',]
 
634
    _default_pushed_revid = 'modified'
 
635
 
 
636
    def assertPushFails(self, args):
 
637
        self.run_bzr_error(self._default_errors, self._default_command + args,
 
638
                           working_dir=self._default_wd, retcode=3)
 
639
 
 
640
    def assertPushSucceeds(self, args, pushed_revid=None):
 
641
        self.run_bzr(self._default_command + args,
 
642
                     working_dir=self._default_wd)
 
643
        if pushed_revid is None:
 
644
            pushed_revid = self._default_pushed_revid
 
645
        tree_to = workingtree.WorkingTree.open('to')
 
646
        repo_to = tree_to.branch.repository
 
647
        self.assertTrue(repo_to.has_revision(pushed_revid))
 
648
        self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
 
649
 
 
650
 
 
651
 
 
652
class TestPushStrictWithoutChanges(tests.TestCaseWithTransport,
 
653
                                   TestPushStrictMixin):
 
654
 
 
655
    def setUp(self):
 
656
        super(TestPushStrictWithoutChanges, self).setUp()
 
657
        self.make_local_branch_and_tree()
 
658
 
 
659
    def test_push_default(self):
 
660
        self.assertPushSucceeds([])
 
661
 
 
662
    def test_push_strict(self):
 
663
        self.assertPushSucceeds(['--strict'])
 
664
 
 
665
    def test_push_no_strict(self):
 
666
        self.assertPushSucceeds(['--no-strict'])
 
667
 
 
668
    def test_push_config_var_strict(self):
 
669
        self.set_config_push_strict('true')
 
670
        self.assertPushSucceeds([])
 
671
 
 
672
    def test_push_config_var_no_strict(self):
 
673
        self.set_config_push_strict('false')
 
674
        self.assertPushSucceeds([])
 
675
 
 
676
 
 
677
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
 
678
                                TestPushStrictMixin):
 
679
 
 
680
    _changes_type = None # Set by load_tests
 
681
 
 
682
    def setUp(self):
 
683
        super(TestPushStrictWithChanges, self).setUp()
 
684
        getattr(self, self._changes_type)()
 
685
 
 
686
    def _uncommitted_changes(self):
 
687
        self.make_local_branch_and_tree()
 
688
        # Make a change without committing it
 
689
        self.build_tree_contents([('local/file', 'in progress')])
 
690
 
 
691
    def _pending_merges(self):
 
692
        self.make_local_branch_and_tree()
 
693
        # Create 'other' branch containing a new file
 
694
        other_bzrdir = self.tree.bzrdir.sprout('other')
 
695
        other_tree = other_bzrdir.open_workingtree()
 
696
        self.build_tree_contents([('other/other-file', 'other')])
 
697
        other_tree.add('other-file')
 
698
        other_tree.commit('other commit', rev_id='other')
 
699
        # Merge and revert, leaving a pending merge
 
700
        self.tree.merge_from_branch(other_tree.branch)
 
701
        self.tree.revert(filenames=['other-file'], backups=False)
 
702
 
 
703
    def _out_of_sync_trees(self):
 
704
        self.make_local_branch_and_tree()
 
705
        self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
 
706
        # Make a change and commit it
 
707
        self.build_tree_contents([('local/file', 'modified in local')])
 
708
        self.tree.commit('modify file', rev_id='modified-in-local')
 
709
        # Exercise commands from the checkout directory
 
710
        self._default_wd = 'checkout'
 
711
        self._default_errors = ["Working tree is out of date, please run"
 
712
                                " 'bzr update'\.",]
 
713
        self._default_pushed_revid = 'modified-in-local'
 
714
 
 
715
    def test_push_default(self):
 
716
        self.assertPushFails([])
 
717
 
 
718
    def test_push_with_revision(self):
 
719
        self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
 
720
 
 
721
    def test_push_no_strict(self):
 
722
        self.assertPushSucceeds(['--no-strict'])
 
723
 
 
724
    def test_push_strict_with_changes(self):
 
725
        self.assertPushFails(['--strict'])
 
726
 
 
727
    def test_push_respect_config_var_strict(self):
 
728
        self.set_config_push_strict('true')
 
729
        self.assertPushFails([])
 
730
 
 
731
    def test_push_bogus_config_var_ignored(self):
 
732
        self.set_config_push_strict("I don't want you to be strict")
 
733
        self.assertPushFails([])
 
734
 
 
735
    def test_push_no_strict_command_line_override_config(self):
 
736
        self.set_config_push_strict('yES')
 
737
        self.assertPushFails([])
 
738
        self.assertPushSucceeds(['--no-strict'])
 
739
 
 
740
    def test_push_strict_command_line_override_config(self):
 
741
        self.set_config_push_strict('oFF')
 
742
        self.assertPushFails(['--strict'])
 
743
        self.assertPushSucceeds([])