← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Kit Randel
  • Date: 2014-12-15 20:24:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6602.
  • Revision ID: kit.randel@canonical.com-20141215202442-usf2ixhypqg8yh6q
added a note for bug-1400567 to the 2.7b release notes

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