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 StringIO import StringIO
27
28
branch as _mod_branch,
36
branch as _mod_bzrbranch,
39
from ..bzr.fullhistory import (
35
from bzrlib.branch import (
39
BranchReferenceFormat,
43
from ..sixish import (
48
class TestErrors(tests.TestCase):
50
def test_unstackable_branch_format(self):
53
error = _mod_branch.UnstackableBranchFormat(format, url)
55
"The branch '/foo'(foo) is not a stackable format. "
56
"You will need to upgrade the branch to permit branch stacking.",
60
class TestDefaultFormat(tests.TestCase):
44
_run_with_write_locked_target,
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):
62
60
def test_default_format(self):
63
61
# update this if you change the default branch format
64
self.assertIsInstance(_mod_branch.format_registry.get_default(),
65
_mod_bzrbranch.BzrBranchFormat7)
62
self.assertIsInstance(BranchFormat.get_default_format(),
67
65
def test_default_format_is_same_as_bzrdir_default(self):
68
66
# XXX: it might be nice if there was only one place the default was
69
67
# set, but at the moment that's not true -- mbp 20070814 --
70
68
# https://bugs.launchpad.net/bzr/+bug/132376
72
_mod_branch.format_registry.get_default(),
73
bzrdir.BzrDirFormat.get_default_format().get_branch_format())
69
self.assertEqual(BranchFormat.get_default_format(),
70
BzrDirFormat.get_default_format().get_branch_format())
75
72
def test_get_set_default_format(self):
76
73
# set the format and then set it back again
77
old_format = _mod_branch.format_registry.get_default()
78
_mod_branch.format_registry.set_default(
74
old_format = BranchFormat.get_default_format()
75
BranchFormat.set_default_format(SampleBranchFormat())
81
77
# the default branch format is used by the meta dir format
82
78
# which is not the default bzrdir format at this point
83
dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
79
dir = BzrDirMetaFormat1().initialize('memory:///')
84
80
result = dir.create_branch()
85
81
self.assertEqual(result, 'A branch')
87
_mod_branch.format_registry.set_default(old_format)
88
self.assertEqual(old_format,
89
_mod_branch.format_registry.get_default())
92
class TestBranchFormat5(tests.TestCaseWithTransport):
83
BranchFormat.set_default_format(old_format)
84
self.assertEqual(old_format, BranchFormat.get_default_format())
87
class TestBranchFormat5(TestCaseWithTransport):
93
88
"""Tests specific to branch format 5"""
95
90
def test_branch_format_5_uses_lockdir(self):
96
91
url = self.get_url()
97
bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
98
bdir.create_repository()
99
branch = BzrBranchFormat5().initialize(bdir)
92
bzrdir = BzrDirMetaFormat1().initialize(url)
93
bzrdir.create_repository()
94
branch = bzrdir.create_branch()
100
95
t = self.get_transport()
101
96
self.log("branch instance is %r" % branch)
102
self.assertTrue(isinstance(branch, BzrBranch5))
97
self.assert_(isinstance(branch, BzrBranch5))
103
98
self.assertIsDirectory('.', t)
104
99
self.assertIsDirectory('.bzr/branch', t)
105
100
self.assertIsDirectory('.bzr/branch/lock', t)
106
101
branch.lock_write()
107
self.addCleanup(branch.unlock)
108
self.assertIsDirectory('.bzr/branch/lock/held', t)
103
self.assertIsDirectory('.bzr/branch/lock/held', t)
110
107
def test_set_push_location(self):
111
conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
108
from bzrlib.config import (locations_config_filename,
109
ensure_config_dir_exists)
110
ensure_config_dir_exists()
111
fn = locations_config_filename()
112
# write correct newlines to locations.conf
113
# by default ConfigObj uses native line-endings for new files
114
# but uses already existing line-endings if file is not empty
117
f.write('# comment\n')
113
121
branch = self.make_branch('.', format='knit')
114
122
branch.set_push_location('foo')
115
123
local_path = urlutils.local_path_from_url(branch.base[:-1])
116
self.assertFileEqual(b"# comment\n"
118
b"push_location = foo\n"
119
b"push_location:policy = norecurse\n" % local_path.encode(
121
bedding.locations_config_path())
124
self.assertFileEqual("# comment\n"
126
"push_location = foo\n"
127
"push_location:policy = norecurse\n" % local_path,
123
130
# TODO RBC 20051029 test getting a push location from a branch in a
124
131
# recursive section - that is, it appends the branch name.
127
class SampleBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
134
class SampleBranchFormat(BranchFormat):
128
135
"""A sample format
130
137
this format is initializable, unsupported to aid in testing the
131
138
open and open_downlevel routines.
135
def get_format_string(cls):
141
def get_format_string(self):
136
142
"""See BzrBranchFormat.get_format_string()."""
137
return b"Sample branch format."
143
return "Sample branch format."
139
def initialize(self, a_controldir, name=None, repository=None,
140
append_revisions_only=None):
145
def initialize(self, a_bzrdir):
141
146
"""Format 4 branches cannot be created."""
142
t = a_controldir.get_branch_transport(self, name=name)
147
t = a_bzrdir.get_branch_transport(self)
143
148
t.put_bytes('format', self.get_format_string())
144
149
return 'A branch'
146
151
def is_supported(self):
149
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
150
possible_transports=None):
154
def open(self, transport, _found=False, ignore_fallbacks=False):
151
155
return "opened branch."
154
# Demonstrating how lazy loading is often implemented:
155
# A constant string is created.
156
SampleSupportedBranchFormatString = b"Sample supported branch format."
158
# And the format class can then reference the constant to avoid skew.
161
class SampleSupportedBranchFormat(_mod_bzrbranch.BranchFormatMetadir):
162
"""A sample supported format."""
165
def get_format_string(cls):
166
"""See BzrBranchFormat.get_format_string()."""
167
return SampleSupportedBranchFormatString
169
def initialize(self, a_controldir, name=None, append_revisions_only=None):
170
t = a_controldir.get_branch_transport(self, name=name)
171
t.put_bytes('format', self.get_format_string())
174
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
175
possible_transports=None):
176
return "opened supported branch."
179
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
180
"""A sample format that is not usable in a metadir."""
182
def get_format_string(self):
183
# This format is not usable in a metadir.
186
def network_name(self):
187
# Network name always has to be provided.
190
def initialize(self, a_controldir, name=None):
191
raise NotImplementedError(self.initialize)
193
def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
194
possible_transports=None):
195
raise NotImplementedError(self.open)
198
class TestBzrBranchFormat(tests.TestCaseWithTransport):
158
class TestBzrBranchFormat(TestCaseWithTransport):
199
159
"""Tests for the BzrBranchFormat facility."""
201
161
def test_find_format(self):
203
163
# create a branch with a few known format objects.
204
164
# this is not quite the same as
205
165
self.build_tree(["foo/", "bar/"])
207
166
def check_format(format, url):
208
dir = format._matchingcontroldir.initialize(url)
167
dir = format._matchingbzrdir.initialize(url)
209
168
dir.create_repository()
210
169
format.initialize(dir)
211
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(dir)
212
self.assertIsInstance(found_format, format.__class__)
170
found_format = BranchFormat.find_format(dir)
171
self.failUnless(isinstance(found_format, format.__class__))
213
172
check_format(BzrBranchFormat5(), "bar")
215
def test_from_string(self):
216
self.assertIsInstance(
217
SampleBranchFormat.from_string(b"Sample branch format."),
219
self.assertRaises(AssertionError,
220
SampleBranchFormat.from_string, b"Different branch format.")
222
174
def test_find_format_not_branch(self):
223
175
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
224
self.assertRaises(errors.NotBranchError,
225
_mod_bzrbranch.BranchFormatMetadir.find_format,
176
self.assertRaises(NotBranchError,
177
BranchFormat.find_format,
228
180
def test_find_format_unknown_format(self):
229
181
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
230
182
SampleBranchFormat().initialize(dir)
231
self.assertRaises(errors.UnknownFormatError,
232
_mod_bzrbranch.BranchFormatMetadir.find_format,
183
self.assertRaises(UnknownFormatError,
184
BranchFormat.find_format,
235
def test_find_format_with_features(self):
236
tree = self.make_branch_and_tree('.', format='2a')
237
tree.branch.update_feature_flags({b"name": b"optional"})
238
found_format = _mod_bzrbranch.BranchFormatMetadir.find_format(
240
self.assertIsInstance(found_format, _mod_bzrbranch.BranchFormatMetadir)
241
self.assertEqual(found_format.features.get(b"name"), b"optional")
242
tree.branch.update_feature_flags({b"name": None})
243
branch = _mod_branch.Branch.open('.')
244
self.assertEqual(branch._format.features, {})
247
class TestBranchFormatRegistry(tests.TestCase):
250
super(TestBranchFormatRegistry, self).setUp()
251
self.registry = _mod_branch.BranchFormatRegistry()
253
def test_default(self):
254
self.assertIs(None, self.registry.get_default())
255
format = SampleBranchFormat()
256
self.registry.set_default(format)
257
self.assertEqual(format, self.registry.get_default())
259
187
def test_register_unregister_format(self):
260
188
format = SampleBranchFormat()
261
self.registry.register(format)
262
self.assertEqual(format,
263
self.registry.get(b"Sample branch format."))
264
self.registry.remove(format)
265
self.assertRaises(KeyError, self.registry.get,
266
b"Sample branch format.")
268
def test_get_all(self):
269
format = SampleBranchFormat()
270
self.assertEqual([], self.registry._get_all())
271
self.registry.register(format)
272
self.assertEqual([format], self.registry._get_all())
274
def test_register_extra(self):
275
format = SampleExtraBranchFormat()
276
self.assertEqual([], self.registry._get_all())
277
self.registry.register_extra(format)
278
self.assertEqual([format], self.registry._get_all())
280
def test_register_extra_lazy(self):
281
self.assertEqual([], self.registry._get_all())
282
self.registry.register_extra_lazy("breezy.tests.test_branch",
283
"SampleExtraBranchFormat")
284
formats = self.registry._get_all()
285
self.assertEqual(1, len(formats))
286
self.assertIsInstance(formats[0], SampleExtraBranchFormat)
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')
289
205
class TestBranch67(object):
311
227
def test_layout(self):
312
228
branch = self.make_branch('a', format=self.get_format_name())
313
self.assertPathExists('a/.bzr/branch/last-revision')
314
self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
315
self.assertPathDoesNotExist('a/.bzr/branch/references')
229
self.failUnlessExists('a/.bzr/branch/last-revision')
230
self.failIfExists('a/.bzr/branch/revision-history')
231
self.failIfExists('a/.bzr/branch/references')
317
233
def test_config(self):
318
234
"""Ensure that all configuration data is stored in the branch"""
319
235
branch = self.make_branch('a', format=self.get_format_name())
320
branch.set_parent('http://example.com')
321
self.assertPathDoesNotExist('a/.bzr/branch/parent')
322
self.assertEqual('http://example.com', branch.get_parent())
323
branch.set_push_location('sftp://example.com')
324
conf = branch.get_config_stack()
325
self.assertEqual('sftp://example.com', conf.get('push_location'))
326
branch.set_bound_location('ftp://example.com')
327
self.assertPathDoesNotExist('a/.bzr/branch/bound')
328
self.assertEqual('ftp://example.com', branch.get_bound_location())
330
def do_checkout_test(self, lightweight):
236
branch.set_parent('http://bazaar-vcs.org')
237
self.failIfExists('a/.bzr/branch/parent')
238
self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
239
branch.set_push_location('sftp://bazaar-vcs.org')
240
config = branch.get_config()._get_branch_data_config()
241
self.assertEqual('sftp://bazaar-vcs.org',
242
config.get_user_option('push_location'))
243
branch.set_bound_location('ftp://bazaar-vcs.org')
244
self.failIfExists('a/.bzr/branch/bound')
245
self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
247
def test_set_revision_history(self):
248
builder = self.make_branch_builder('.', format=self.get_format_name())
249
builder.build_snapshot('foo', None,
250
[('add', ('', None, 'directory', None))],
252
builder.build_snapshot('bar', None, [], message='bar')
253
branch = builder.get_branch()
255
self.addCleanup(branch.unlock)
256
branch.set_revision_history(['foo', 'bar'])
257
branch.set_revision_history(['foo'])
258
self.assertRaises(errors.NotLefthandHistory,
259
branch.set_revision_history, ['bar'])
261
def do_checkout_test(self, lightweight=False):
331
262
tree = self.make_branch_and_tree('source',
332
format=self.get_format_name_subtree())
263
format=self.get_format_name_subtree())
333
264
subtree = self.make_branch_and_tree('source/subtree',
334
format=self.get_format_name_subtree())
265
format=self.get_format_name_subtree())
335
266
subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
336
format=self.get_format_name_subtree())
267
format=self.get_format_name_subtree())
337
268
self.build_tree(['source/subtree/file',
338
269
'source/subtree/subsubtree/file'])
339
270
subsubtree.add('file')
340
271
subtree.add('file')
341
272
subtree.add_reference(subsubtree)
342
subtree.set_reference_info('subsubtree', subsubtree.branch.user_url)
343
273
tree.add_reference(subtree)
344
tree.set_reference_info('subtree', subtree.branch.user_url)
345
274
tree.commit('a revision')
346
275
subtree.commit('a subtree file')
347
276
subsubtree.commit('a subsubtree file')
348
277
tree.branch.create_checkout('target', lightweight=lightweight)
349
self.assertPathExists('target')
350
self.assertPathExists('target/subtree')
351
self.assertPathExists('target/subtree/file')
352
self.assertPathExists('target/subtree/subsubtree/file')
278
self.failUnlessExists('target')
279
self.failUnlessExists('target/subtree')
280
self.failUnlessExists('target/subtree/file')
281
self.failUnlessExists('target/subtree/subsubtree/file')
353
282
subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
355
284
self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
482
424
branch.lock_write()
483
425
self.instrument_branch(branch, gets)
484
426
self.addCleanup(branch.unlock)
485
branch._set_all_reference_info({'path2': ('location2', b'file-id')})
486
location, file_id = branch.get_reference_info('path2')
427
branch._set_all_reference_info({'file-id': ('path2', 'location2')})
428
path, location = branch.get_reference_info('file-id')
487
429
self.assertEqual(0, len(gets))
488
self.assertEqual(b'file-id', file_id)
430
self.assertEqual('path2', path)
489
431
self.assertEqual('location2', location)
491
433
def test_reference_info_caches_cleared(self):
492
434
branch = self.make_branch('branch')
493
with branch.lock_write():
494
branch.set_reference_info(b'file-id', 'location2', 'path2')
495
doppelganger = _mod_branch.Branch.open('branch')
496
doppelganger.set_reference_info(b'file-id', 'location3', 'path3')
497
self.assertEqual(('location3', 'path3'),
498
branch.get_reference_info(b'file-id'))
500
def _recordParentMapCalls(self, repo):
501
self._parent_map_calls = []
502
orig_get_parent_map = repo.revisions.get_parent_map
504
def get_parent_map(q):
506
self._parent_map_calls.extend([e[0] for e in q])
507
return orig_get_parent_map(q)
508
repo.revisions.get_parent_map = get_parent_map
511
class TestBranchReference(tests.TestCaseWithTransport):
436
branch.set_reference_info('file-id', 'path2', 'location2')
438
doppelganger = Branch.open('branch')
439
doppelganger.set_reference_info('file-id', 'path3', 'location3')
440
self.assertEqual(('path3', 'location3'),
441
branch.get_reference_info('file-id'))
443
class TestBranchReference(TestCaseWithTransport):
512
444
"""Tests for the branch reference facility."""
514
446
def test_create_open_reference(self):
515
447
bzrdirformat = bzrdir.BzrDirMetaFormat1()
516
t = self.get_transport()
448
t = get_transport(self.get_url('.'))
518
450
dir = bzrdirformat.initialize(self.get_url('repo'))
519
451
dir.create_repository()
520
452
target_branch = dir.create_branch()
521
453
t.mkdir('branch')
522
454
branch_dir = bzrdirformat.initialize(self.get_url('branch'))
523
made_branch = _mod_bzrbranch.BranchReferenceFormat().initialize(
524
branch_dir, target_branch=target_branch)
455
made_branch = BranchReferenceFormat().initialize(branch_dir, target_branch)
525
456
self.assertEqual(made_branch.base, target_branch.base)
526
457
opened_branch = branch_dir.open_branch()
527
458
self.assertEqual(opened_branch.base, target_branch.base)
529
460
def test_get_reference(self):
530
"""For a BranchReference, get_reference should return the location."""
461
"""For a BranchReference, get_reference should reutrn the location."""
531
462
branch = self.make_branch('target')
532
463
checkout = branch.create_checkout('checkout', lightweight=True)
533
reference_url = branch.controldir.root_transport.abspath('') + '/'
464
reference_url = branch.bzrdir.root_transport.abspath('') + '/'
534
465
# if the api for create_checkout changes to return different checkout types
535
466
# then this file read will fail.
536
self.assertFileEqual(reference_url.encode('utf-8'),
537
'checkout/.bzr/branch/location')
467
self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
538
468
self.assertEqual(reference_url,
539
_mod_bzrbranch.BranchReferenceFormat().get_reference(checkout.controldir))
542
class TestHooks(tests.TestCaseWithTransport):
469
_mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
472
class TestHooks(TestCase):
544
474
def test_constructor(self):
545
475
"""Check that creating a BranchHooks instance has the right defaults."""
546
hooks = _mod_branch.BranchHooks()
476
hooks = BranchHooks()
477
self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
547
478
self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
548
self.assertTrue("post_commit" in hooks,
549
"post_commit not in %s" % hooks)
479
self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
550
480
self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
551
481
self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
552
self.assertTrue("post_uncommit" in hooks,
553
"post_uncommit not in %s" % hooks)
482
self.assertTrue("post_uncommit" in hooks, "post_uncommit not in %s" % hooks)
554
483
self.assertTrue("post_change_branch_tip" in hooks,
555
484
"post_change_branch_tip not in %s" % hooks)
556
self.assertTrue("post_branch_init" in hooks,
557
"post_branch_init not in %s" % hooks)
558
self.assertTrue("post_switch" in hooks,
559
"post_switch not in %s" % hooks)
561
486
def test_installed_hooks_are_BranchHooks(self):
562
487
"""The installed hooks object should be a BranchHooks."""
563
488
# the installed hooks are saved in self._preserved_hooks.
564
489
self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
565
_mod_branch.BranchHooks)
567
def test_post_branch_init_hook(self):
569
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
571
self.assertLength(0, calls)
572
branch = self.make_branch('a')
573
self.assertLength(1, calls)
575
self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
576
self.assertTrue(hasattr(params, 'controldir'))
577
self.assertTrue(hasattr(params, 'branch'))
579
def test_post_branch_init_hook_repr(self):
581
_mod_branch.Branch.hooks.install_named_hook('post_branch_init',
582
lambda params: param_reprs.append(repr(params)), None)
583
branch = self.make_branch('a')
584
self.assertLength(1, param_reprs)
585
param_repr = param_reprs[0]
586
self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
588
def test_post_switch_hook(self):
589
from .. import switch
591
_mod_branch.Branch.hooks.install_named_hook('post_switch',
593
tree = self.make_branch_and_tree('branch-1')
594
self.build_tree(['branch-1/file-1'])
597
to_branch = tree.controldir.sprout('branch-2').open_branch()
598
self.build_tree(['branch-1/file-2'])
600
tree.remove('file-1')
602
checkout = tree.branch.create_checkout('checkout')
603
self.assertLength(0, calls)
604
switch.switch(checkout.controldir, to_branch)
605
self.assertLength(1, calls)
607
self.assertIsInstance(params, _mod_branch.SwitchHookParams)
608
self.assertTrue(hasattr(params, 'to_branch'))
609
self.assertTrue(hasattr(params, 'revision_id'))
612
class TestBranchOptions(tests.TestCaseWithTransport):
615
super(TestBranchOptions, self).setUp()
616
self.branch = self.make_branch('.')
617
self.config_stack = self.branch.get_config_stack()
619
def check_append_revisions_only(self, expected_value, value=None):
620
"""Set append_revisions_only in config and check its interpretation."""
621
if value is not None:
622
self.config_stack.set('append_revisions_only', value)
623
self.assertEqual(expected_value,
624
self.branch.get_append_revisions_only())
626
def test_valid_append_revisions_only(self):
627
self.assertEqual(None,
628
self.config_stack.get('append_revisions_only'))
629
self.check_append_revisions_only(None)
630
self.check_append_revisions_only(False, 'False')
631
self.check_append_revisions_only(True, 'True')
632
# The following values will cause compatibility problems on projects
633
# using older bzr versions (<2.2) but are accepted
634
self.check_append_revisions_only(False, 'false')
635
self.check_append_revisions_only(True, 'true')
637
def test_invalid_append_revisions_only(self):
638
"""Ensure warning is noted on invalid settings"""
642
self.warnings.append(args[0] % args[1:])
643
self.overrideAttr(trace, 'warning', warning)
644
self.check_append_revisions_only(None, 'not-a-bool')
645
self.assertLength(1, self.warnings)
647
'Value "not-a-bool" is not valid for "append_revisions_only"',
650
def test_use_fresh_values(self):
651
copy = _mod_branch.Branch.open(self.branch.base)
654
copy.get_config_stack().set('foo', 'bar')
657
self.assertFalse(self.branch.is_locked())
658
# Since the branch is locked, the option value won't be saved on disk
659
# so trying to access the config of locked branch via another older
660
# non-locked branch object pointing to the same branch is not supported
661
self.assertEqual(None, self.branch.get_config_stack().get('foo'))
662
# Using a newly created branch object works as expected
663
fresh = _mod_branch.Branch.open(self.branch.base)
664
self.assertEqual('bar', fresh.get_config_stack().get('foo'))
666
def test_set_from_config_get_from_config_stack(self):
667
self.branch.lock_write()
668
self.addCleanup(self.branch.unlock)
669
self.branch.get_config().set_user_option('foo', 'bar')
670
result = self.branch.get_config_stack().get('foo')
671
# https://bugs.launchpad.net/bzr/+bug/948344
672
self.expectFailure('BranchStack uses cache after set_user_option',
673
self.assertEqual, 'bar', result)
675
def test_set_from_config_stack_get_from_config(self):
676
self.branch.lock_write()
677
self.addCleanup(self.branch.unlock)
678
self.branch.get_config_stack().set('foo', 'bar')
679
# Since the branch is locked, the option value won't be saved on disk
680
# so mixing get() and get_user_option() is broken by design.
681
self.assertEqual(None,
682
self.branch.get_config().get_user_option('foo'))
684
def test_set_delays_write_when_branch_is_locked(self):
685
self.branch.lock_write()
686
self.addCleanup(self.branch.unlock)
687
self.branch.get_config_stack().set('foo', 'bar')
688
copy = _mod_branch.Branch.open(self.branch.base)
689
result = copy.get_config_stack().get('foo')
690
# Accessing from a different branch object is like accessing from a
691
# different process: the option has not been saved yet and the new
692
# value cannot be seen.
693
self.assertIs(None, result)
696
class TestPullResult(tests.TestCase):
698
def test_report_changed(self):
699
r = _mod_branch.PullResult()
700
r.old_revid = b"old-revid"
493
class TestPullResult(TestCase):
495
def test_pull_result_to_int(self):
496
# to support old code, the pull result can be used as an int
702
r.new_revid = b"new-revid"
706
self.assertEqual("Now on revision 20.\n", f.getvalue())
708
def test_report_unchanged(self):
709
r = _mod_branch.PullResult()
710
r.old_revid = b"same-revid"
711
r.new_revid = b"same-revid"
714
self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
500
# this usage of results is not recommended for new code (because it
501
# doesn't describe very well what happened), but for api stability
502
# it's still supported
503
a = "%d revisions pulled" % r
504
self.assertEqual(a, "10 revisions pulled")
508
class _StubLockable(object):
509
"""Helper for TestRunWithWriteLockedTarget."""
511
def __init__(self, calls, unlock_exc=None):
513
self.unlock_exc = unlock_exc
515
def lock_write(self):
516
self.calls.append('lock_write')
519
self.calls.append('unlock')
520
if self.unlock_exc is not None:
521
raise self.unlock_exc
524
class _ErrorFromCallable(Exception):
525
"""Helper for TestRunWithWriteLockedTarget."""
528
class _ErrorFromUnlock(Exception):
529
"""Helper for TestRunWithWriteLockedTarget."""
532
class TestRunWithWriteLockedTarget(TestCase):
533
"""Tests for _run_with_write_locked_target."""
539
def func_that_returns_ok(self):
540
self._calls.append('func called')
543
def func_that_raises(self):
544
self._calls.append('func called')
545
raise _ErrorFromCallable()
547
def test_success_unlocks(self):
548
lockable = _StubLockable(self._calls)
549
result = _run_with_write_locked_target(
550
lockable, self.func_that_returns_ok)
551
self.assertEqual('ok', result)
552
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
554
def test_exception_unlocks_and_propagates(self):
555
lockable = _StubLockable(self._calls)
556
self.assertRaises(_ErrorFromCallable,
557
_run_with_write_locked_target, lockable, self.func_that_raises)
558
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
560
def test_callable_succeeds_but_error_during_unlock(self):
561
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
562
self.assertRaises(_ErrorFromUnlock,
563
_run_with_write_locked_target, lockable, self.func_that_returns_ok)
564
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
566
def test_error_during_unlock_does_not_mask_original_error(self):
567
lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
568
self.assertRaises(_ErrorFromCallable,
569
_run_with_write_locked_target, lockable, self.func_that_raises)
570
self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
added
removed
bzrlib/tests/test_branch.py
