22
22
also see this file.
25
from cStringIO import StringIO
25
from StringIO import StringIO
27
27
from bzrlib import (
28
28
branch as _mod_branch,
39
class TestDefaultFormat(tests.TestCase):
35
from bzrlib.branch import (
39
BranchReferenceFormat,
45
_run_with_write_locked_target,
47
from bzrlib.bzrdir import (BzrDirMetaFormat1, BzrDirMeta1,
49
from bzrlib.errors import (NotBranchError,
52
UnsupportedFormatError,
55
from bzrlib.tests import TestCase, TestCaseWithTransport
56
from bzrlib.transport import get_transport
59
class TestDefaultFormat(TestCase):
41
61
def test_default_format(self):
42
62
# update this if you change the default branch format
43
self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
44
_mod_branch.BzrBranchFormat7)
63
self.assertIsInstance(BranchFormat.get_default_format(),
46
66
def test_default_format_is_same_as_bzrdir_default(self):
47
67
# XXX: it might be nice if there was only one place the default was
48
68
# set, but at the moment that's not true -- mbp 20070814 --
49
69
# https://bugs.launchpad.net/bzr/+bug/132376
51
_mod_branch.BranchFormat.get_default_format(),
52
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
70
self.assertEqual(BranchFormat.get_default_format(),
71
BzrDirFormat.get_default_format().get_branch_format())
54
73
def test_get_set_default_format(self):
55
74
# set the format and then set it back again
56
old_format = _mod_branch.BranchFormat.get_default_format()
57
_mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
75
old_format = BranchFormat.get_default_format()
76
BranchFormat.set_default_format(SampleBranchFormat())
59
78
# the default branch format is used by the meta dir format
60
79
# which is not the default bzrdir format at this point
61
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
80
dir = BzrDirMetaFormat1().initialize('memory:///')
62
81
result = dir.create_branch()
63
82
self.assertEqual(result, 'A branch')
65
_mod_branch.BranchFormat.set_default_format(old_format)
66
self.assertEqual(old_format,
67
_mod_branch.BranchFormat.get_default_format())
70
class TestBranchFormat5(tests.TestCaseWithTransport):
84
BranchFormat.set_default_format(old_format)
85
self.assertEqual(old_format, BranchFormat.get_default_format())
88
class TestBranchFormat5(TestCaseWithTransport):
71
89
"""Tests specific to branch format 5"""
73
91
def test_branch_format_5_uses_lockdir(self):
74
92
url = self.get_url()
75
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
bdir.create_repository()
77
branch = bdir.create_branch()
93
bzrdir = BzrDirMetaFormat1().initialize(url)
94
bzrdir.create_repository()
95
branch = bzrdir.create_branch()
78
96
t = self.get_transport()
79
97
self.log("branch instance is %r" % branch)
80
self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
98
self.assert_(isinstance(branch, BzrBranch5))
81
99
self.assertIsDirectory('.', t)
82
100
self.assertIsDirectory('.bzr/branch', t)
83
101
self.assertIsDirectory('.bzr/branch/lock', t)
84
102
branch.lock_write()
85
self.addCleanup(branch.unlock)
86
self.assertIsDirectory('.bzr/branch/lock/held', t)
104
self.assertIsDirectory('.bzr/branch/lock/held', t)
88
108
def test_set_push_location(self):
89
109
from bzrlib.config import (locations_config_filename,
123
143
"""See BzrBranchFormat.get_format_string()."""
124
144
return "Sample branch format."
126
def initialize(self, a_bzrdir, name=None):
146
def initialize(self, a_bzrdir):
127
147
"""Format 4 branches cannot be created."""
128
t = a_bzrdir.get_branch_transport(self, name=name)
148
t = a_bzrdir.get_branch_transport(self)
129
149
t.put_bytes('format', self.get_format_string())
130
150
return 'A branch'
132
152
def is_supported(self):
135
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
155
def open(self, transport, _found=False, ignore_fallbacks=False):
136
156
return "opened branch."
139
class TestBzrBranchFormat(tests.TestCaseWithTransport):
159
class TestBzrBranchFormat(TestCaseWithTransport):
140
160
"""Tests for the BzrBranchFormat facility."""
142
162
def test_find_format(self):
148
168
dir = format._matchingbzrdir.initialize(url)
149
169
dir.create_repository()
150
170
format.initialize(dir)
151
found_format = _mod_branch.BranchFormat.find_format(dir)
171
found_format = BranchFormat.find_format(dir)
152
172
self.failUnless(isinstance(found_format, format.__class__))
153
check_format(_mod_branch.BzrBranchFormat5(), "bar")
173
check_format(BzrBranchFormat5(), "bar")
155
175
def test_find_format_not_branch(self):
156
176
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
157
self.assertRaises(errors.NotBranchError,
158
_mod_branch.BranchFormat.find_format,
177
self.assertRaises(NotBranchError,
178
BranchFormat.find_format,
161
181
def test_find_format_unknown_format(self):
162
182
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
163
183
SampleBranchFormat().initialize(dir)
164
self.assertRaises(errors.UnknownFormatError,
165
_mod_branch.BranchFormat.find_format,
184
self.assertRaises(UnknownFormatError,
185
BranchFormat.find_format,
168
188
def test_register_unregister_format(self):
173
193
format.initialize(dir)
174
194
# register a format for it.
175
_mod_branch.BranchFormat.register_format(format)
195
BranchFormat.register_format(format)
176
196
# which branch.Open will refuse (not supported)
177
self.assertRaises(errors.UnsupportedFormatError,
178
_mod_branch.Branch.open, self.get_url())
197
self.assertRaises(UnsupportedFormatError, Branch.open, self.get_url())
179
198
self.make_branch_and_tree('foo')
180
199
# but open_downlevel will work
183
bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
200
self.assertEqual(format.open(dir), bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
184
201
# unregister the format
185
_mod_branch.BranchFormat.unregister_format(format)
202
BranchFormat.unregister_format(format)
186
203
self.make_branch_and_tree('bar')
420
436
branch.lock_write()
421
437
branch.set_reference_info('file-id', 'path2', 'location2')
423
doppelganger = _mod_branch.Branch.open('branch')
439
doppelganger = Branch.open('branch')
424
440
doppelganger.set_reference_info('file-id', 'path3', 'location3')
425
441
self.assertEqual(('path3', 'location3'),
426
442
branch.get_reference_info('file-id'))
428
class TestBranchReference(tests.TestCaseWithTransport):
444
class TestBranchReference(TestCaseWithTransport):
429
445
"""Tests for the branch reference facility."""
431
447
def test_create_open_reference(self):
432
448
bzrdirformat = bzrdir.BzrDirMetaFormat1()
433
t = transport.get_transport(self.get_url('.'))
449
t = get_transport(self.get_url('.'))
435
451
dir = bzrdirformat.initialize(self.get_url('repo'))
436
452
dir.create_repository()
437
453
target_branch = dir.create_branch()
438
454
t.mkdir('branch')
439
455
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
440
made_branch = _mod_branch.BranchReferenceFormat().initialize(
441
branch_dir, target_branch=target_branch)
456
made_branch = BranchReferenceFormat().initialize(branch_dir, target_branch)
442
457
self.assertEqual(made_branch.base, target_branch.base)
443
458
opened_branch = branch_dir.open_branch()
444
459
self.assertEqual(opened_branch.base, target_branch.base)
455
470
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
458
class TestHooks(tests.TestCaseWithTransport):
473
class TestHooks(TestCase):
460
475
def test_constructor(self):
461
476
"""Check that creating a BranchHooks instance has the right defaults."""
462
hooks = _mod_branch.BranchHooks()
477
hooks = BranchHooks()
463
478
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
464
479
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
465
480
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
466
481
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
467
482
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
468
self.assertTrue("post_uncommit" in hooks,
469
"post_uncommit not in %s" % hooks)
483
self.assertTrue("post_uncommit" in hooks, "post_uncommit not in %s" % hooks)
470
484
self.assertTrue("post_change_branch_tip" in hooks,
471
485
"post_change_branch_tip not in %s" % hooks)
472
self.assertTrue("post_branch_init" in hooks,
473
"post_branch_init not in %s" % hooks)
474
self.assertTrue("post_switch" in hooks,
475
"post_switch not in %s" % hooks)
477
487
def test_installed_hooks_are_BranchHooks(self):
478
488
"""The installed hooks object should be a BranchHooks."""
479
489
# the installed hooks are saved in self._preserved_hooks.
480
490
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
481
_mod_branch.BranchHooks)
483
def test_post_branch_init_hook(self):
485
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
487
self.assertLength(0, calls)
488
branch = self.make_branch('a')
489
self.assertLength(1, calls)
491
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
492
self.assertTrue(hasattr(params, 'bzrdir'))
493
self.assertTrue(hasattr(params, 'branch'))
495
def test_post_switch_hook(self):
496
from bzrlib import switch
498
_mod_branch.Branch.hooks.install_named_hook('post_switch',
500
tree = self.make_branch_and_tree('branch-1')
501
self.build_tree(['branch-1/file-1'])
504
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
505
self.build_tree(['branch-1/file-2'])
507
tree.remove('file-1')
509
checkout = tree.branch.create_checkout('checkout')
510
self.assertLength(0, calls)
511
switch.switch(checkout.bzrdir, to_branch)
512
self.assertLength(1, calls)
514
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
515
self.assertTrue(hasattr(params, 'to_branch'))
516
self.assertTrue(hasattr(params, 'revision_id'))
519
class TestBranchOptions(tests.TestCaseWithTransport):
522
super(TestBranchOptions, self).setUp()
523
self.branch = self.make_branch('.')
524
self.config = self.branch.get_config()
526
def check_append_revisions_only(self, expected_value, value=None):
527
"""Set append_revisions_only in config and check its interpretation."""
528
if value is not None:
529
self.config.set_user_option('append_revisions_only', value)
530
self.assertEqual(expected_value,
531
self.branch._get_append_revisions_only())
533
def test_valid_append_revisions_only(self):
534
self.assertEquals(None,
535
self.config.get_user_option('append_revisions_only'))
536
self.check_append_revisions_only(None)
537
self.check_append_revisions_only(False, 'False')
538
self.check_append_revisions_only(True, 'True')
539
# The following values will cause compatibility problems on projects
540
# using older bzr versions (<2.2) but are accepted
541
self.check_append_revisions_only(False, 'false')
542
self.check_append_revisions_only(True, 'true')
544
def test_invalid_append_revisions_only(self):
545
"""Ensure warning is noted on invalid settings"""
548
self.warnings.append(args[0] % args[1:])
549
self.overrideAttr(trace, 'warning', warning)
550
self.check_append_revisions_only(None, 'not-a-bool')
551
self.assertLength(1, self.warnings)
553
'Value "not-a-bool" is not a boolean for "append_revisions_only"',
557
class TestPullResult(tests.TestCase):
494
class TestPullResult(TestCase):
559
496
def test_pull_result_to_int(self):
560
497
# to support old code, the pull result can be used as an int
561
r = _mod_branch.PullResult()
564
501
# this usage of results is not recommended for new code (because it
635
572
def test_exception_unlocks_and_propagates(self):
636
573
lockable = _StubLockable(self._calls)
637
574
self.assertRaises(_ErrorFromCallable,
638
_mod_branch._run_with_write_locked_target,
639
lockable, self.func_that_raises)
575
_run_with_write_locked_target, lockable, self.func_that_raises)
640
576
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
642
578
def test_callable_succeeds_but_error_during_unlock(self):
643
579
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
644
580
self.assertRaises(_ErrorFromUnlock,
645
_mod_branch._run_with_write_locked_target,
646
lockable, self.func_that_returns_ok)
581
_run_with_write_locked_target, lockable, self.func_that_returns_ok)
647
582
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
649
584
def test_error_during_unlock_does_not_mask_original_error(self):
650
585
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
651
586
self.assertRaises(_ErrorFromCallable,
652
_mod_branch._run_with_write_locked_target,
653
lockable, self.func_that_raises)
587
_run_with_write_locked_target, lockable, self.func_that_raises)
654
588
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
added
removed
bzrlib/tests/test_branch.py
