13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""Tests for the Branch facility that are not interface tests.
19
For interface tests see `tests/per_branch/*.py`.
19
For interface tests see tests/branch_implementations/*.py.
21
21
For concrete class tests see this file, and for meta-branch tests
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,
37
from bzrlib.branchfmt.fullhistory import (
35
from bzrlib.branch import (
39
BranchReferenceFormat,
44
_run_with_write_locked_target,
43
class TestDefaultFormat(tests.TestCase):
46
from bzrlib.bzrdir import (BzrDirMetaFormat1, BzrDirMeta1,
48
from bzrlib.errors import (NotBranchError,
51
UnsupportedFormatError,
54
from bzrlib.tests import TestCase, TestCaseWithTransport
55
from bzrlib.transport import get_transport
58
class TestDefaultFormat(TestCase):
45
60
def test_default_format(self):
46
61
# update this if you change the default branch format
47
self.assertIsInstance(_mod_branch.format_registry.get_default(),
48
_mod_branch.BzrBranchFormat7)
62
self.assertIsInstance(BranchFormat.get_default_format(),
50
65
def test_default_format_is_same_as_bzrdir_default(self):
51
66
# XXX: it might be nice if there was only one place the default was
52
# set, but at the moment that's not true -- mbp 20070814 --
67
# set, but at the moment that's not true -- mbp 20070814 --
53
68
# https://bugs.launchpad.net/bzr/+bug/132376
55
_mod_branch.format_registry.get_default(),
56
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
69
self.assertEqual(BranchFormat.get_default_format(),
70
BzrDirFormat.get_default_format().get_branch_format())
58
72
def test_get_set_default_format(self):
59
73
# set the format and then set it back again
60
old_format = _mod_branch.format_registry.get_default()
61
_mod_branch.format_registry.set_default(SampleBranchFormat())
74
old_format = BranchFormat.get_default_format()
75
BranchFormat.set_default_format(SampleBranchFormat())
63
77
# the default branch format is used by the meta dir format
64
78
# which is not the default bzrdir format at this point
65
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
79
dir = BzrDirMetaFormat1().initialize('memory:///')
66
80
result = dir.create_branch()
67
81
self.assertEqual(result, 'A branch')
69
_mod_branch.format_registry.set_default(old_format)
70
self.assertEqual(old_format,
71
_mod_branch.format_registry.get_default())
74
class TestBranchFormat5(tests.TestCaseWithTransport):
83
BranchFormat.set_default_format(old_format)
84
self.assertEqual(old_format, BranchFormat.get_default_format())
87
class TestBranchFormat5(TestCaseWithTransport):
75
88
"""Tests specific to branch format 5"""
77
90
def test_branch_format_5_uses_lockdir(self):
78
91
url = self.get_url()
79
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
80
bdir.create_repository()
81
branch = BzrBranchFormat5().initialize(bdir)
92
bzrdir = BzrDirMetaFormat1().initialize(url)
93
bzrdir.create_repository()
94
branch = bzrdir.create_branch()
82
95
t = self.get_transport()
83
96
self.log("branch instance is %r" % branch)
84
97
self.assert_(isinstance(branch, BzrBranch5))
100
126
"push_location = foo\n"
101
127
"push_location:policy = norecurse\n" % local_path,
102
config.locations_config_filename())
104
130
# TODO RBC 20051029 test getting a push location from a branch in a
105
131
# recursive section - that is, it appends the branch name.
108
class SampleBranchFormat(_mod_branch.BranchFormatMetadir):
134
class SampleBranchFormat(BranchFormat):
109
135
"""A sample format
111
this format is initializable, unsupported to aid in testing the
137
this format is initializable, unsupported to aid in testing the
112
138
open and open_downlevel routines.
116
def get_format_string(cls):
141
def get_format_string(self):
117
142
"""See BzrBranchFormat.get_format_string()."""
118
143
return "Sample branch format."
120
def initialize(self, a_bzrdir, name=None, repository=None,
121
append_revisions_only=None):
145
def initialize(self, a_bzrdir):
122
146
"""Format 4 branches cannot be created."""
123
t = a_bzrdir.get_branch_transport(self, name=name)
147
t = a_bzrdir.get_branch_transport(self)
124
148
t.put_bytes('format', self.get_format_string())
125
149
return 'A branch'
127
151
def is_supported(self):
130
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
131
possible_transports=None):
154
def open(self, transport, _found=False):
132
155
return "opened branch."
135
# Demonstrating how lazy loading is often implemented:
136
# A constant string is created.
137
SampleSupportedBranchFormatString = "Sample supported branch format."
139
# And the format class can then reference the constant to avoid skew.
140
class SampleSupportedBranchFormat(_mod_branch.BranchFormatMetadir):
141
"""A sample supported format."""
144
def get_format_string(cls):
145
"""See BzrBranchFormat.get_format_string()."""
146
return SampleSupportedBranchFormatString
148
def initialize(self, a_bzrdir, name=None, append_revisions_only=None):
149
t = a_bzrdir.get_branch_transport(self, name=name)
150
t.put_bytes('format', self.get_format_string())
153
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
154
possible_transports=None):
155
return "opened supported branch."
158
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
159
"""A sample format that is not usable in a metadir."""
161
def get_format_string(self):
162
# This format is not usable in a metadir.
165
def network_name(self):
166
# Network name always has to be provided.
169
def initialize(self, a_bzrdir, name=None):
170
raise NotImplementedError(self.initialize)
172
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
173
possible_transports=None):
174
raise NotImplementedError(self.open)
177
class TestBzrBranchFormat(tests.TestCaseWithTransport):
158
class TestBzrBranchFormat(TestCaseWithTransport):
178
159
"""Tests for the BzrBranchFormat facility."""
180
161
def test_find_format(self):
181
162
# is the right format object found for a branch?
182
163
# create a branch with a few known format objects.
183
# this is not quite the same as
164
# this is not quite the same as
184
165
self.build_tree(["foo/", "bar/"])
185
166
def check_format(format, url):
186
167
dir = format._matchingbzrdir.initialize(url)
187
168
dir.create_repository()
188
169
format.initialize(dir)
189
found_format = _mod_branch.BranchFormatMetadir.find_format(dir)
190
self.assertIsInstance(found_format, format.__class__)
170
found_format = BranchFormat.find_format(dir)
171
self.failUnless(isinstance(found_format, format.__class__))
191
172
check_format(BzrBranchFormat5(), "bar")
193
def test_find_format_factory(self):
194
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
195
SampleSupportedBranchFormat().initialize(dir)
196
factory = _mod_branch.MetaDirBranchFormatFactory(
197
SampleSupportedBranchFormatString,
198
"bzrlib.tests.test_branch", "SampleSupportedBranchFormat")
199
_mod_branch.format_registry.register(factory)
200
self.addCleanup(_mod_branch.format_registry.remove, factory)
201
b = _mod_branch.Branch.open(self.get_url())
202
self.assertEqual(b, "opened supported branch.")
204
def test_from_string(self):
205
self.assertIsInstance(
206
SampleBranchFormat.from_string("Sample branch format."),
208
self.assertRaises(AssertionError,
209
SampleBranchFormat.from_string, "Different branch format.")
211
174
def test_find_format_not_branch(self):
212
175
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
213
self.assertRaises(errors.NotBranchError,
214
_mod_branch.BranchFormatMetadir.find_format,
176
self.assertRaises(NotBranchError,
177
BranchFormat.find_format,
217
180
def test_find_format_unknown_format(self):
218
181
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
219
182
SampleBranchFormat().initialize(dir)
220
self.assertRaises(errors.UnknownFormatError,
221
_mod_branch.BranchFormatMetadir.find_format,
183
self.assertRaises(UnknownFormatError,
184
BranchFormat.find_format,
224
def test_find_format_with_features(self):
225
tree = self.make_branch_and_tree('.', format='2a')
226
tree.branch.update_feature_flags({"name": "optional"})
227
found_format = _mod_branch.BranchFormatMetadir.find_format(tree.bzrdir)
228
self.assertIsInstance(found_format, _mod_branch.BranchFormatMetadir)
229
self.assertEquals(found_format.features.get("name"), "optional")
230
tree.branch.update_feature_flags({"name": None})
231
branch = _mod_branch.Branch.open('.')
232
self.assertEquals(branch._format.features, {})
235
class TestBranchFormatRegistry(tests.TestCase):
238
super(TestBranchFormatRegistry, self).setUp()
239
self.registry = _mod_branch.BranchFormatRegistry()
241
def test_default(self):
242
self.assertIs(None, self.registry.get_default())
243
format = SampleBranchFormat()
244
self.registry.set_default(format)
245
self.assertEquals(format, self.registry.get_default())
247
187
def test_register_unregister_format(self):
248
188
format = SampleBranchFormat()
249
self.registry.register(format)
250
self.assertEquals(format,
251
self.registry.get("Sample branch format."))
252
self.registry.remove(format)
253
self.assertRaises(KeyError, self.registry.get,
254
"Sample branch format.")
256
def test_get_all(self):
257
format = SampleBranchFormat()
258
self.assertEquals([], self.registry._get_all())
259
self.registry.register(format)
260
self.assertEquals([format], self.registry._get_all())
262
def test_register_extra(self):
263
format = SampleExtraBranchFormat()
264
self.assertEquals([], self.registry._get_all())
265
self.registry.register_extra(format)
266
self.assertEquals([format], self.registry._get_all())
268
def test_register_extra_lazy(self):
269
self.assertEquals([], self.registry._get_all())
270
self.registry.register_extra_lazy("bzrlib.tests.test_branch",
271
"SampleExtraBranchFormat")
272
formats = self.registry._get_all()
273
self.assertEquals(1, len(formats))
274
self.assertIsInstance(formats[0], SampleExtraBranchFormat)
277
#Used by TestMetaDirBranchFormatFactory
278
FakeLazyFormat = None
281
class TestMetaDirBranchFormatFactory(tests.TestCase):
283
def test_get_format_string_does_not_load(self):
284
"""Formats have a static format string."""
285
factory = _mod_branch.MetaDirBranchFormatFactory("yo", None, None)
286
self.assertEqual("yo", factory.get_format_string())
288
def test_call_loads(self):
289
# __call__ is used by the network_format_registry interface to get a
291
global FakeLazyFormat
293
factory = _mod_branch.MetaDirBranchFormatFactory(None,
294
"bzrlib.tests.test_branch", "FakeLazyFormat")
295
self.assertRaises(AttributeError, factory)
297
def test_call_returns_call_of_referenced_object(self):
298
global FakeLazyFormat
299
FakeLazyFormat = lambda:'called'
300
factory = _mod_branch.MetaDirBranchFormatFactory(None,
301
"bzrlib.tests.test_branch", "FakeLazyFormat")
302
self.assertEqual('called', factory())
190
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
192
format.initialize(dir)
193
# register a format for it.
194
BranchFormat.register_format(format)
195
# which branch.Open will refuse (not supported)
196
self.assertRaises(UnsupportedFormatError, Branch.open, self.get_url())
197
self.make_branch_and_tree('foo')
198
# but open_downlevel will work
199
self.assertEqual(format.open(dir), bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
200
# unregister the format
201
BranchFormat.unregister_format(format)
202
self.make_branch_and_tree('bar')
305
205
class TestBranch67(object):
327
227
def test_layout(self):
328
228
branch = self.make_branch('a', format=self.get_format_name())
329
self.assertPathExists('a/.bzr/branch/last-revision')
330
self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
331
self.assertPathDoesNotExist('a/.bzr/branch/references')
229
self.failUnlessExists('a/.bzr/branch/last-revision')
230
self.failIfExists('a/.bzr/branch/revision-history')
333
232
def test_config(self):
334
233
"""Ensure that all configuration data is stored in the branch"""
335
234
branch = self.make_branch('a', format=self.get_format_name())
336
branch.set_parent('http://example.com')
337
self.assertPathDoesNotExist('a/.bzr/branch/parent')
338
self.assertEqual('http://example.com', branch.get_parent())
339
branch.set_push_location('sftp://example.com')
340
conf = branch.get_config_stack()
341
self.assertEqual('sftp://example.com', conf.get('push_location'))
342
branch.set_bound_location('ftp://example.com')
343
self.assertPathDoesNotExist('a/.bzr/branch/bound')
344
self.assertEqual('ftp://example.com', branch.get_bound_location())
235
branch.set_parent('http://bazaar-vcs.org')
236
self.failIfExists('a/.bzr/branch/parent')
237
self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
238
branch.set_push_location('sftp://bazaar-vcs.org')
239
config = branch.get_config()._get_branch_data_config()
240
self.assertEqual('sftp://bazaar-vcs.org',
241
config.get_user_option('push_location'))
242
branch.set_bound_location('ftp://bazaar-vcs.org')
243
self.failIfExists('a/.bzr/branch/bound')
244
self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
246
def test_set_revision_history(self):
247
builder = self.make_branch_builder('.', format=self.get_format_name())
248
builder.build_snapshot('foo', None,
249
[('add', ('', None, 'directory', None))],
251
builder.build_snapshot('bar', None, [], message='bar')
252
branch = builder.get_branch()
254
self.addCleanup(branch.unlock)
255
branch.set_revision_history(['foo', 'bar'])
256
branch.set_revision_history(['foo'])
257
self.assertRaises(errors.NotLefthandHistory,
258
branch.set_revision_history, ['bar'])
346
260
def do_checkout_test(self, lightweight=False):
347
261
tree = self.make_branch_and_tree('source',
448
378
self.assertTrue(branch.repository.has_revision(revid))
451
class BzrBranch8(tests.TestCaseWithTransport):
453
def make_branch(self, location, format=None):
455
format = controldir.format_registry.make_bzrdir('1.9')
456
format.set_branch_format(_mod_branch.BzrBranchFormat8())
457
return tests.TestCaseWithTransport.make_branch(
458
self, location, format=format)
460
def create_branch_with_reference(self):
461
branch = self.make_branch('branch')
462
branch._set_all_reference_info({'file-id': ('path', 'location')})
466
def instrument_branch(branch, gets):
467
old_get = branch._transport.get
468
def get(*args, **kwargs):
469
gets.append((args, kwargs))
470
return old_get(*args, **kwargs)
471
branch._transport.get = get
473
def test_reference_info_caching_read_locked(self):
475
branch = self.create_branch_with_reference()
477
self.addCleanup(branch.unlock)
478
self.instrument_branch(branch, gets)
479
branch.get_reference_info('file-id')
480
branch.get_reference_info('file-id')
481
self.assertEqual(1, len(gets))
483
def test_reference_info_caching_read_unlocked(self):
485
branch = self.create_branch_with_reference()
486
self.instrument_branch(branch, gets)
487
branch.get_reference_info('file-id')
488
branch.get_reference_info('file-id')
489
self.assertEqual(2, len(gets))
491
def test_reference_info_caching_write_locked(self):
493
branch = self.make_branch('branch')
495
self.instrument_branch(branch, gets)
496
self.addCleanup(branch.unlock)
497
branch._set_all_reference_info({'file-id': ('path2', 'location2')})
498
path, location = branch.get_reference_info('file-id')
499
self.assertEqual(0, len(gets))
500
self.assertEqual('path2', path)
501
self.assertEqual('location2', location)
503
def test_reference_info_caches_cleared(self):
504
branch = self.make_branch('branch')
506
branch.set_reference_info('file-id', 'path2', 'location2')
508
doppelganger = _mod_branch.Branch.open('branch')
509
doppelganger.set_reference_info('file-id', 'path3', 'location3')
510
self.assertEqual(('path3', 'location3'),
511
branch.get_reference_info('file-id'))
513
def _recordParentMapCalls(self, repo):
514
self._parent_map_calls = []
515
orig_get_parent_map = repo.revisions.get_parent_map
516
def get_parent_map(q):
518
self._parent_map_calls.extend([e[0] for e in q])
519
return orig_get_parent_map(q)
520
repo.revisions.get_parent_map = get_parent_map
523
class TestBranchReference(tests.TestCaseWithTransport):
381
class TestBranchReference(TestCaseWithTransport):
524
382
"""Tests for the branch reference facility."""
526
384
def test_create_open_reference(self):
527
385
bzrdirformat = bzrdir.BzrDirMetaFormat1()
528
t = self.get_transport()
386
t = get_transport(self.get_url('.'))
530
388
dir = bzrdirformat.initialize(self.get_url('repo'))
531
389
dir.create_repository()
532
390
target_branch = dir.create_branch()
533
391
t.mkdir('branch')
534
392
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
535
made_branch = _mod_branch.BranchReferenceFormat().initialize(
536
branch_dir, target_branch=target_branch)
393
made_branch = BranchReferenceFormat().initialize(branch_dir, target_branch)
537
394
self.assertEqual(made_branch.base, target_branch.base)
538
395
opened_branch = branch_dir.open_branch()
539
396
self.assertEqual(opened_branch.base, target_branch.base)
541
398
def test_get_reference(self):
542
"""For a BranchReference, get_reference should return the location."""
399
"""For a BranchReference, get_reference should reutrn the location."""
543
400
branch = self.make_branch('target')
544
401
checkout = branch.create_checkout('checkout', lightweight=True)
545
402
reference_url = branch.bzrdir.root_transport.abspath('') + '/'
550
407
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
553
class TestHooks(tests.TestCaseWithTransport):
410
class TestHooks(TestCase):
555
412
def test_constructor(self):
556
413
"""Check that creating a BranchHooks instance has the right defaults."""
557
hooks = _mod_branch.BranchHooks()
414
hooks = BranchHooks()
415
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
558
416
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
559
417
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
560
418
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
561
419
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
562
self.assertTrue("post_uncommit" in hooks,
563
"post_uncommit not in %s" % hooks)
420
self.assertTrue("post_uncommit" in hooks, "post_uncommit not in %s" % hooks)
564
421
self.assertTrue("post_change_branch_tip" in hooks,
565
422
"post_change_branch_tip not in %s" % hooks)
566
self.assertTrue("post_branch_init" in hooks,
567
"post_branch_init not in %s" % hooks)
568
self.assertTrue("post_switch" in hooks,
569
"post_switch not in %s" % hooks)
571
424
def test_installed_hooks_are_BranchHooks(self):
572
425
"""The installed hooks object should be a BranchHooks."""
573
426
# the installed hooks are saved in self._preserved_hooks.
574
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
575
_mod_branch.BranchHooks)
577
def test_post_branch_init_hook(self):
579
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
581
self.assertLength(0, calls)
582
branch = self.make_branch('a')
583
self.assertLength(1, calls)
585
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
586
self.assertTrue(hasattr(params, 'bzrdir'))
587
self.assertTrue(hasattr(params, 'branch'))
589
def test_post_branch_init_hook_repr(self):
591
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
592
lambda params: param_reprs.append(repr(params)), None)
593
branch = self.make_branch('a')
594
self.assertLength(1, param_reprs)
595
param_repr = param_reprs[0]
596
self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
598
def test_post_switch_hook(self):
599
from bzrlib import switch
601
_mod_branch.Branch.hooks.install_named_hook('post_switch',
603
tree = self.make_branch_and_tree('branch-1')
604
self.build_tree(['branch-1/file-1'])
607
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
608
self.build_tree(['branch-1/file-2'])
610
tree.remove('file-1')
612
checkout = tree.branch.create_checkout('checkout')
613
self.assertLength(0, calls)
614
switch.switch(checkout.bzrdir, to_branch)
615
self.assertLength(1, calls)
617
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
618
self.assertTrue(hasattr(params, 'to_branch'))
619
self.assertTrue(hasattr(params, 'revision_id'))
622
class TestBranchOptions(tests.TestCaseWithTransport):
625
super(TestBranchOptions, self).setUp()
626
self.branch = self.make_branch('.')
627
self.config_stack = self.branch.get_config_stack()
629
def check_append_revisions_only(self, expected_value, value=None):
630
"""Set append_revisions_only in config and check its interpretation."""
631
if value is not None:
632
self.config_stack.set('append_revisions_only', value)
633
self.assertEqual(expected_value,
634
self.branch.get_append_revisions_only())
636
def test_valid_append_revisions_only(self):
637
self.assertEquals(None,
638
self.config_stack.get('append_revisions_only'))
639
self.check_append_revisions_only(None)
640
self.check_append_revisions_only(False, 'False')
641
self.check_append_revisions_only(True, 'True')
642
# The following values will cause compatibility problems on projects
643
# using older bzr versions (<2.2) but are accepted
644
self.check_append_revisions_only(False, 'false')
645
self.check_append_revisions_only(True, 'true')
647
def test_invalid_append_revisions_only(self):
648
"""Ensure warning is noted on invalid settings"""
651
self.warnings.append(args[0] % args[1:])
652
self.overrideAttr(trace, 'warning', warning)
653
self.check_append_revisions_only(None, 'not-a-bool')
654
self.assertLength(1, self.warnings)
656
'Value "not-a-bool" is not valid for "append_revisions_only"',
659
def test_use_fresh_values(self):
660
copy = _mod_branch.Branch.open(self.branch.base)
663
copy.get_config_stack().set('foo', 'bar')
666
self.assertFalse(self.branch.is_locked())
667
# Since the branch is locked, the option value won't be saved on disk
668
# so trying to access the config of locked branch via another older
669
# non-locked branch object pointing to the same branch is not supported
670
self.assertEqual(None, self.branch.get_config_stack().get('foo'))
671
# Using a newly created branch object works as expected
672
fresh = _mod_branch.Branch.open(self.branch.base)
673
self.assertEqual('bar', fresh.get_config_stack().get('foo'))
675
def test_set_from_config_get_from_config_stack(self):
676
self.branch.lock_write()
677
self.addCleanup(self.branch.unlock)
678
self.branch.get_config().set_user_option('foo', 'bar')
679
result = self.branch.get_config_stack().get('foo')
680
# https://bugs.launchpad.net/bzr/+bug/948344
681
self.expectFailure('BranchStack uses cache after set_user_option',
682
self.assertEqual, 'bar', result)
684
def test_set_from_config_stack_get_from_config(self):
685
self.branch.lock_write()
686
self.addCleanup(self.branch.unlock)
687
self.branch.get_config_stack().set('foo', 'bar')
688
# Since the branch is locked, the option value won't be saved on disk
689
# so mixing get() and get_user_option() is broken by design.
690
self.assertEqual(None,
691
self.branch.get_config().get_user_option('foo'))
693
def test_set_delays_write_when_branch_is_locked(self):
694
self.branch.lock_write()
695
self.addCleanup(self.branch.unlock)
696
self.branch.get_config_stack().set('foo', 'bar')
697
copy = _mod_branch.Branch.open(self.branch.base)
698
result = copy.get_config_stack().get('foo')
699
# Accessing from a different branch object is like accessing from a
700
# different process: the option has not been saved yet and the new
701
# value cannot be seen.
702
self.assertIs(None, result)
705
class TestPullResult(tests.TestCase):
707
def test_report_changed(self):
708
r = _mod_branch.PullResult()
709
r.old_revid = "old-revid"
427
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch], BranchHooks)
430
class TestPullResult(TestCase):
432
def test_pull_result_to_int(self):
433
# to support old code, the pull result can be used as an int
711
r.new_revid = "new-revid"
715
self.assertEqual("Now on revision 20.\n", f.getvalue())
716
self.assertEqual("Now on revision 20.\n", f.getvalue())
718
def test_report_unchanged(self):
719
r = _mod_branch.PullResult()
720
r.old_revid = "same-revid"
721
r.new_revid = "same-revid"
724
self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
437
# this usage of results is not recommended for new code (because it
438
# doesn't describe very well what happened), but for api stability
439
# it's still supported
440
a = "%d revisions pulled" % r
441
self.assertEqual(a, "10 revisions pulled")
445
class _StubLockable(object):
446
"""Helper for TestRunWithWriteLockedTarget."""
448
def __init__(self, calls, unlock_exc=None):
450
self.unlock_exc = unlock_exc
452
def lock_write(self):
453
self.calls.append('lock_write')
456
self.calls.append('unlock')
457
if self.unlock_exc is not None:
458
raise self.unlock_exc
461
class _ErrorFromCallable(Exception):
462
"""Helper for TestRunWithWriteLockedTarget."""
465
class _ErrorFromUnlock(Exception):
466
"""Helper for TestRunWithWriteLockedTarget."""
469
class TestRunWithWriteLockedTarget(TestCase):
470
"""Tests for _run_with_write_locked_target."""
475
def func_that_returns_ok(self):
476
self._calls.append('func called')
479
def func_that_raises(self):
480
self._calls.append('func called')
481
raise _ErrorFromCallable()
483
def test_success_unlocks(self):
484
lockable = _StubLockable(self._calls)
485
result = _run_with_write_locked_target(
486
lockable, self.func_that_returns_ok)
487
self.assertEqual('ok', result)
488
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
490
def test_exception_unlocks_and_propagates(self):
491
lockable = _StubLockable(self._calls)
492
self.assertRaises(_ErrorFromCallable,
493
_run_with_write_locked_target, lockable, self.func_that_raises)
494
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
496
def test_callable_succeeds_but_error_during_unlock(self):
497
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
498
self.assertRaises(_ErrorFromUnlock,
499
_run_with_write_locked_target, lockable, self.func_that_returns_ok)
500
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
502
def test_error_during_unlock_does_not_mask_original_error(self):
503
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
504
self.assertRaises(_ErrorFromCallable,
505
_run_with_write_locked_target, lockable, self.func_that_raises)
506
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
added
removed
bzrlib/tests/test_branch.py
