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/per_branch/*.py.
21
21
For concrete class tests see this file, and for meta-branch tests
22
22
also see this file.
25
from io import StringIO
25
from cStringIO import StringIO
29
28
branch as _mod_branch,
38
branch as _mod_bzrbranch,
41
from ..bzr.fullhistory import (
47
class TestErrors(tests.TestCase):
49
def test_unstackable_branch_format(self):
52
error = _mod_branch.UnstackableBranchFormat(format, url)
54
"The branch '/foo'(foo) is not a stackable format. "
55
"You will need to upgrade the branch to permit branch stacking.",
59
39
class TestDefaultFormat(tests.TestCase):
61
41
def test_default_format(self):
62
42
# update this if you change the default branch format
63
self.assertIsInstance(_mod_branch.format_registry.get_default(),
64
_mod_bzrbranch.BzrBranchFormat7)
43
self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
44
_mod_branch.BzrBranchFormat7)
66
46
def test_default_format_is_same_as_bzrdir_default(self):
67
47
# XXX: it might be nice if there was only one place the default was
68
48
# set, but at the moment that's not true -- mbp 20070814 --
69
49
# https://bugs.launchpad.net/bzr/+bug/132376
71
_mod_branch.format_registry.get_default(),
51
_mod_branch.BranchFormat.get_default_format(),
72
52
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
74
54
def test_get_set_default_format(self):
75
55
# set the format and then set it back again
76
old_format = _mod_branch.format_registry.get_default()
77
_mod_branch.format_registry.set_default(
56
old_format = _mod_branch.BranchFormat.get_default_format()
57
_mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
80
59
# the default branch format is used by the meta dir format
81
60
# which is not the default bzrdir format at this point
107
86
self.assertIsDirectory('.bzr/branch/lock/held', t)
109
88
def test_set_push_location(self):
110
conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
89
from bzrlib.config import (locations_config_filename,
90
ensure_config_dir_exists)
91
ensure_config_dir_exists()
92
fn = locations_config_filename()
93
# write correct newlines to locations.conf
94
# by default ConfigObj uses native line-endings for new files
95
# but uses already existing line-endings if file is not empty
98
f.write('# comment\n')
112
102
branch = self.make_branch('.', format='knit')
113
103
branch.set_push_location('foo')
114
104
local_path = urlutils.local_path_from_url(branch.base[:-1])
115
self.assertFileEqual(b"# comment\n"
117
b"push_location = foo\n"
118
b"push_location:policy = norecurse\n" % local_path.encode(
120
bedding.locations_config_path())
105
self.assertFileEqual("# comment\n"
107
"push_location = foo\n"
108
"push_location:policy = norecurse\n" % local_path,
122
111
# TODO RBC 20051029 test getting a push location from a branch in a
123
112
# recursive section - that is, it appends the branch name.
126
class SampleBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
115
class SampleBranchFormat(_mod_branch.BranchFormat):
127
116
"""A sample format
129
118
this format is initializable, unsupported to aid in testing the
130
119
open and open_downlevel routines.
134
def get_format_string(cls):
122
def get_format_string(self):
135
123
"""See BzrBranchFormat.get_format_string()."""
136
return b"Sample branch format."
124
return "Sample branch format."
138
def initialize(self, a_controldir, name=None, repository=None,
139
append_revisions_only=None):
126
def initialize(self, a_bzrdir, name=None):
140
127
"""Format 4 branches cannot be created."""
141
t = a_controldir.get_branch_transport(self, name=name)
128
t = a_bzrdir.get_branch_transport(self, name=name)
142
129
t.put_bytes('format', self.get_format_string())
143
130
return 'A branch'
145
132
def is_supported(self):
148
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
149
possible_transports=None):
135
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
150
136
return "opened branch."
153
139
# Demonstrating how lazy loading is often implemented:
154
140
# A constant string is created.
155
SampleSupportedBranchFormatString = b"Sample supported branch format."
141
SampleSupportedBranchFormatString = "Sample supported branch format."
157
143
# And the format class can then reference the constant to avoid skew.
160
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
144
class SampleSupportedBranchFormat(_mod_branch.BranchFormat):
161
145
"""A sample supported format."""
164
def get_format_string(cls):
147
def get_format_string(self):
165
148
"""See BzrBranchFormat.get_format_string()."""
166
149
return SampleSupportedBranchFormatString
168
def initialize(self, a_controldir, name=None, append_revisions_only=None):
169
t = a_controldir.get_branch_transport(self, name=name)
151
def initialize(self, a_bzrdir, name=None):
152
t = a_bzrdir.get_branch_transport(self, name=name)
170
153
t.put_bytes('format', self.get_format_string())
171
154
return 'A branch'
173
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
174
possible_transports=None):
156
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
175
157
return "opened supported branch."
178
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
179
"""A sample format that is not usable in a metadir."""
181
def get_format_string(self):
182
# This format is not usable in a metadir.
185
def network_name(self):
186
# Network name always has to be provided.
189
def initialize(self, a_controldir, name=None):
190
raise NotImplementedError(self.initialize)
192
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
193
possible_transports=None):
194
raise NotImplementedError(self.open)
197
160
class TestBzrBranchFormat(tests.TestCaseWithTransport):
198
161
"""Tests for the BzrBranchFormat facility."""
202
165
# create a branch with a few known format objects.
203
166
# this is not quite the same as
204
167
self.build_tree(["foo/", "bar/"])
206
168
def check_format(format, url):
207
dir = format._matchingcontroldir.initialize(url)
169
dir = format._matchingbzrdir.initialize(url)
208
170
dir.create_repository()
209
171
format.initialize(dir)
210
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
211
self.assertIsInstance(found_format, format.__class__)
212
check_format(BzrBranchFormat5(), "bar")
172
found_format = _mod_branch.BranchFormat.find_format(dir)
173
self.failUnless(isinstance(found_format, format.__class__))
174
check_format(_mod_branch.BzrBranchFormat5(), "bar")
214
def test_from_string(self):
215
self.assertIsInstance(
216
SampleBranchFormat.from_string(b"Sample branch format."),
218
self.assertRaises(AssertionError,
219
SampleBranchFormat.from_string, b"Different branch format.")
176
def test_find_format_factory(self):
177
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
178
SampleSupportedBranchFormat().initialize(dir)
179
factory = _mod_branch.MetaDirBranchFormatFactory(
180
SampleSupportedBranchFormatString,
181
"bzrlib.tests.test_branch", "SampleSupportedBranchFormat")
182
_mod_branch.BranchFormat.register_format(factory)
183
self.addCleanup(_mod_branch.BranchFormat.unregister_format, factory)
184
b = _mod_branch.Branch.open(self.get_url())
185
self.assertEqual(b, "opened supported branch.")
221
187
def test_find_format_not_branch(self):
222
188
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
223
189
self.assertRaises(errors.NotBranchError,
224
_mod_bzrbranch.BranchFormatMetadir.find_format,
190
_mod_branch.BranchFormat.find_format,
227
193
def test_find_format_unknown_format(self):
228
194
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
229
195
SampleBranchFormat().initialize(dir)
230
196
self.assertRaises(errors.UnknownFormatError,
231
_mod_bzrbranch.BranchFormatMetadir.find_format,
197
_mod_branch.BranchFormat.find_format,
234
def test_find_format_with_features(self):
235
tree = self.make_branch_and_tree('.', format='2a')
236
tree.branch.update_feature_flags({b"name": b"optional"})
237
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(
239
self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
240
self.assertEqual(found_format.features.get(b"name"), b"optional")
241
tree.branch.update_feature_flags({b"name": None})
242
branch = _mod_branch.Branch.open('.')
243
self.assertEqual(branch._format.features, {})
246
class TestBranchFormatRegistry(tests.TestCase):
249
super(TestBranchFormatRegistry, self).setUp()
250
self.registry = _mod_branch.BranchFormatRegistry()
252
def test_default(self):
253
self.assertIs(None, self.registry.get_default())
254
format = SampleBranchFormat()
255
self.registry.set_default(format)
256
self.assertEqual(format, self.registry.get_default())
258
200
def test_register_unregister_format(self):
259
201
format = SampleBranchFormat()
260
self.registry.register(format)
261
self.assertEqual(format,
262
self.registry.get(b"Sample branch format."))
263
self.registry.remove(format)
264
self.assertRaises(KeyError, self.registry.get,
265
b"Sample branch format.")
267
def test_get_all(self):
268
format = SampleBranchFormat()
269
self.assertEqual([], self.registry._get_all())
270
self.registry.register(format)
271
self.assertEqual([format], self.registry._get_all())
273
def test_register_extra(self):
274
format = SampleExtraBranchFormat()
275
self.assertEqual([], self.registry._get_all())
276
self.registry.register_extra(format)
277
self.assertEqual([format], self.registry._get_all())
279
def test_register_extra_lazy(self):
280
self.assertEqual([], self.registry._get_all())
281
self.registry.register_extra_lazy("breezy.tests.test_branch",
282
"SampleExtraBranchFormat")
283
formats = self.registry._get_all()
284
self.assertEqual(1, len(formats))
285
self.assertIsInstance(formats[0], SampleExtraBranchFormat)
203
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
205
format.initialize(dir)
206
# register a format for it.
207
_mod_branch.BranchFormat.register_format(format)
208
# which branch.Open will refuse (not supported)
209
self.assertRaises(errors.UnsupportedFormatError,
210
_mod_branch.Branch.open, self.get_url())
211
self.make_branch_and_tree('foo')
212
# but open_downlevel will work
215
bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
216
# unregister the format
217
_mod_branch.BranchFormat.unregister_format(format)
218
self.make_branch_and_tree('bar')
221
#Used by TestMetaDirBranchFormatFactory
222
FakeLazyFormat = None
225
class TestMetaDirBranchFormatFactory(tests.TestCase):
227
def test_get_format_string_does_not_load(self):
228
"""Formats have a static format string."""
229
factory = _mod_branch.MetaDirBranchFormatFactory("yo", None, None)
230
self.assertEqual("yo", factory.get_format_string())
232
def test_call_loads(self):
233
# __call__ is used by the network_format_registry interface to get a
235
global FakeLazyFormat
237
factory = _mod_branch.MetaDirBranchFormatFactory(None,
238
"bzrlib.tests.test_branch", "FakeLazyFormat")
239
self.assertRaises(AttributeError, factory)
241
def test_call_returns_call_of_referenced_object(self):
242
global FakeLazyFormat
243
FakeLazyFormat = lambda:'called'
244
factory = _mod_branch.MetaDirBranchFormatFactory(None,
245
"bzrlib.tests.test_branch", "FakeLazyFormat")
246
self.assertEqual('called', factory())
288
249
class TestBranch67(object):
310
271
def test_layout(self):
311
272
branch = self.make_branch('a', format=self.get_format_name())
312
self.assertPathExists('a/.bzr/branch/last-revision')
313
self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
314
self.assertPathDoesNotExist('a/.bzr/branch/references')
273
self.failUnlessExists('a/.bzr/branch/last-revision')
274
self.failIfExists('a/.bzr/branch/revision-history')
275
self.failIfExists('a/.bzr/branch/references')
316
277
def test_config(self):
317
278
"""Ensure that all configuration data is stored in the branch"""
318
279
branch = self.make_branch('a', format=self.get_format_name())
319
branch.set_parent('http://example.com')
320
self.assertPathDoesNotExist('a/.bzr/branch/parent')
321
self.assertEqual('http://example.com', branch.get_parent())
322
branch.set_push_location('sftp://example.com')
323
conf = branch.get_config_stack()
324
self.assertEqual('sftp://example.com', conf.get('push_location'))
325
branch.set_bound_location('ftp://example.com')
326
self.assertPathDoesNotExist('a/.bzr/branch/bound')
327
self.assertEqual('ftp://example.com', branch.get_bound_location())
329
def do_checkout_test(self, lightweight):
280
branch.set_parent('http://bazaar-vcs.org')
281
self.failIfExists('a/.bzr/branch/parent')
282
self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
283
branch.set_push_location('sftp://bazaar-vcs.org')
284
config = branch.get_config()._get_branch_data_config()
285
self.assertEqual('sftp://bazaar-vcs.org',
286
config.get_user_option('push_location'))
287
branch.set_bound_location('ftp://bazaar-vcs.org')
288
self.failIfExists('a/.bzr/branch/bound')
289
self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
291
def test_set_revision_history(self):
292
builder = self.make_branch_builder('.', format=self.get_format_name())
293
builder.build_snapshot('foo', None,
294
[('add', ('', None, 'directory', None))],
296
builder.build_snapshot('bar', None, [], message='bar')
297
branch = builder.get_branch()
299
self.addCleanup(branch.unlock)
300
branch.set_revision_history(['foo', 'bar'])
301
branch.set_revision_history(['foo'])
302
self.assertRaises(errors.NotLefthandHistory,
303
branch.set_revision_history, ['bar'])
305
def do_checkout_test(self, lightweight=False):
330
306
tree = self.make_branch_and_tree('source',
331
format=self.get_format_name_subtree())
307
format=self.get_format_name_subtree())
332
308
subtree = self.make_branch_and_tree('source/subtree',
333
format=self.get_format_name_subtree())
309
format=self.get_format_name_subtree())
334
310
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
335
format=self.get_format_name_subtree())
311
format=self.get_format_name_subtree())
336
312
self.build_tree(['source/subtree/file',
337
313
'source/subtree/subsubtree/file'])
338
314
subsubtree.add('file')
339
315
subtree.add('file')
340
316
subtree.add_reference(subsubtree)
341
subtree.set_reference_info('subsubtree', subsubtree.branch.user_url)
342
317
tree.add_reference(subtree)
343
tree.set_reference_info('subtree', subtree.branch.user_url)
344
318
tree.commit('a revision')
345
319
subtree.commit('a subtree file')
346
320
subsubtree.commit('a subsubtree file')
347
321
tree.branch.create_checkout('target', lightweight=lightweight)
348
self.assertPathExists('target')
349
self.assertPathExists('target/subtree')
350
self.assertPathExists('target/subtree/file')
351
self.assertPathExists('target/subtree/subsubtree/file')
322
self.failUnlessExists('target')
323
self.failUnlessExists('target/subtree')
324
self.failUnlessExists('target/subtree/file')
325
self.failUnlessExists('target/subtree/subsubtree/file')
352
326
subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
354
328
self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
481
469
branch.lock_write()
482
470
self.instrument_branch(branch, gets)
483
471
self.addCleanup(branch.unlock)
484
branch._set_all_reference_info({'path2': ('location2', b'file-id')})
485
location, file_id = branch.get_reference_info('path2')
472
branch._set_all_reference_info({'file-id': ('path2', 'location2')})
473
path, location = branch.get_reference_info('file-id')
486
474
self.assertEqual(0, len(gets))
487
self.assertEqual(b'file-id', file_id)
475
self.assertEqual('path2', path)
488
476
self.assertEqual('location2', location)
490
478
def test_reference_info_caches_cleared(self):
491
479
branch = self.make_branch('branch')
492
with branch.lock_write():
493
branch.set_reference_info(b'file-id', 'location2', 'path2')
481
branch.set_reference_info('file-id', 'path2', 'location2')
494
483
doppelganger = _mod_branch.Branch.open('branch')
495
doppelganger.set_reference_info(b'file-id', 'location3', 'path3')
496
self.assertEqual(('location3', 'path3'),
497
branch.get_reference_info(b'file-id'))
499
def _recordParentMapCalls(self, repo):
500
self._parent_map_calls = []
501
orig_get_parent_map = repo.revisions.get_parent_map
503
def get_parent_map(q):
505
self._parent_map_calls.extend([e[0] for e in q])
506
return orig_get_parent_map(q)
507
repo.revisions.get_parent_map = get_parent_map
484
doppelganger.set_reference_info('file-id', 'path3', 'location3')
485
self.assertEqual(('path3', 'location3'),
486
branch.get_reference_info('file-id'))
510
488
class TestBranchReference(tests.TestCaseWithTransport):
511
489
"""Tests for the branch reference facility."""
513
491
def test_create_open_reference(self):
514
492
bzrdirformat = bzrdir.BzrDirMetaFormat1()
515
t = self.get_transport()
493
t = transport.get_transport(self.get_url('.'))
517
495
dir = bzrdirformat.initialize(self.get_url('repo'))
518
496
dir.create_repository()
519
497
target_branch = dir.create_branch()
520
498
t.mkdir('branch')
521
499
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
522
made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
500
made_branch = _mod_branch.BranchReferenceFormat().initialize(
523
501
branch_dir, target_branch=target_branch)
524
502
self.assertEqual(made_branch.base, target_branch.base)
525
503
opened_branch = branch_dir.open_branch()
526
504
self.assertEqual(opened_branch.base, target_branch.base)
528
506
def test_get_reference(self):
529
"""For a BranchReference, get_reference should return the location."""
507
"""For a BranchReference, get_reference should reutrn the location."""
530
508
branch = self.make_branch('target')
531
509
checkout = branch.create_checkout('checkout', lightweight=True)
532
reference_url = branch.controldir.root_transport.abspath('') + '/'
510
reference_url = branch.bzrdir.root_transport.abspath('') + '/'
533
511
# if the api for create_checkout changes to return different checkout types
534
512
# then this file read will fail.
535
self.assertFileEqual(reference_url.encode('utf-8'),
536
'checkout/.bzr/branch/location')
513
self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
537
514
self.assertEqual(reference_url,
538
_mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.controldir))
515
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
541
518
class TestHooks(tests.TestCaseWithTransport):
566
543
def test_post_branch_init_hook(self):
568
545
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
570
547
self.assertLength(0, calls)
571
548
branch = self.make_branch('a')
572
549
self.assertLength(1, calls)
573
550
params = calls[0]
574
551
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
575
self.assertTrue(hasattr(params, 'controldir'))
552
self.assertTrue(hasattr(params, 'bzrdir'))
576
553
self.assertTrue(hasattr(params, 'branch'))
578
def test_post_branch_init_hook_repr(self):
580
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
581
lambda params: param_reprs.append(repr(params)), None)
582
branch = self.make_branch('a')
583
self.assertLength(1, param_reprs)
584
param_repr = param_reprs[0]
585
self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
587
555
def test_post_switch_hook(self):
588
from .. import switch
556
from bzrlib import switch
590
558
_mod_branch.Branch.hooks.install_named_hook('post_switch',
592
560
tree = self.make_branch_and_tree('branch-1')
593
561
self.build_tree(['branch-1/file-1'])
594
562
tree.add('file-1')
595
563
tree.commit('rev1')
596
to_branch = tree.controldir.sprout('branch-2').open_branch()
564
to_branch = tree.bzrdir.sprout('branch-2').open_branch()
597
565
self.build_tree(['branch-1/file-2'])
598
566
tree.add('file-2')
599
567
tree.remove('file-1')
600
568
tree.commit('rev2')
601
569
checkout = tree.branch.create_checkout('checkout')
602
570
self.assertLength(0, calls)
603
switch.switch(checkout.controldir, to_branch)
571
switch.switch(checkout.bzrdir, to_branch)
604
572
self.assertLength(1, calls)
605
573
params = calls[0]
606
574
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
636
604
def test_invalid_append_revisions_only(self):
637
605
"""Ensure warning is noted on invalid settings"""
638
606
self.warnings = []
640
607
def warning(*args):
641
608
self.warnings.append(args[0] % args[1:])
642
609
self.overrideAttr(trace, 'warning', warning)
643
610
self.check_append_revisions_only(None, 'not-a-bool')
644
611
self.assertLength(1, self.warnings)
645
612
self.assertEqual(
646
'Value "not-a-bool" is not valid for "append_revisions_only"',
613
'Value "not-a-bool" is not a boolean for "append_revisions_only"',
647
614
self.warnings[0])
649
def test_use_fresh_values(self):
650
copy = _mod_branch.Branch.open(self.branch.base)
653
copy.get_config_stack().set('foo', 'bar')
656
self.assertFalse(self.branch.is_locked())
657
# Since the branch is locked, the option value won't be saved on disk
658
# so trying to access the config of locked branch via another older
659
# non-locked branch object pointing to the same branch is not supported
660
self.assertEqual(None, self.branch.get_config_stack().get('foo'))
661
# Using a newly created branch object works as expected
662
fresh = _mod_branch.Branch.open(self.branch.base)
663
self.assertEqual('bar', fresh.get_config_stack().get('foo'))
665
def test_set_from_config_get_from_config_stack(self):
666
self.branch.lock_write()
667
self.addCleanup(self.branch.unlock)
668
self.branch.get_config().set_user_option('foo', 'bar')
669
result = self.branch.get_config_stack().get('foo')
670
# https://bugs.launchpad.net/bzr/+bug/948344
671
self.expectFailure('BranchStack uses cache after set_user_option',
672
self.assertEqual, 'bar', result)
674
def test_set_from_config_stack_get_from_config(self):
675
self.branch.lock_write()
676
self.addCleanup(self.branch.unlock)
677
self.branch.get_config_stack().set('foo', 'bar')
678
# Since the branch is locked, the option value won't be saved on disk
679
# so mixing get() and get_user_option() is broken by design.
680
self.assertEqual(None,
681
self.branch.get_config().get_user_option('foo'))
683
def test_set_delays_write_when_branch_is_locked(self):
684
self.branch.lock_write()
685
self.addCleanup(self.branch.unlock)
686
self.branch.get_config_stack().set('foo', 'bar')
687
copy = _mod_branch.Branch.open(self.branch.base)
688
result = copy.get_config_stack().get('foo')
689
# Accessing from a different branch object is like accessing from a
690
# different process: the option has not been saved yet and the new
691
# value cannot be seen.
692
self.assertIs(None, result)
695
617
class TestPullResult(tests.TestCase):
619
def test_pull_result_to_int(self):
620
# to support old code, the pull result can be used as an int
621
r = _mod_branch.PullResult()
624
# this usage of results is not recommended for new code (because it
625
# doesn't describe very well what happened), but for api stability
626
# it's still supported
627
a = "%d revisions pulled" % r
628
self.assertEqual(a, "10 revisions pulled")
697
630
def test_report_changed(self):
698
631
r = _mod_branch.PullResult()
699
r.old_revid = b"old-revid"
632
r.old_revid = "old-revid"
701
r.new_revid = b"new-revid"
634
r.new_revid = "new-revid"
707
640
def test_report_unchanged(self):
708
641
r = _mod_branch.PullResult()
709
r.old_revid = b"same-revid"
710
r.new_revid = b"same-revid"
642
r.old_revid = "same-revid"
643
r.new_revid = "same-revid"
713
self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
646
self.assertEqual("No revisions to pull.\n", f.getvalue())
649
class _StubLockable(object):
650
"""Helper for TestRunWithWriteLockedTarget."""
652
def __init__(self, calls, unlock_exc=None):
654
self.unlock_exc = unlock_exc
656
def lock_write(self):
657
self.calls.append('lock_write')
660
self.calls.append('unlock')
661
if self.unlock_exc is not None:
662
raise self.unlock_exc
665
class _ErrorFromCallable(Exception):
666
"""Helper for TestRunWithWriteLockedTarget."""
669
class _ErrorFromUnlock(Exception):
670
"""Helper for TestRunWithWriteLockedTarget."""
673
class TestRunWithWriteLockedTarget(tests.TestCase):
674
"""Tests for _run_with_write_locked_target."""
677
tests.TestCase.setUp(self)
680
def func_that_returns_ok(self):
681
self._calls.append('func called')
684
def func_that_raises(self):
685
self._calls.append('func called')
686
raise _ErrorFromCallable()
688
def test_success_unlocks(self):
689
lockable = _StubLockable(self._calls)
690
result = _mod_branch._run_with_write_locked_target(
691
lockable, self.func_that_returns_ok)
692
self.assertEqual('ok', result)
693
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
695
def test_exception_unlocks_and_propagates(self):
696
lockable = _StubLockable(self._calls)
697
self.assertRaises(_ErrorFromCallable,
698
_mod_branch._run_with_write_locked_target,
699
lockable, self.func_that_raises)
700
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
702
def test_callable_succeeds_but_error_during_unlock(self):
703
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
704
self.assertRaises(_ErrorFromUnlock,
705
_mod_branch._run_with_write_locked_target,
706
lockable, self.func_that_returns_ok)
707
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
709
def test_error_during_unlock_does_not_mask_original_error(self):
710
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
711
self.assertRaises(_ErrorFromCallable,
712
_mod_branch._run_with_write_locked_target,
713
lockable, self.func_that_raises)
714
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
added
removed
bzrlib/tests/test_branch.py
