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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
"""Tests for the Branch facility that are not interface tests.
19
For interface tests see tests/branch_implementations/*.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 StringIO import StringIO
25
from cStringIO import StringIO
27
27
from bzrlib import (
28
28
branch as _mod_branch,
35
from bzrlib.branch import (
39
BranchReferenceFormat,
45
from bzrlib.bzrdir import (BzrDirMetaFormat1, BzrDirMeta1,
47
from bzrlib.errors import (NotBranchError,
50
UnsupportedFormatError,
53
from bzrlib.tests import TestCase, TestCaseWithTransport
54
from bzrlib.transport import get_transport
56
class TestDefaultFormat(TestCase):
39
class TestDefaultFormat(tests.TestCase):
58
41
def test_default_format(self):
59
42
# update this if you change the default branch format
60
self.assertIsInstance(BranchFormat.get_default_format(),
43
self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
44
_mod_branch.BzrBranchFormat7)
63
46
def test_default_format_is_same_as_bzrdir_default(self):
64
47
# XXX: it might be nice if there was only one place the default was
65
# set, but at the moment that's not true -- mbp 20070814 --
48
# set, but at the moment that's not true -- mbp 20070814 --
66
49
# https://bugs.launchpad.net/bzr/+bug/132376
67
self.assertEqual(BranchFormat.get_default_format(),
68
BzrDirFormat.get_default_format().get_branch_format())
51
_mod_branch.BranchFormat.get_default_format(),
52
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
70
54
def test_get_set_default_format(self):
71
55
# set the format and then set it back again
72
old_format = BranchFormat.get_default_format()
73
BranchFormat.set_default_format(SampleBranchFormat())
56
old_format = _mod_branch.BranchFormat.get_default_format()
57
_mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
75
59
# the default branch format is used by the meta dir format
76
60
# which is not the default bzrdir format at this point
77
dir = BzrDirMetaFormat1().initialize('memory:///')
61
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
78
62
result = dir.create_branch()
79
63
self.assertEqual(result, 'A branch')
81
BranchFormat.set_default_format(old_format)
82
self.assertEqual(old_format, BranchFormat.get_default_format())
85
class TestBranchFormat5(TestCaseWithTransport):
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):
86
71
"""Tests specific to branch format 5"""
88
73
def test_branch_format_5_uses_lockdir(self):
89
74
url = self.get_url()
90
bzrdir = BzrDirMetaFormat1().initialize(url)
91
bzrdir.create_repository()
92
branch = bzrdir.create_branch()
75
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
bdir.create_repository()
77
branch = bdir.create_branch()
93
78
t = self.get_transport()
94
79
self.log("branch instance is %r" % branch)
95
self.assert_(isinstance(branch, BzrBranch5))
80
self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
96
81
self.assertIsDirectory('.', t)
97
82
self.assertIsDirectory('.bzr/branch', t)
98
83
self.assertIsDirectory('.bzr/branch/lock', t)
99
84
branch.lock_write()
101
self.assertIsDirectory('.bzr/branch/lock/held', t)
85
self.addCleanup(branch.unlock)
86
self.assertIsDirectory('.bzr/branch/lock/held', t)
105
88
def test_set_push_location(self):
106
89
from bzrlib.config import (locations_config_filename,
107
90
ensure_config_dir_exists)
108
91
ensure_config_dir_exists()
109
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')
110
102
branch = self.make_branch('.', format='knit')
111
103
branch.set_push_location('foo')
112
104
local_path = urlutils.local_path_from_url(branch.base[:-1])
113
self.assertFileEqual("[%s]\n"
105
self.assertFileEqual("# comment\n"
114
107
"push_location = foo\n"
115
"push_location:policy = norecurse" % local_path,
108
"push_location:policy = norecurse\n" % local_path,
118
111
# TODO RBC 20051029 test getting a push location from a branch in a
119
112
# recursive section - that is, it appends the branch name.
122
class SampleBranchFormat(BranchFormat):
115
class SampleBranchFormat(_mod_branch.BranchFormat):
123
116
"""A sample format
125
this format is initializable, unsupported to aid in testing the
118
this format is initializable, unsupported to aid in testing the
126
119
open and open_downlevel routines.
130
123
"""See BzrBranchFormat.get_format_string()."""
131
124
return "Sample branch format."
133
def initialize(self, a_bzrdir):
126
def initialize(self, a_bzrdir, name=None):
134
127
"""Format 4 branches cannot be created."""
135
t = a_bzrdir.get_branch_transport(self)
128
t = a_bzrdir.get_branch_transport(self, name=name)
136
129
t.put_bytes('format', self.get_format_string())
137
130
return 'A branch'
139
132
def is_supported(self):
142
def open(self, transport, _found=False):
135
def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
143
136
return "opened branch."
146
class TestBzrBranchFormat(TestCaseWithTransport):
139
class TestBzrBranchFormat(tests.TestCaseWithTransport):
147
140
"""Tests for the BzrBranchFormat facility."""
149
142
def test_find_format(self):
150
143
# is the right format object found for a branch?
151
144
# create a branch with a few known format objects.
152
# this is not quite the same as
145
# this is not quite the same as
153
146
self.build_tree(["foo/", "bar/"])
154
147
def check_format(format, url):
155
148
dir = format._matchingbzrdir.initialize(url)
156
149
dir.create_repository()
157
150
format.initialize(dir)
158
found_format = BranchFormat.find_format(dir)
151
found_format = _mod_branch.BranchFormat.find_format(dir)
159
152
self.failUnless(isinstance(found_format, format.__class__))
160
check_format(BzrBranchFormat5(), "bar")
153
check_format(_mod_branch.BzrBranchFormat5(), "bar")
162
155
def test_find_format_not_branch(self):
163
156
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
164
self.assertRaises(NotBranchError,
165
BranchFormat.find_format,
157
self.assertRaises(errors.NotBranchError,
158
_mod_branch.BranchFormat.find_format,
168
161
def test_find_format_unknown_format(self):
169
162
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
170
163
SampleBranchFormat().initialize(dir)
171
self.assertRaises(UnknownFormatError,
172
BranchFormat.find_format,
164
self.assertRaises(errors.UnknownFormatError,
165
_mod_branch.BranchFormat.find_format,
175
168
def test_register_unregister_format(self):
180
173
format.initialize(dir)
181
174
# register a format for it.
182
BranchFormat.register_format(format)
175
_mod_branch.BranchFormat.register_format(format)
183
176
# which branch.Open will refuse (not supported)
184
self.assertRaises(UnsupportedFormatError, Branch.open, self.get_url())
177
self.assertRaises(errors.UnsupportedFormatError,
178
_mod_branch.Branch.open, self.get_url())
185
179
self.make_branch_and_tree('foo')
186
180
# but open_downlevel will work
187
self.assertEqual(format.open(dir), bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
183
bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
188
184
# unregister the format
189
BranchFormat.unregister_format(format)
185
_mod_branch.BranchFormat.unregister_format(format)
190
186
self.make_branch_and_tree('bar')
193
class TestBranch6(TestCaseWithTransport):
189
class TestBranch67(object):
190
"""Common tests for both branch 6 and 7 which are mostly the same."""
192
def get_format_name(self):
193
raise NotImplementedError(self.get_format_name)
195
def get_format_name_subtree(self):
196
raise NotImplementedError(self.get_format_name)
199
raise NotImplementedError(self.get_class)
195
201
def test_creation(self):
196
format = BzrDirMetaFormat1()
202
format = bzrdir.BzrDirMetaFormat1()
197
203
format.set_branch_format(_mod_branch.BzrBranchFormat6())
198
204
branch = self.make_branch('a', format=format)
199
self.assertIsInstance(branch, _mod_branch.BzrBranch6)
200
branch = self.make_branch('b', format='dirstate-tags')
201
self.assertIsInstance(branch, _mod_branch.BzrBranch6)
205
self.assertIsInstance(branch, self.get_class())
206
branch = self.make_branch('b', format=self.get_format_name())
207
self.assertIsInstance(branch, self.get_class())
202
208
branch = _mod_branch.Branch.open('a')
203
self.assertIsInstance(branch, _mod_branch.BzrBranch6)
209
self.assertIsInstance(branch, self.get_class())
205
211
def test_layout(self):
206
branch = self.make_branch('a', format='dirstate-tags')
212
branch = self.make_branch('a', format=self.get_format_name())
207
213
self.failUnlessExists('a/.bzr/branch/last-revision')
208
214
self.failIfExists('a/.bzr/branch/revision-history')
215
self.failIfExists('a/.bzr/branch/references')
210
217
def test_config(self):
211
218
"""Ensure that all configuration data is stored in the branch"""
212
branch = self.make_branch('a', format='dirstate-tags')
219
branch = self.make_branch('a', format=self.get_format_name())
213
220
branch.set_parent('http://bazaar-vcs.org')
214
221
self.failIfExists('a/.bzr/branch/parent')
215
222
self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
222
229
self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
224
231
def test_set_revision_history(self):
225
tree = self.make_branch_and_memory_tree('.',
226
format='dirstate-tags')
230
tree.commit('foo', rev_id='foo')
231
tree.commit('bar', rev_id='bar')
232
tree.branch.set_revision_history(['foo', 'bar'])
233
tree.branch.set_revision_history(['foo'])
234
self.assertRaises(errors.NotLefthandHistory,
235
tree.branch.set_revision_history, ['bar'])
232
builder = self.make_branch_builder('.', format=self.get_format_name())
233
builder.build_snapshot('foo', None,
234
[('add', ('', None, 'directory', None))],
236
builder.build_snapshot('bar', None, [], message='bar')
237
branch = builder.get_branch()
239
self.addCleanup(branch.unlock)
240
branch.set_revision_history(['foo', 'bar'])
241
branch.set_revision_history(['foo'])
242
self.assertRaises(errors.NotLefthandHistory,
243
branch.set_revision_history, ['bar'])
239
245
def do_checkout_test(self, lightweight=False):
240
tree = self.make_branch_and_tree('source', format='dirstate-with-subtree')
246
tree = self.make_branch_and_tree('source',
247
format=self.get_format_name_subtree())
241
248
subtree = self.make_branch_and_tree('source/subtree',
242
format='dirstate-with-subtree')
249
format=self.get_format_name_subtree())
243
250
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
244
format='dirstate-with-subtree')
251
format=self.get_format_name_subtree())
245
252
self.build_tree(['source/subtree/file',
246
253
'source/subtree/subsubtree/file'])
247
254
subsubtree.add('file')
284
291
self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
285
292
'locations.conf')
287
class TestBranchReference(TestCaseWithTransport):
295
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
298
return _mod_branch.BzrBranch6
300
def get_format_name(self):
301
return "dirstate-tags"
303
def get_format_name_subtree(self):
304
return "dirstate-with-subtree"
306
def test_set_stacked_on_url_errors(self):
307
branch = self.make_branch('a', format=self.get_format_name())
308
self.assertRaises(errors.UnstackableBranchFormat,
309
branch.set_stacked_on_url, None)
311
def test_default_stacked_location(self):
312
branch = self.make_branch('a', format=self.get_format_name())
313
self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
316
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
319
return _mod_branch.BzrBranch7
321
def get_format_name(self):
324
def get_format_name_subtree(self):
325
return "development-subtree"
327
def test_set_stacked_on_url_unstackable_repo(self):
328
repo = self.make_repository('a', format='dirstate-tags')
329
control = repo.bzrdir
330
branch = _mod_branch.BzrBranchFormat7().initialize(control)
331
target = self.make_branch('b')
332
self.assertRaises(errors.UnstackableRepositoryFormat,
333
branch.set_stacked_on_url, target.base)
335
def test_clone_stacked_on_unstackable_repo(self):
336
repo = self.make_repository('a', format='dirstate-tags')
337
control = repo.bzrdir
338
branch = _mod_branch.BzrBranchFormat7().initialize(control)
339
# Calling clone should not raise UnstackableRepositoryFormat.
340
cloned_bzrdir = control.clone('cloned')
342
def _test_default_stacked_location(self):
343
branch = self.make_branch('a', format=self.get_format_name())
344
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
346
def test_stack_and_unstack(self):
347
branch = self.make_branch('a', format=self.get_format_name())
348
target = self.make_branch_and_tree('b', format=self.get_format_name())
349
branch.set_stacked_on_url(target.branch.base)
350
self.assertEqual(target.branch.base, branch.get_stacked_on_url())
351
revid = target.commit('foo')
352
self.assertTrue(branch.repository.has_revision(revid))
353
branch.set_stacked_on_url(None)
354
self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
355
self.assertFalse(branch.repository.has_revision(revid))
357
def test_open_opens_stacked_reference(self):
358
branch = self.make_branch('a', format=self.get_format_name())
359
target = self.make_branch_and_tree('b', format=self.get_format_name())
360
branch.set_stacked_on_url(target.branch.base)
361
branch = branch.bzrdir.open_branch()
362
revid = target.commit('foo')
363
self.assertTrue(branch.repository.has_revision(revid))
366
class BzrBranch8(tests.TestCaseWithTransport):
368
def make_branch(self, location, format=None):
370
format = bzrdir.format_registry.make_bzrdir('1.9')
371
format.set_branch_format(_mod_branch.BzrBranchFormat8())
372
return tests.TestCaseWithTransport.make_branch(
373
self, location, format=format)
375
def create_branch_with_reference(self):
376
branch = self.make_branch('branch')
377
branch._set_all_reference_info({'file-id': ('path', 'location')})
381
def instrument_branch(branch, gets):
382
old_get = branch._transport.get
383
def get(*args, **kwargs):
384
gets.append((args, kwargs))
385
return old_get(*args, **kwargs)
386
branch._transport.get = get
388
def test_reference_info_caching_read_locked(self):
390
branch = self.create_branch_with_reference()
392
self.addCleanup(branch.unlock)
393
self.instrument_branch(branch, gets)
394
branch.get_reference_info('file-id')
395
branch.get_reference_info('file-id')
396
self.assertEqual(1, len(gets))
398
def test_reference_info_caching_read_unlocked(self):
400
branch = self.create_branch_with_reference()
401
self.instrument_branch(branch, gets)
402
branch.get_reference_info('file-id')
403
branch.get_reference_info('file-id')
404
self.assertEqual(2, len(gets))
406
def test_reference_info_caching_write_locked(self):
408
branch = self.make_branch('branch')
410
self.instrument_branch(branch, gets)
411
self.addCleanup(branch.unlock)
412
branch._set_all_reference_info({'file-id': ('path2', 'location2')})
413
path, location = branch.get_reference_info('file-id')
414
self.assertEqual(0, len(gets))
415
self.assertEqual('path2', path)
416
self.assertEqual('location2', location)
418
def test_reference_info_caches_cleared(self):
419
branch = self.make_branch('branch')
421
branch.set_reference_info('file-id', 'path2', 'location2')
423
doppelganger = _mod_branch.Branch.open('branch')
424
doppelganger.set_reference_info('file-id', 'path3', 'location3')
425
self.assertEqual(('path3', 'location3'),
426
branch.get_reference_info('file-id'))
428
class TestBranchReference(tests.TestCaseWithTransport):
288
429
"""Tests for the branch reference facility."""
290
431
def test_create_open_reference(self):
291
432
bzrdirformat = bzrdir.BzrDirMetaFormat1()
292
t = get_transport(self.get_url('.'))
433
t = transport.get_transport(self.get_url('.'))
294
435
dir = bzrdirformat.initialize(self.get_url('repo'))
295
436
dir.create_repository()
296
437
target_branch = dir.create_branch()
297
438
t.mkdir('branch')
298
439
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
299
made_branch = BranchReferenceFormat().initialize(branch_dir, target_branch)
440
made_branch = _mod_branch.BranchReferenceFormat().initialize(
441
branch_dir, target_branch=target_branch)
300
442
self.assertEqual(made_branch.base, target_branch.base)
301
443
opened_branch = branch_dir.open_branch()
302
444
self.assertEqual(opened_branch.base, target_branch.base)
313
455
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
316
class TestHooks(TestCase):
458
class TestHooks(tests.TestCaseWithTransport):
318
460
def test_constructor(self):
319
461
"""Check that creating a BranchHooks instance has the right defaults."""
320
hooks = BranchHooks()
462
hooks = _mod_branch.BranchHooks()
321
463
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
322
464
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
323
465
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
466
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
324
467
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
325
self.assertTrue("post_uncommit" in hooks, "post_uncommit not in %s" % hooks)
468
self.assertTrue("post_uncommit" in hooks,
469
"post_uncommit not in %s" % hooks)
470
self.assertTrue("post_change_branch_tip" in hooks,
471
"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)
327
477
def test_installed_hooks_are_BranchHooks(self):
328
478
"""The installed hooks object should be a BranchHooks."""
329
479
# the installed hooks are saved in self._preserved_hooks.
330
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch], BranchHooks)
333
class TestPullResult(TestCase):
480
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):
335
559
def test_pull_result_to_int(self):
336
560
# to support old code, the pull result can be used as an int
561
r = _mod_branch.PullResult()
340
564
# this usage of results is not recommended for new code (because it
342
566
# it's still supported
343
567
a = "%d revisions pulled" % r
344
568
self.assertEqual(a, "10 revisions pulled")
570
def test_report_changed(self):
571
r = _mod_branch.PullResult()
572
r.old_revid = "old-revid"
574
r.new_revid = "new-revid"
578
self.assertEqual("Now on revision 20.\n", f.getvalue())
580
def test_report_unchanged(self):
581
r = _mod_branch.PullResult()
582
r.old_revid = "same-revid"
583
r.new_revid = "same-revid"
586
self.assertEqual("No revisions to pull.\n", f.getvalue())
589
class _StubLockable(object):
590
"""Helper for TestRunWithWriteLockedTarget."""
592
def __init__(self, calls, unlock_exc=None):
594
self.unlock_exc = unlock_exc
596
def lock_write(self):
597
self.calls.append('lock_write')
600
self.calls.append('unlock')
601
if self.unlock_exc is not None:
602
raise self.unlock_exc
605
class _ErrorFromCallable(Exception):
606
"""Helper for TestRunWithWriteLockedTarget."""
609
class _ErrorFromUnlock(Exception):
610
"""Helper for TestRunWithWriteLockedTarget."""
613
class TestRunWithWriteLockedTarget(tests.TestCase):
614
"""Tests for _run_with_write_locked_target."""
617
tests.TestCase.setUp(self)
620
def func_that_returns_ok(self):
621
self._calls.append('func called')
624
def func_that_raises(self):
625
self._calls.append('func called')
626
raise _ErrorFromCallable()
628
def test_success_unlocks(self):
629
lockable = _StubLockable(self._calls)
630
result = _mod_branch._run_with_write_locked_target(
631
lockable, self.func_that_returns_ok)
632
self.assertEqual('ok', result)
633
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
635
def test_exception_unlocks_and_propagates(self):
636
lockable = _StubLockable(self._calls)
637
self.assertRaises(_ErrorFromCallable,
638
_mod_branch._run_with_write_locked_target,
639
lockable, self.func_that_raises)
640
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
642
def test_callable_succeeds_but_error_during_unlock(self):
643
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
644
self.assertRaises(_ErrorFromUnlock,
645
_mod_branch._run_with_write_locked_target,
646
lockable, self.func_that_returns_ok)
647
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
649
def test_error_during_unlock_does_not_mask_original_error(self):
650
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
651
self.assertRaises(_ErrorFromCallable,
652
_mod_branch._run_with_write_locked_target,
653
lockable, self.func_that_raises)
654
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
added
removed
bzrlib/tests/test_branch.py
