← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-16 11:08:11 UTC
  • mfrom: (6521 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120416110811-0y996ihqy9o2bb1t
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012 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
28
28
    branch as _mod_branch,
29
29
    bzrdir,
30
30
    config,
 
31
    controldir,
31
32
    errors,
32
33
    symbol_versioning,
33
34
    tests,
227
228
        branch = _mod_branch.Branch.open('.')
228
229
        self.assertEquals(branch._format.features, {})
229
230
 
230
 
    def test_register_unregister_format(self):
231
 
        # Test the deprecated format registration functions
232
 
        format = SampleBranchFormat()
233
 
        # make a control dir
234
 
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
235
 
        # make a branch
236
 
        format.initialize(dir)
237
 
        # register a format for it.
238
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
239
 
            _mod_branch.BranchFormat.register_format, format)
240
 
        # which branch.Open will refuse (not supported)
241
 
        self.assertRaises(errors.UnsupportedFormatError,
242
 
                          _mod_branch.Branch.open, self.get_url())
243
 
        self.make_branch_and_tree('foo')
244
 
        # but open_downlevel will work
245
 
        self.assertEqual(
246
 
            format.open(dir),
247
 
            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
248
 
        # unregister the format
249
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
250
 
            _mod_branch.BranchFormat.unregister_format, format)
251
 
        self.make_branch_and_tree('bar')
252
 
 
253
231
 
254
232
class TestBranchFormatRegistry(tests.TestCase):
255
233
 
356
334
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
357
335
        self.assertEqual('http://example.com', branch.get_parent())
358
336
        branch.set_push_location('sftp://example.com')
359
 
        config = branch.get_config_stack()
360
 
        self.assertEqual('sftp://example.com', config.get('push_location'))
 
337
        conf = branch.get_config_stack()
 
338
        self.assertEqual('sftp://example.com', conf.get('push_location'))
361
339
        branch.set_bound_location('ftp://example.com')
362
340
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
363
341
        self.assertEqual('ftp://example.com', branch.get_bound_location())
364
342
 
365
 
    def test_set_revision_history(self):
366
 
        builder = self.make_branch_builder('.', format=self.get_format_name())
367
 
        builder.build_snapshot('foo', None,
368
 
            [('add', ('', None, 'directory', None))],
369
 
            message='foo')
370
 
        builder.build_snapshot('bar', None, [], message='bar')
371
 
        branch = builder.get_branch()
372
 
        branch.lock_write()
373
 
        self.addCleanup(branch.unlock)
374
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
375
 
            branch.set_revision_history, ['foo', 'bar'])
376
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
377
 
                branch.set_revision_history, ['foo'])
378
 
        self.assertRaises(errors.NotLefthandHistory,
379
 
            self.applyDeprecated, symbol_versioning.deprecated_in((2, 4, 0)),
380
 
            branch.set_revision_history, ['bar'])
381
 
 
382
343
    def do_checkout_test(self, lightweight=False):
383
344
        tree = self.make_branch_and_tree('source',
384
345
            format=self.get_format_name_subtree())
488
449
 
489
450
    def make_branch(self, location, format=None):
490
451
        if format is None:
491
 
            format = bzrdir.format_registry.make_bzrdir('1.9')
 
452
            format = controldir.format_registry.make_bzrdir('1.9')
492
453
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
493
454
        return tests.TestCaseWithTransport.make_branch(
494
455
            self, location, format=format)
591
552
    def test_constructor(self):
592
553
        """Check that creating a BranchHooks instance has the right defaults."""
593
554
        hooks = _mod_branch.BranchHooks()
594
 
        self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
595
555
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
596
556
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
597
557
        self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
693
653
            'Value "not-a-bool" is not valid for "append_revisions_only"',
694
654
            self.warnings[0])
695
655
 
 
656
    def test_use_fresh_values(self):
 
657
        copy = _mod_branch.Branch.open(self.branch.base)
 
658
        copy.lock_write()
 
659
        try:
 
660
            copy.get_config_stack().set('foo', 'bar')
 
661
        finally:
 
662
            copy.unlock()
 
663
        self.assertFalse(self.branch.is_locked())
 
664
        # Since the branch is locked, the option value won't be saved on disk
 
665
        # so trying to access the config of locked branch via another older
 
666
        # non-locked branch object pointing to the same branch is not supported
 
667
        self.assertEqual(None, self.branch.get_config_stack().get('foo'))
 
668
        # Using a newly created branch object works as expected
 
669
        fresh = _mod_branch.Branch.open(self.branch.base)
 
670
        self.assertEqual('bar', fresh.get_config_stack().get('foo'))
 
671
 
 
672
    def test_set_from_config_get_from_config_stack(self):
 
673
        self.branch.lock_write()
 
674
        self.addCleanup(self.branch.unlock)
 
675
        self.branch.get_config().set_user_option('foo', 'bar')
 
676
        result = self.branch.get_config_stack().get('foo')
 
677
        # https://bugs.launchpad.net/bzr/+bug/948344
 
678
        self.expectFailure('BranchStack uses cache after set_user_option',
 
679
                           self.assertEqual, 'bar', result)
 
680
 
 
681
    def test_set_from_config_stack_get_from_config(self):
 
682
        self.branch.lock_write()
 
683
        self.addCleanup(self.branch.unlock)
 
684
        self.branch.get_config_stack().set('foo', 'bar')
 
685
        # Since the branch is locked, the option value won't be saved on disk
 
686
        # so mixing get() and get_user_option() is broken by design.
 
687
        self.assertEqual(None,
 
688
                         self.branch.get_config().get_user_option('foo'))
 
689
 
 
690
    def test_set_delays_write_when_branch_is_locked(self):
 
691
        self.branch.lock_write()
 
692
        self.addCleanup(self.branch.unlock)
 
693
        self.branch.get_config_stack().set('foo', 'bar')
 
694
        copy = _mod_branch.Branch.open(self.branch.base)
 
695
        result = copy.get_config_stack().get('foo')
 
696
        # Accessing from a different branch object is like accessing from a
 
697
        # different process: the option has not been saved yet and the new
 
698
        # value cannot be seen.
 
699
        self.assertIs(None, result)
 
700
 
696
701
 
697
702
class TestPullResult(tests.TestCase):
698
703
 
699
 
    def test_pull_result_to_int(self):
700
 
        # to support old code, the pull result can be used as an int
701
 
        r = _mod_branch.PullResult()
702
 
        r.old_revno = 10
703
 
        r.new_revno = 20
704
 
        # this usage of results is not recommended for new code (because it
705
 
        # doesn't describe very well what happened), but for api stability
706
 
        # it's still supported
707
 
        self.assertEqual(self.applyDeprecated(
708
 
            symbol_versioning.deprecated_in((2, 3, 0)),
709
 
            r.__int__),
710
 
            10)
711
 
 
712
704
    def test_report_changed(self):
713
705
        r = _mod_branch.PullResult()
714
706
        r.old_revid = "old-revid"