← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

(vila) Forbid more operations on ReadonlyTransportDecorator (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Tests for the Branch facility that are not interface  tests.
18
18
 
19
 
For interface tests see tests/per_branch/*.py.
 
19
For interface tests see `tests/per_branch/*.py`.
20
20
 
21
21
For concrete class tests see this file, and for meta-branch tests
22
22
also see this file.
28
28
    branch as _mod_branch,
29
29
    bzrdir,
30
30
    config,
 
31
    controldir,
31
32
    errors,
32
33
    tests,
33
34
    trace,
34
 
    transport,
35
35
    urlutils,
36
36
    )
 
37
from bzrlib.branchfmt.fullhistory import (
 
38
    BzrBranch5,
 
39
    BzrBranchFormat5,
 
40
    )
37
41
 
38
42
 
39
43
class TestDefaultFormat(tests.TestCase):
40
44
 
41
45
    def test_default_format(self):
42
46
        # update this if you change the default branch format
43
 
        self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
 
47
        self.assertIsInstance(_mod_branch.format_registry.get_default(),
44
48
                _mod_branch.BzrBranchFormat7)
45
49
 
46
50
    def test_default_format_is_same_as_bzrdir_default(self):
48
52
        # set, but at the moment that's not true -- mbp 20070814 --
49
53
        # https://bugs.launchpad.net/bzr/+bug/132376
50
54
        self.assertEqual(
51
 
            _mod_branch.BranchFormat.get_default_format(),
 
55
            _mod_branch.format_registry.get_default(),
52
56
            bzrdir.BzrDirFormat.get_default_format().get_branch_format())
53
57
 
54
58
    def test_get_set_default_format(self):
55
59
        # set the format and then set it back again
56
 
        old_format = _mod_branch.BranchFormat.get_default_format()
57
 
        _mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
 
60
        old_format = _mod_branch.format_registry.get_default()
 
61
        _mod_branch.format_registry.set_default(SampleBranchFormat())
58
62
        try:
59
63
            # the default branch format is used by the meta dir format
60
64
            # which is not the default bzrdir format at this point
62
66
            result = dir.create_branch()
63
67
            self.assertEqual(result, 'A branch')
64
68
        finally:
65
 
            _mod_branch.BranchFormat.set_default_format(old_format)
 
69
            _mod_branch.format_registry.set_default(old_format)
66
70
        self.assertEqual(old_format,
67
 
                         _mod_branch.BranchFormat.get_default_format())
 
71
                         _mod_branch.format_registry.get_default())
68
72
 
69
73
 
70
74
class TestBranchFormat5(tests.TestCaseWithTransport):
74
78
        url = self.get_url()
75
79
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
80
        bdir.create_repository()
77
 
        branch = bdir.create_branch()
 
81
        branch = BzrBranchFormat5().initialize(bdir)
78
82
        t = self.get_transport()
79
83
        self.log("branch instance is %r" % branch)
80
 
        self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
 
84
        self.assert_(isinstance(branch, BzrBranch5))
81
85
        self.assertIsDirectory('.', t)
82
86
        self.assertIsDirectory('.bzr/branch', t)
83
87
        self.assertIsDirectory('.bzr/branch/lock', t)
101
105
    # recursive section - that is, it appends the branch name.
102
106
 
103
107
 
104
 
class SampleBranchFormat(_mod_branch.BranchFormat):
 
108
class SampleBranchFormat(_mod_branch.BranchFormatMetadir):
105
109
    """A sample format
106
110
 
107
111
    this format is initializable, unsupported to aid in testing the
108
112
    open and open_downlevel routines.
109
113
    """
110
114
 
111
 
    def get_format_string(self):
 
115
    @classmethod
 
116
    def get_format_string(cls):
112
117
        """See BzrBranchFormat.get_format_string()."""
113
118
        return "Sample branch format."
114
119
 
115
 
    def initialize(self, a_bzrdir, name=None):
 
120
    def initialize(self, a_bzrdir, name=None, repository=None,
 
121
                   append_revisions_only=None):
116
122
        """Format 4 branches cannot be created."""
117
123
        t = a_bzrdir.get_branch_transport(self, name=name)
118
124
        t.put_bytes('format', self.get_format_string())
121
127
    def is_supported(self):
122
128
        return False
123
129
 
124
 
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
 
130
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
131
             possible_transports=None):
125
132
        return "opened branch."
126
133
 
127
134
 
130
137
SampleSupportedBranchFormatString = "Sample supported branch format."
131
138
 
132
139
# And the format class can then reference the constant to avoid skew.
133
 
class SampleSupportedBranchFormat(_mod_branch.BranchFormat):
 
140
class SampleSupportedBranchFormat(_mod_branch.BranchFormatMetadir):
134
141
    """A sample supported format."""
135
142
 
136
 
    def get_format_string(self):
 
143
    @classmethod
 
144
    def get_format_string(cls):
137
145
        """See BzrBranchFormat.get_format_string()."""
138
146
        return SampleSupportedBranchFormatString
139
147
 
140
 
    def initialize(self, a_bzrdir, name=None):
 
148
    def initialize(self, a_bzrdir, name=None, append_revisions_only=None):
141
149
        t = a_bzrdir.get_branch_transport(self, name=name)
142
150
        t.put_bytes('format', self.get_format_string())
143
151
        return 'A branch'
144
152
 
145
 
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
 
153
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
154
             possible_transports=None):
146
155
        return "opened supported branch."
147
156
 
148
157
 
 
158
class SampleExtraBranchFormat(_mod_branch.BranchFormat):
 
159
    """A sample format that is not usable in a metadir."""
 
160
 
 
161
    def get_format_string(self):
 
162
        # This format is not usable in a metadir.
 
163
        return None
 
164
 
 
165
    def network_name(self):
 
166
        # Network name always has to be provided.
 
167
        return "extra"
 
168
 
 
169
    def initialize(self, a_bzrdir, name=None):
 
170
        raise NotImplementedError(self.initialize)
 
171
 
 
172
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,
 
173
             possible_transports=None):
 
174
        raise NotImplementedError(self.open)
 
175
 
 
176
 
149
177
class TestBzrBranchFormat(tests.TestCaseWithTransport):
150
178
    """Tests for the BzrBranchFormat facility."""
151
179
 
158
186
            dir = format._matchingbzrdir.initialize(url)
159
187
            dir.create_repository()
160
188
            format.initialize(dir)
161
 
            found_format = _mod_branch.BranchFormat.find_format(dir)
162
 
            self.failUnless(isinstance(found_format, format.__class__))
163
 
        check_format(_mod_branch.BzrBranchFormat5(), "bar")
 
189
            found_format = _mod_branch.BranchFormatMetadir.find_format(dir)
 
190
            self.assertIsInstance(found_format, format.__class__)
 
191
        check_format(BzrBranchFormat5(), "bar")
164
192
 
165
193
    def test_find_format_factory(self):
166
194
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
168
196
        factory = _mod_branch.MetaDirBranchFormatFactory(
169
197
            SampleSupportedBranchFormatString,
170
198
            "bzrlib.tests.test_branch", "SampleSupportedBranchFormat")
171
 
        _mod_branch.BranchFormat.register_format(factory)
172
 
        self.addCleanup(_mod_branch.BranchFormat.unregister_format, factory)
 
199
        _mod_branch.format_registry.register(factory)
 
200
        self.addCleanup(_mod_branch.format_registry.remove, factory)
173
201
        b = _mod_branch.Branch.open(self.get_url())
174
202
        self.assertEqual(b, "opened supported branch.")
175
203
 
 
204
    def test_from_string(self):
 
205
        self.assertIsInstance(
 
206
            SampleBranchFormat.from_string("Sample branch format."),
 
207
            SampleBranchFormat)
 
208
        self.assertRaises(AssertionError,
 
209
            SampleBranchFormat.from_string, "Different branch format.")
 
210
 
176
211
    def test_find_format_not_branch(self):
177
212
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
178
213
        self.assertRaises(errors.NotBranchError,
179
 
                          _mod_branch.BranchFormat.find_format,
 
214
                          _mod_branch.BranchFormatMetadir.find_format,
180
215
                          dir)
181
216
 
182
217
    def test_find_format_unknown_format(self):
183
218
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
219
        SampleBranchFormat().initialize(dir)
185
220
        self.assertRaises(errors.UnknownFormatError,
186
 
                          _mod_branch.BranchFormat.find_format,
 
221
                          _mod_branch.BranchFormatMetadir.find_format,
187
222
                          dir)
188
223
 
 
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, {})
 
233
 
 
234
 
 
235
class TestBranchFormatRegistry(tests.TestCase):
 
236
 
 
237
    def setUp(self):
 
238
        super(TestBranchFormatRegistry, self).setUp()
 
239
        self.registry = _mod_branch.BranchFormatRegistry()
 
240
 
 
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())
 
246
 
189
247
    def test_register_unregister_format(self):
190
248
        format = SampleBranchFormat()
191
 
        # make a control dir
192
 
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
193
 
        # make a branch
194
 
        format.initialize(dir)
195
 
        # register a format for it.
196
 
        _mod_branch.BranchFormat.register_format(format)
197
 
        # which branch.Open will refuse (not supported)
198
 
        self.assertRaises(errors.UnsupportedFormatError,
199
 
                          _mod_branch.Branch.open, self.get_url())
200
 
        self.make_branch_and_tree('foo')
201
 
        # but open_downlevel will work
202
 
        self.assertEqual(
203
 
            format.open(dir),
204
 
            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
205
 
        # unregister the format
206
 
        _mod_branch.BranchFormat.unregister_format(format)
207
 
        self.make_branch_and_tree('bar')
 
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.")
 
255
 
 
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())
 
261
 
 
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())
 
267
 
 
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)
208
275
 
209
276
 
210
277
#Used by TestMetaDirBranchFormatFactory 
259
326
 
260
327
    def test_layout(self):
261
328
        branch = self.make_branch('a', format=self.get_format_name())
262
 
        self.failUnlessExists('a/.bzr/branch/last-revision')
263
 
        self.failIfExists('a/.bzr/branch/revision-history')
264
 
        self.failIfExists('a/.bzr/branch/references')
 
329
        self.assertPathExists('a/.bzr/branch/last-revision')
 
330
        self.assertPathDoesNotExist('a/.bzr/branch/revision-history')
 
331
        self.assertPathDoesNotExist('a/.bzr/branch/references')
265
332
 
266
333
    def test_config(self):
267
334
        """Ensure that all configuration data is stored in the branch"""
268
335
        branch = self.make_branch('a', format=self.get_format_name())
269
 
        branch.set_parent('http://bazaar-vcs.org')
270
 
        self.failIfExists('a/.bzr/branch/parent')
271
 
        self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
272
 
        branch.set_push_location('sftp://bazaar-vcs.org')
273
 
        config = branch.get_config()._get_branch_data_config()
274
 
        self.assertEqual('sftp://bazaar-vcs.org',
275
 
                         config.get_user_option('push_location'))
276
 
        branch.set_bound_location('ftp://bazaar-vcs.org')
277
 
        self.failIfExists('a/.bzr/branch/bound')
278
 
        self.assertEqual('ftp://bazaar-vcs.org', branch.get_bound_location())
279
 
 
280
 
    def test_set_revision_history(self):
281
 
        builder = self.make_branch_builder('.', format=self.get_format_name())
282
 
        builder.build_snapshot('foo', None,
283
 
            [('add', ('', None, 'directory', None))],
284
 
            message='foo')
285
 
        builder.build_snapshot('bar', None, [], message='bar')
286
 
        branch = builder.get_branch()
287
 
        branch.lock_write()
288
 
        self.addCleanup(branch.unlock)
289
 
        branch.set_revision_history(['foo', 'bar'])
290
 
        branch.set_revision_history(['foo'])
291
 
        self.assertRaises(errors.NotLefthandHistory,
292
 
                          branch.set_revision_history, ['bar'])
 
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())
293
345
 
294
346
    def do_checkout_test(self, lightweight=False):
295
347
        tree = self.make_branch_and_tree('source',
308
360
        subtree.commit('a subtree file')
309
361
        subsubtree.commit('a subsubtree file')
310
362
        tree.branch.create_checkout('target', lightweight=lightweight)
311
 
        self.failUnlessExists('target')
312
 
        self.failUnlessExists('target/subtree')
313
 
        self.failUnlessExists('target/subtree/file')
314
 
        self.failUnlessExists('target/subtree/subsubtree/file')
 
363
        self.assertPathExists('target')
 
364
        self.assertPathExists('target/subtree')
 
365
        self.assertPathExists('target/subtree/file')
 
366
        self.assertPathExists('target/subtree/subsubtree/file')
315
367
        subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
316
368
        if lightweight:
317
369
            self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
324
376
    def test_light_checkout_with_references(self):
325
377
        self.do_checkout_test(lightweight=True)
326
378
 
327
 
    def test_set_push(self):
328
 
        branch = self.make_branch('source', format=self.get_format_name())
329
 
        branch.get_config().set_user_option('push_location', 'old',
330
 
            store=config.STORE_LOCATION)
331
 
        warnings = []
332
 
        def warning(*args):
333
 
            warnings.append(args[0] % args[1:])
334
 
        _warning = trace.warning
335
 
        trace.warning = warning
336
 
        try:
337
 
            branch.set_push_location('new')
338
 
        finally:
339
 
            trace.warning = _warning
340
 
        self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
341
 
                         'locations.conf')
342
 
 
343
379
 
344
380
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
345
381
 
416
452
 
417
453
    def make_branch(self, location, format=None):
418
454
        if format is None:
419
 
            format = bzrdir.format_registry.make_bzrdir('1.9')
 
455
            format = controldir.format_registry.make_bzrdir('1.9')
420
456
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
421
457
        return tests.TestCaseWithTransport.make_branch(
422
458
            self, location, format=format)
474
510
        self.assertEqual(('path3', 'location3'),
475
511
                         branch.get_reference_info('file-id'))
476
512
 
 
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):
 
517
            q = list(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
 
521
 
 
522
 
477
523
class TestBranchReference(tests.TestCaseWithTransport):
478
524
    """Tests for the branch reference facility."""
479
525
 
480
526
    def test_create_open_reference(self):
481
527
        bzrdirformat = bzrdir.BzrDirMetaFormat1()
482
 
        t = transport.get_transport(self.get_url('.'))
 
528
        t = self.get_transport()
483
529
        t.mkdir('repo')
484
530
        dir = bzrdirformat.initialize(self.get_url('repo'))
485
531
        dir.create_repository()
493
539
        self.assertEqual(opened_branch.base, target_branch.base)
494
540
 
495
541
    def test_get_reference(self):
496
 
        """For a BranchReference, get_reference should reutrn the location."""
 
542
        """For a BranchReference, get_reference should return the location."""
497
543
        branch = self.make_branch('target')
498
544
        checkout = branch.create_checkout('checkout', lightweight=True)
499
545
        reference_url = branch.bzrdir.root_transport.abspath('') + '/'
509
555
    def test_constructor(self):
510
556
        """Check that creating a BranchHooks instance has the right defaults."""
511
557
        hooks = _mod_branch.BranchHooks()
512
 
        self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
513
558
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
514
559
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
515
560
        self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
579
624
    def setUp(self):
580
625
        super(TestBranchOptions, self).setUp()
581
626
        self.branch = self.make_branch('.')
582
 
        self.config = self.branch.get_config()
 
627
        self.config_stack = self.branch.get_config_stack()
583
628
 
584
629
    def check_append_revisions_only(self, expected_value, value=None):
585
630
        """Set append_revisions_only in config and check its interpretation."""
586
631
        if value is not None:
587
 
            self.config.set_user_option('append_revisions_only', value)
 
632
            self.config_stack.set('append_revisions_only', value)
588
633
        self.assertEqual(expected_value,
589
 
                         self.branch._get_append_revisions_only())
 
634
                         self.branch.get_append_revisions_only())
590
635
 
591
636
    def test_valid_append_revisions_only(self):
592
637
        self.assertEquals(None,
593
 
                          self.config.get_user_option('append_revisions_only'))
 
638
                          self.config_stack.get('append_revisions_only'))
594
639
        self.check_append_revisions_only(None)
595
640
        self.check_append_revisions_only(False, 'False')
596
641
        self.check_append_revisions_only(True, 'True')
608
653
        self.check_append_revisions_only(None, 'not-a-bool')
609
654
        self.assertLength(1, self.warnings)
610
655
        self.assertEqual(
611
 
            'Value "not-a-bool" is not a boolean for "append_revisions_only"',
 
656
            'Value "not-a-bool" is not valid for "append_revisions_only"',
612
657
            self.warnings[0])
613
658
 
 
659
    def test_use_fresh_values(self):
 
660
        copy = _mod_branch.Branch.open(self.branch.base)
 
661
        copy.lock_write()
 
662
        try:
 
663
            copy.get_config_stack().set('foo', 'bar')
 
664
        finally:
 
665
            copy.unlock()
 
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'))
 
674
 
 
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)
 
683
 
 
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'))
 
692
 
 
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)
 
703
 
614
704
 
615
705
class TestPullResult(tests.TestCase):
616
706
 
617
 
    def test_pull_result_to_int(self):
618
 
        # to support old code, the pull result can be used as an int
619
 
        r = _mod_branch.PullResult()
620
 
        r.old_revno = 10
621
 
        r.new_revno = 20
622
 
        # this usage of results is not recommended for new code (because it
623
 
        # doesn't describe very well what happened), but for api stability
624
 
        # it's still supported
625
 
        a = "%d revisions pulled" % r
626
 
        self.assertEqual(a, "10 revisions pulled")
627
 
 
628
707
    def test_report_changed(self):
629
708
        r = _mod_branch.PullResult()
630
709
        r.old_revid = "old-revid"
634
713
        f = StringIO()
635
714
        r.report(f)
636
715
        self.assertEqual("Now on revision 20.\n", f.getvalue())
 
716
        self.assertEqual("Now on revision 20.\n", f.getvalue())
637
717
 
638
718
    def test_report_unchanged(self):
639
719
        r = _mod_branch.PullResult()
641
721
        r.new_revid = "same-revid"
642
722
        f = StringIO()
643
723
        r.report(f)
644
 
        self.assertEqual("No revisions to pull.\n", f.getvalue())
645
 
 
646
 
 
647
 
class _StubLockable(object):
648
 
    """Helper for TestRunWithWriteLockedTarget."""
649
 
 
650
 
    def __init__(self, calls, unlock_exc=None):
651
 
        self.calls = calls
652
 
        self.unlock_exc = unlock_exc
653
 
 
654
 
    def lock_write(self):
655
 
        self.calls.append('lock_write')
656
 
 
657
 
    def unlock(self):
658
 
        self.calls.append('unlock')
659
 
        if self.unlock_exc is not None:
660
 
            raise self.unlock_exc
661
 
 
662
 
 
663
 
class _ErrorFromCallable(Exception):
664
 
    """Helper for TestRunWithWriteLockedTarget."""
665
 
 
666
 
 
667
 
class _ErrorFromUnlock(Exception):
668
 
    """Helper for TestRunWithWriteLockedTarget."""
669
 
 
670
 
 
671
 
class TestRunWithWriteLockedTarget(tests.TestCase):
672
 
    """Tests for _run_with_write_locked_target."""
673
 
 
674
 
    def setUp(self):
675
 
        tests.TestCase.setUp(self)
676
 
        self._calls = []
677
 
 
678
 
    def func_that_returns_ok(self):
679
 
        self._calls.append('func called')
680
 
        return 'ok'
681
 
 
682
 
    def func_that_raises(self):
683
 
        self._calls.append('func called')
684
 
        raise _ErrorFromCallable()
685
 
 
686
 
    def test_success_unlocks(self):
687
 
        lockable = _StubLockable(self._calls)
688
 
        result = _mod_branch._run_with_write_locked_target(
689
 
            lockable, self.func_that_returns_ok)
690
 
        self.assertEqual('ok', result)
691
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
692
 
 
693
 
    def test_exception_unlocks_and_propagates(self):
694
 
        lockable = _StubLockable(self._calls)
695
 
        self.assertRaises(_ErrorFromCallable,
696
 
                          _mod_branch._run_with_write_locked_target,
697
 
                          lockable, self.func_that_raises)
698
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
699
 
 
700
 
    def test_callable_succeeds_but_error_during_unlock(self):
701
 
        lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
702
 
        self.assertRaises(_ErrorFromUnlock,
703
 
                          _mod_branch._run_with_write_locked_target,
704
 
                          lockable, self.func_that_returns_ok)
705
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
706
 
 
707
 
    def test_error_during_unlock_does_not_mask_original_error(self):
708
 
        lockable = _StubLockable(self._calls, unlock_exc=_ErrorFromUnlock())
709
 
        self.assertRaises(_ErrorFromCallable,
710
 
                          _mod_branch._run_with_write_locked_target,
711
 
                          lockable, self.func_that_raises)
712
 
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
713
 
 
714
 
 
 
724
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())