/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4988.10.5 by John Arbash Meinel
Merge bzr.dev 5021 to resolve NEWS
1
# Copyright (C) 2006-2010 Canonical Ltd
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
2
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
7
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
12
#
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
16
17
"""Tests for the Branch facility that are not interface  tests.
18
4523.1.1 by Martin Pool
Rename tests.branch_implementations to per_branch
19
For interface tests see tests/per_branch/*.py.
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
20
21
For concrete class tests see this file, and for meta-branch tests
22
also see this file.
23
"""
24
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
25
from cStringIO import StringIO
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
26
2230.3.3 by Aaron Bentley
Add more config testing
27
from bzrlib import (
28
    branch as _mod_branch,
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
29
    bzrdir,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
30
    config,
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
31
    errors,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
32
    tests,
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
33
    trace,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
34
    transport,
2230.3.3 by Aaron Bentley
Add more config testing
35
    urlutils,
36
    )
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
37
3445.2.1 by John Arbash Meinel
Add tests for Branch.missing_revisions and deprecate it.
38
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
39
class TestDefaultFormat(tests.TestCase):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
40
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
41
    def test_default_format(self):
42
        # update this if you change the default branch format
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
43
        self.assertIsInstance(_mod_branch.BranchFormat.get_default_format(),
44
                _mod_branch.BzrBranchFormat7)
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
45
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
46
    def test_default_format_is_same_as_bzrdir_default(self):
47
        # XXX: it might be nice if there was only one place the default was
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
48
        # set, but at the moment that's not true -- mbp 20070814 --
2696.3.8 by Martin Pool
doc
49
        # https://bugs.launchpad.net/bzr/+bug/132376
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
50
        self.assertEqual(
51
            _mod_branch.BranchFormat.get_default_format(),
52
            bzrdir.BzrDirFormat.get_default_format().get_branch_format())
2696.3.3 by Martin Pool
Start setting the default format to dirstate-tags
53
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
54
    def test_get_set_default_format(self):
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
55
        # set the format and then set it back again
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
56
        old_format = _mod_branch.BranchFormat.get_default_format()
57
        _mod_branch.BranchFormat.set_default_format(SampleBranchFormat())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
58
        try:
59
            # the default branch format is used by the meta dir format
60
            # which is not the default bzrdir format at this point
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
61
            dir = bzrdir.BzrDirMetaFormat1().initialize('memory:///')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
62
            result = dir.create_branch()
63
            self.assertEqual(result, 'A branch')
64
        finally:
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
65
            _mod_branch.BranchFormat.set_default_format(old_format)
66
        self.assertEqual(old_format,
67
                         _mod_branch.BranchFormat.get_default_format())
1508.1.25 by Robert Collins
Update per review comments.
68
69
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
70
class TestBranchFormat5(tests.TestCaseWithTransport):
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
71
    """Tests specific to branch format 5"""
72
73
    def test_branch_format_5_uses_lockdir(self):
74
        url = self.get_url()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
75
        bdir = bzrdir.BzrDirMetaFormat1().initialize(url)
76
        bdir.create_repository()
77
        branch = bdir.create_branch()
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
78
        t = self.get_transport()
79
        self.log("branch instance is %r" % branch)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
80
        self.assert_(isinstance(branch, _mod_branch.BzrBranch5))
1553.5.72 by Martin Pool
Clean up test for Branch5 lockdirs
81
        self.assertIsDirectory('.', t)
82
        self.assertIsDirectory('.bzr/branch', t)
83
        self.assertIsDirectory('.bzr/branch/lock', t)
1553.5.73 by Martin Pool
Additional test that Branch5 uses lockdir properly
84
        branch.lock_write()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
85
        self.addCleanup(branch.unlock)
86
        self.assertIsDirectory('.bzr/branch/lock/held', t)
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
87
2230.3.3 by Aaron Bentley
Add more config testing
88
    def test_set_push_location(self):
5345.1.26 by Vincent Ladeuil
Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts
89
        conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
2839.3.1 by Alexander Belchenko
provide non-empty locations.conf for test_branch.TestBranchFormat5.test_set_push_location
90
2230.3.3 by Aaron Bentley
Add more config testing
91
        branch = self.make_branch('.', format='knit')
92
        branch.set_push_location('foo')
93
        local_path = urlutils.local_path_from_url(branch.base[:-1])
2839.3.1 by Alexander Belchenko
provide non-empty locations.conf for test_branch.TestBranchFormat5.test_set_push_location
94
        self.assertFileEqual("# comment\n"
95
                             "[%s]\n"
2230.3.3 by Aaron Bentley
Add more config testing
96
                             "push_location = foo\n"
3221.7.1 by Matt Nordhoff
Upgrade ConfigObj to version 4.5.1.
97
                             "push_location:policy = norecurse\n" % local_path,
5345.1.11 by Vincent Ladeuil
Cleanup bt.test_branch.
98
                             config.locations_config_filename())
2230.3.3 by Aaron Bentley
Add more config testing
99
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
100
    # TODO RBC 20051029 test getting a push location from a branch in a
2230.3.3 by Aaron Bentley
Add more config testing
101
    # recursive section - that is, it appends the branch name.
102
1553.5.71 by Martin Pool
Change branch format 5 to use LockDirs, not transport locks
103
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
104
class SampleBranchFormat(_mod_branch.BranchFormat):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
105
    """A sample format
106
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
107
    this format is initializable, unsupported to aid in testing the
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
108
    open and open_downlevel routines.
109
    """
110
111
    def get_format_string(self):
112
        """See BzrBranchFormat.get_format_string()."""
113
        return "Sample branch format."
114
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
115
    def initialize(self, a_bzrdir, name=None):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
116
        """Format 4 branches cannot be created."""
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
117
        t = a_bzrdir.get_branch_transport(self, name=name)
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
118
        t.put_bytes('format', self.get_format_string())
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
119
        return 'A branch'
120
121
    def is_supported(self):
122
        return False
123
5051.3.16 by Jelmer Vernooij
Fix tests - missing argument.
124
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
125
        return "opened branch."
126
127
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
128
# Demonstrating how lazy loading is often implemented:
129
# A constant string is created.
130
SampleSupportedBranchFormatString = "Sample supported branch format."
131
132
# And the format class can then reference the constant to avoid skew.
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
133
class SampleSupportedBranchFormat(_mod_branch.BranchFormat):
134
    """A sample supported format."""
135
136
    def get_format_string(self):
137
        """See BzrBranchFormat.get_format_string()."""
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
138
        return SampleSupportedBranchFormatString
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
139
140
    def initialize(self, a_bzrdir, name=None):
141
        t = a_bzrdir.get_branch_transport(self, name=name)
142
        t.put_bytes('format', self.get_format_string())
143
        return 'A branch'
144
145
    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):
146
        return "opened supported branch."
147
148
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
149
class TestBzrBranchFormat(tests.TestCaseWithTransport):
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
150
    """Tests for the BzrBranchFormat facility."""
151
152
    def test_find_format(self):
153
        # is the right format object found for a branch?
154
        # create a branch with a few known format objects.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
155
        # this is not quite the same as
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
156
        self.build_tree(["foo/", "bar/"])
157
        def check_format(format, url):
158
            dir = format._matchingbzrdir.initialize(url)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
159
            dir.create_repository()
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
160
            format.initialize(dir)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
161
            found_format = _mod_branch.BranchFormat.find_format(dir)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
162
            self.failUnless(isinstance(found_format, format.__class__))
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
163
        check_format(_mod_branch.BzrBranchFormat5(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
164
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
165
    def test_find_format_factory(self):
166
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
167
        SampleSupportedBranchFormat().initialize(dir)
168
        factory = _mod_branch.MetaDirBranchFormatFactory(
5305.1.2 by Robert Collins
More clarity about how to use the lazy registration feature.
169
            SampleSupportedBranchFormatString,
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
170
            "bzrlib.tests.test_branch", "SampleSupportedBranchFormat")
171
        _mod_branch.BranchFormat.register_format(factory)
172
        self.addCleanup(_mod_branch.BranchFormat.unregister_format, factory)
173
        b = _mod_branch.Branch.open(self.get_url())
174
        self.assertEqual(b, "opened supported branch.")
175
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
176
    def test_find_format_not_branch(self):
177
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
178
        self.assertRaises(errors.NotBranchError,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
179
                          _mod_branch.BranchFormat.find_format,
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
180
                          dir)
181
182
    def test_find_format_unknown_format(self):
183
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
        SampleBranchFormat().initialize(dir)
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
185
        self.assertRaises(errors.UnknownFormatError,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
186
                          _mod_branch.BranchFormat.find_format,
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
187
                          dir)
188
189
    def test_register_unregister_format(self):
190
        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.
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
196
        _mod_branch.BranchFormat.register_format(format)
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
197
        # which branch.Open will refuse (not supported)
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
198
        self.assertRaises(errors.UnsupportedFormatError,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
199
                          _mod_branch.Branch.open, self.get_url())
2230.3.22 by Aaron Bentley
Make test suite use format registry default, not BzrDir default
200
        self.make_branch_and_tree('foo')
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
201
        # but open_downlevel will work
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
202
        self.assertEqual(
203
            format.open(dir),
204
            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
1534.4.44 by Robert Collins
Make a new BzrDir format that uses a versioned branch format in a branch/ subdirectory.
205
        # unregister the format
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
206
        _mod_branch.BranchFormat.unregister_format(format)
2230.3.22 by Aaron Bentley
Make test suite use format registry default, not BzrDir default
207
        self.make_branch_and_tree('bar')
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
208
209
5305.1.1 by Robert Collins
``Branch`` formats can now be loaded lazily by registering a
210
#Used by TestMetaDirBranchFormatFactory 
211
FakeLazyFormat = None
212
213
214
class TestMetaDirBranchFormatFactory(tests.TestCase):
215
216
    def test_get_format_string_does_not_load(self):
217
        """Formats have a static format string."""
218
        factory = _mod_branch.MetaDirBranchFormatFactory("yo", None, None)
219
        self.assertEqual("yo", factory.get_format_string())
220
221
    def test_call_loads(self):
222
        # __call__ is used by the network_format_registry interface to get a
223
        # Format.
224
        global FakeLazyFormat
225
        del FakeLazyFormat
226
        factory = _mod_branch.MetaDirBranchFormatFactory(None,
227
            "bzrlib.tests.test_branch", "FakeLazyFormat")
228
        self.assertRaises(AttributeError, factory)
229
230
    def test_call_returns_call_of_referenced_object(self):
231
        global FakeLazyFormat
232
        FakeLazyFormat = lambda:'called'
233
        factory = _mod_branch.MetaDirBranchFormatFactory(None,
234
            "bzrlib.tests.test_branch", "FakeLazyFormat")
235
        self.assertEqual('called', factory())
236
237
3221.11.2 by Robert Collins
Create basic stackable branch facility.
238
class TestBranch67(object):
239
    """Common tests for both branch 6 and 7 which are mostly the same."""
240
241
    def get_format_name(self):
242
        raise NotImplementedError(self.get_format_name)
243
244
    def get_format_name_subtree(self):
245
        raise NotImplementedError(self.get_format_name)
246
247
    def get_class(self):
248
        raise NotImplementedError(self.get_class)
2230.3.1 by Aaron Bentley
Get branch6 creation working
249
250
    def test_creation(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
251
        format = bzrdir.BzrDirMetaFormat1()
2230.3.55 by Aaron Bentley
Updates from review
252
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
2230.3.1 by Aaron Bentley
Get branch6 creation working
253
        branch = self.make_branch('a', format=format)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
254
        self.assertIsInstance(branch, self.get_class())
255
        branch = self.make_branch('b', format=self.get_format_name())
256
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
257
        branch = _mod_branch.Branch.open('a')
3221.11.2 by Robert Collins
Create basic stackable branch facility.
258
        self.assertIsInstance(branch, self.get_class())
2230.3.1 by Aaron Bentley
Get branch6 creation working
259
260
    def test_layout(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
261
        branch = self.make_branch('a', format=self.get_format_name())
2230.3.1 by Aaron Bentley
Get branch6 creation working
262
        self.failUnlessExists('a/.bzr/branch/last-revision')
263
        self.failIfExists('a/.bzr/branch/revision-history')
4273.1.12 by Aaron Bentley
Don't create reference files for older formats.
264
        self.failIfExists('a/.bzr/branch/references')
2230.3.1 by Aaron Bentley
Get branch6 creation working
265
2230.3.3 by Aaron Bentley
Add more config testing
266
    def test_config(self):
267
        """Ensure that all configuration data is stored in the branch"""
3221.11.2 by Robert Collins
Create basic stackable branch facility.
268
        branch = self.make_branch('a', format=self.get_format_name())
2230.3.3 by Aaron Bentley
Add more config testing
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()
2230.3.12 by Aaron Bentley
Clean up trailing whitespace
274
        self.assertEqual('sftp://bazaar-vcs.org',
2230.3.3 by Aaron Bentley
Add more config testing
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
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
280
    def test_set_revision_history(self):
3567.4.16 by John Arbash Meinel
Use the new BranchBuilder api in a Branch test
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'])
2230.3.44 by Aaron Bentley
Change asserts to specific errors for left-hand history violations
293
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
294
    def do_checkout_test(self, lightweight=False):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
295
        tree = self.make_branch_and_tree('source',
296
            format=self.get_format_name_subtree())
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
297
        subtree = self.make_branch_and_tree('source/subtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
298
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
299
        subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
3221.11.2 by Robert Collins
Create basic stackable branch facility.
300
            format=self.get_format_name_subtree())
2100.3.25 by Aaron Bentley
add subsubtree to test
301
        self.build_tree(['source/subtree/file',
302
                         'source/subtree/subsubtree/file'])
303
        subsubtree.add('file')
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
304
        subtree.add('file')
2100.3.25 by Aaron Bentley
add subsubtree to test
305
        subtree.add_reference(subsubtree)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
306
        tree.add_reference(subtree)
307
        tree.commit('a revision')
2100.3.23 by Aaron Bentley
Nested checkouts kinda work
308
        subtree.commit('a subtree file')
2100.3.25 by Aaron Bentley
add subsubtree to test
309
        subsubtree.commit('a subsubtree file')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
310
        tree.branch.create_checkout('target', lightweight=lightweight)
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
311
        self.failUnlessExists('target')
312
        self.failUnlessExists('target/subtree')
313
        self.failUnlessExists('target/subtree/file')
2100.3.25 by Aaron Bentley
add subsubtree to test
314
        self.failUnlessExists('target/subtree/subsubtree/file')
2100.3.31 by Aaron Bentley
Merged bzr.dev (17 tests failing)
315
        subbranch = _mod_branch.Branch.open('target/subtree/subsubtree')
2100.3.26 by Aaron Bentley
checkout type is maintained for subtrees
316
        if lightweight:
317
            self.assertEndsWith(subbranch.base, 'source/subtree/subsubtree/')
318
        else:
319
            self.assertEndsWith(subbranch.base, 'target/subtree/subsubtree/')
320
321
    def test_checkout_with_references(self):
322
        self.do_checkout_test()
323
324
    def test_light_checkout_with_references(self):
325
        self.do_checkout_test(lightweight=True)
2230.3.51 by Aaron Bentley
Store revno for Branch6, set_last_revision -> set_last_revision_info
326
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
327
    def test_set_push(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
328
        branch = self.make_branch('source', format=self.get_format_name())
1551.15.35 by Aaron Bentley
Warn when setting config values that will be masked (#122286)
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
3445.2.1 by John Arbash Meinel
Add tests for Branch.missing_revisions and deprecate it.
343
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
344
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
345
346
    def get_class(self):
347
        return _mod_branch.BzrBranch6
348
349
    def get_format_name(self):
350
        return "dirstate-tags"
351
352
    def get_format_name_subtree(self):
353
        return "dirstate-with-subtree"
354
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
355
    def test_set_stacked_on_url_errors(self):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
356
        branch = self.make_branch('a', format=self.get_format_name())
357
        self.assertRaises(errors.UnstackableBranchFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
358
            branch.set_stacked_on_url, None)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
359
360
    def test_default_stacked_location(self):
361
        branch = self.make_branch('a', format=self.get_format_name())
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
362
        self.assertRaises(errors.UnstackableBranchFormat, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
363
364
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
365
class TestBranch7(TestBranch67, tests.TestCaseWithTransport):
3221.11.2 by Robert Collins
Create basic stackable branch facility.
366
367
    def get_class(self):
368
        return _mod_branch.BzrBranch7
369
370
    def get_format_name(self):
4241.6.8 by Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil
Add --development6-rich-root, disabling the legacy and unneeded development2 format, and activating the tests for CHK features disabled pending this format. (Robert Collins, John Arbash Meinel, Ian Clatworthy, Vincent Ladeuil)
371
        return "1.9"
3221.11.2 by Robert Collins
Create basic stackable branch facility.
372
373
    def get_format_name_subtree(self):
374
        return "development-subtree"
375
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
376
    def test_set_stacked_on_url_unstackable_repo(self):
3221.11.6 by Robert Collins
Stackable branch fixes.
377
        repo = self.make_repository('a', format='dirstate-tags')
378
        control = repo.bzrdir
379
        branch = _mod_branch.BzrBranchFormat7().initialize(control)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
380
        target = self.make_branch('b')
381
        self.assertRaises(errors.UnstackableRepositoryFormat,
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
382
            branch.set_stacked_on_url, target.base)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
383
3242.3.21 by Jonathan Lange
Preserve stacking in clone
384
    def test_clone_stacked_on_unstackable_repo(self):
385
        repo = self.make_repository('a', format='dirstate-tags')
386
        control = repo.bzrdir
387
        branch = _mod_branch.BzrBranchFormat7().initialize(control)
388
        # Calling clone should not raise UnstackableRepositoryFormat.
389
        cloned_bzrdir = control.clone('cloned')
390
3221.11.2 by Robert Collins
Create basic stackable branch facility.
391
    def _test_default_stacked_location(self):
392
        branch = self.make_branch('a', format=self.get_format_name())
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
393
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
3221.11.2 by Robert Collins
Create basic stackable branch facility.
394
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
395
    def test_stack_and_unstack(self):
396
        branch = self.make_branch('a', format=self.get_format_name())
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
397
        target = self.make_branch_and_tree('b', format=self.get_format_name())
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
398
        branch.set_stacked_on_url(target.branch.base)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
399
        self.assertEqual(target.branch.base, branch.get_stacked_on_url())
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
400
        revid = target.commit('foo')
401
        self.assertTrue(branch.repository.has_revision(revid))
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
402
        branch.set_stacked_on_url(None)
3537.3.1 by Martin Pool
Rename branch.get_stacked_on to get_stacked_on_url
403
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
3221.11.10 by Robert Collins
Extend set_stacked_on to update the repository with the right external references.
404
        self.assertFalse(branch.repository.has_revision(revid))
3221.11.8 by Robert Collins
Minimally test stacking and unstacking a repository.
405
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
406
    def test_open_opens_stacked_reference(self):
407
        branch = self.make_branch('a', format=self.get_format_name())
408
        target = self.make_branch_and_tree('b', format=self.get_format_name())
3537.3.3 by Martin Pool
Rename Branch.set_stacked_on to set_stacked_on_url
409
        branch.set_stacked_on_url(target.branch.base)
3221.11.11 by Robert Collins
Ensure opening a stacked branch gives a ready to use repository.
410
        branch = branch.bzrdir.open_branch()
411
        revid = target.commit('foo')
412
        self.assertTrue(branch.repository.has_revision(revid))
413
3221.11.2 by Robert Collins
Create basic stackable branch facility.
414
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
415
class BzrBranch8(tests.TestCaseWithTransport):
4273.1.15 by Aaron Bentley
Add reference_info caching.
416
417
    def make_branch(self, location, format=None):
418
        if format is None:
419
            format = bzrdir.format_registry.make_bzrdir('1.9')
420
            format.set_branch_format(_mod_branch.BzrBranchFormat8())
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
421
        return tests.TestCaseWithTransport.make_branch(
422
            self, location, format=format)
4273.1.15 by Aaron Bentley
Add reference_info caching.
423
424
    def create_branch_with_reference(self):
425
        branch = self.make_branch('branch')
426
        branch._set_all_reference_info({'file-id': ('path', 'location')})
427
        return branch
428
429
    @staticmethod
430
    def instrument_branch(branch, gets):
431
        old_get = branch._transport.get
432
        def get(*args, **kwargs):
433
            gets.append((args, kwargs))
434
            return old_get(*args, **kwargs)
435
        branch._transport.get = get
436
437
    def test_reference_info_caching_read_locked(self):
438
        gets = []
439
        branch = self.create_branch_with_reference()
440
        branch.lock_read()
441
        self.addCleanup(branch.unlock)
442
        self.instrument_branch(branch, gets)
443
        branch.get_reference_info('file-id')
444
        branch.get_reference_info('file-id')
445
        self.assertEqual(1, len(gets))
446
447
    def test_reference_info_caching_read_unlocked(self):
448
        gets = []
449
        branch = self.create_branch_with_reference()
450
        self.instrument_branch(branch, gets)
451
        branch.get_reference_info('file-id')
452
        branch.get_reference_info('file-id')
453
        self.assertEqual(2, len(gets))
454
455
    def test_reference_info_caching_write_locked(self):
456
        gets = []
457
        branch = self.make_branch('branch')
458
        branch.lock_write()
459
        self.instrument_branch(branch, gets)
460
        self.addCleanup(branch.unlock)
461
        branch._set_all_reference_info({'file-id': ('path2', 'location2')})
462
        path, location = branch.get_reference_info('file-id')
463
        self.assertEqual(0, len(gets))
464
        self.assertEqual('path2', path)
465
        self.assertEqual('location2', location)
466
467
    def test_reference_info_caches_cleared(self):
468
        branch = self.make_branch('branch')
469
        branch.lock_write()
470
        branch.set_reference_info('file-id', 'path2', 'location2')
471
        branch.unlock()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
472
        doppelganger = _mod_branch.Branch.open('branch')
4273.1.15 by Aaron Bentley
Add reference_info caching.
473
        doppelganger.set_reference_info('file-id', 'path3', 'location3')
474
        self.assertEqual(('path3', 'location3'),
475
                         branch.get_reference_info('file-id'))
476
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
477
class TestBranchReference(tests.TestCaseWithTransport):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
478
    """Tests for the branch reference facility."""
479
480
    def test_create_open_reference(self):
481
        bzrdirformat = bzrdir.BzrDirMetaFormat1()
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
482
        t = transport.get_transport(self.get_url('.'))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
483
        t.mkdir('repo')
484
        dir = bzrdirformat.initialize(self.get_url('repo'))
485
        dir.create_repository()
486
        target_branch = dir.create_branch()
487
        t.mkdir('branch')
488
        branch_dir = bzrdirformat.initialize(self.get_url('branch'))
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
489
        made_branch = _mod_branch.BranchReferenceFormat().initialize(
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
490
            branch_dir, target_branch=target_branch)
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
491
        self.assertEqual(made_branch.base, target_branch.base)
492
        opened_branch = branch_dir.open_branch()
493
        self.assertEqual(opened_branch.base, target_branch.base)
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
494
495
    def test_get_reference(self):
496
        """For a BranchReference, get_reference should reutrn the location."""
497
        branch = self.make_branch('target')
498
        checkout = branch.create_checkout('checkout', lightweight=True)
499
        reference_url = branch.bzrdir.root_transport.abspath('') + '/'
500
        # if the api for create_checkout changes to return different checkout types
501
        # then this file read will fail.
502
        self.assertFileEqual(reference_url, 'checkout/.bzr/branch/location')
503
        self.assertEqual(reference_url,
2018.5.97 by Andrew Bennetts
Fix more tests.
504
            _mod_branch.BranchReferenceFormat().get_reference(checkout.bzrdir))
2018.5.45 by Andrew Bennetts
Merge from bzr.dev
505
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
506
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
507
class TestHooks(tests.TestCaseWithTransport):
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
508
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
509
    def test_constructor(self):
510
        """Check that creating a BranchHooks instance has the right defaults."""
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
511
        hooks = _mod_branch.BranchHooks()
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
512
        self.assertTrue("set_rh" in hooks, "set_rh not in %s" % hooks)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
513
        self.assertTrue("post_push" in hooks, "post_push not in %s" % hooks)
514
        self.assertTrue("post_commit" in hooks, "post_commit not in %s" % hooks)
2659.3.1 by NamNguyen
``Branch.hooks`` now supports ``pre_commit`` hook.
515
        self.assertTrue("pre_commit" in hooks, "pre_commit not in %s" % hooks)
2246.1.3 by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
516
        self.assertTrue("post_pull" in hooks, "post_pull not in %s" % hooks)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
517
        self.assertTrue("post_uncommit" in hooks,
518
                        "post_uncommit not in %s" % hooks)
3331.1.4 by James Henstridge
Adjust my tests to pass with Ian's API.
519
        self.assertTrue("post_change_branch_tip" in hooks,
520
                        "post_change_branch_tip not in %s" % hooks)
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
521
        self.assertTrue("post_branch_init" in hooks,
522
                        "post_branch_init not in %s" % hooks)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
523
        self.assertTrue("post_switch" in hooks,
524
                        "post_switch not in %s" % hooks)
2245.1.1 by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers
525
2245.1.2 by Robert Collins
Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
526
    def test_installed_hooks_are_BranchHooks(self):
527
        """The installed hooks object should be a BranchHooks."""
528
        # the installed hooks are saved in self._preserved_hooks.
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
529
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch][1],
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
530
                              _mod_branch.BranchHooks)
2245.1.3 by Robert Collins
Add install_hook to the BranchHooks class as the official means for installing a hook.
531
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
532
    def test_post_branch_init_hook(self):
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
533
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
534
        _mod_branch.Branch.hooks.install_named_hook('post_branch_init',
535
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
536
        self.assertLength(0, calls)
537
        branch = self.make_branch('a')
538
        self.assertLength(1, calls)
539
        params = calls[0]
5107.3.2 by Marco Pantaleoni
Renamed 'post_branch' hook to 'post_branch_init', for more consistency,
540
        self.assertIsInstance(params, _mod_branch.BranchInitHookParams)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
541
        self.assertTrue(hasattr(params, 'bzrdir'))
542
        self.assertTrue(hasattr(params, 'branch'))
543
5050.21.1 by Andrew Bennetts
Remove broken and apparently unused code path from BranchInitHookParams.__repr__.
544
    def test_post_branch_init_hook_repr(self):
545
        param_reprs = []
546
        _mod_branch.Branch.hooks.install_named_hook('post_branch_init',
547
            lambda params: param_reprs.append(repr(params)), None)
548
        branch = self.make_branch('a')
549
        self.assertLength(1, param_reprs)
550
        param_repr = param_reprs[0]
551
        self.assertStartsWith(param_repr, '<BranchInitHookParams of ')
552
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
553
    def test_post_switch_hook(self):
554
        from bzrlib import switch
555
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
556
        _mod_branch.Branch.hooks.install_named_hook('post_switch',
557
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
558
        tree = self.make_branch_and_tree('branch-1')
559
        self.build_tree(['branch-1/file-1'])
560
        tree.add('file-1')
561
        tree.commit('rev1')
562
        to_branch = tree.bzrdir.sprout('branch-2').open_branch()
563
        self.build_tree(['branch-1/file-2'])
564
        tree.add('file-2')
565
        tree.remove('file-1')
566
        tree.commit('rev2')
567
        checkout = tree.branch.create_checkout('checkout')
568
        self.assertLength(0, calls)
569
        switch.switch(checkout.bzrdir, to_branch)
570
        self.assertLength(1, calls)
571
        params = calls[0]
572
        self.assertIsInstance(params, _mod_branch.SwitchHookParams)
573
        self.assertTrue(hasattr(params, 'to_branch'))
574
        self.assertTrue(hasattr(params, 'revision_id'))
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
575
5176.1.1 by Vincent Ladeuil
Warn if a config variable can't be interpreted as a boolean
576
577
class TestBranchOptions(tests.TestCaseWithTransport):
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
578
4989.2.5 by Vincent Ladeuil
Clarify tests.
579
    def setUp(self):
580
        super(TestBranchOptions, self).setUp()
581
        self.branch = self.make_branch('.')
582
        self.config = self.branch.get_config()
583
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
584
    def check_append_revisions_only(self, expected_value, value=None):
585
        """Set append_revisions_only in config and check its interpretation."""
4989.2.5 by Vincent Ladeuil
Clarify tests.
586
        if value is not None:
587
            self.config.set_user_option('append_revisions_only', value)
588
        self.assertEqual(expected_value,
589
                         self.branch._get_append_revisions_only())
590
591
    def test_valid_append_revisions_only(self):
592
        self.assertEquals(None,
593
                          self.config.get_user_option('append_revisions_only'))
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
594
        self.check_append_revisions_only(None)
595
        self.check_append_revisions_only(False, 'False')
596
        self.check_append_revisions_only(True, 'True')
4989.2.13 by Vincent Ladeuil
append_revisions_only accept all valid booleans, update doc to
597
        # The following values will cause compatibility problems on projects
598
        # using older bzr versions (<2.2) but are accepted
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
599
        self.check_append_revisions_only(False, 'false')
600
        self.check_append_revisions_only(True, 'true')
4989.2.5 by Vincent Ladeuil
Clarify tests.
601
602
    def test_invalid_append_revisions_only(self):
4989.2.9 by Brian de Alwis
Revert append_revisions_only to only allow 'True' and 'False' to
603
        """Ensure warning is noted on invalid settings"""
4989.2.15 by Vincent Ladeuil
Fixed as per Andrew's review.
604
        self.warnings = []
605
        def warning(*args):
606
            self.warnings.append(args[0] % args[1:])
607
        self.overrideAttr(trace, 'warning', warning)
608
        self.check_append_revisions_only(None, 'not-a-bool')
609
        self.assertLength(1, self.warnings)
610
        self.assertEqual(
611
            'Value "not-a-bool" is not a boolean for "append_revisions_only"',
612
            self.warnings[0])
4989.2.5 by Vincent Ladeuil
Clarify tests.
613
4989.2.1 by Brian de Alwis
The 'append_revisions_only' option is now case-insensitive,
614
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
615
class TestPullResult(tests.TestCase):
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
616
617
    def test_pull_result_to_int(self):
618
        # to support old code, the pull result can be used as an int
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
619
        r = _mod_branch.PullResult()
2297.1.3 by Martin Pool
PullResult can pretend to be an int for api compatibility with old .pull()
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")
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
627
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
628
    def test_report_changed(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
629
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
630
        r.old_revid = "old-revid"
631
        r.old_revno = 10
632
        r.new_revid = "new-revid"
633
        r.new_revno = 20
634
        f = StringIO()
635
        r.report(f)
636
        self.assertEqual("Now on revision 20.\n", f.getvalue())
637
638
    def test_report_unchanged(self):
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
639
        r = _mod_branch.PullResult()
4672.4.1 by Jelmer Vernooij
Add two more tests for PullResult.
640
        r.old_revid = "same-revid"
641
        r.new_revid = "same-revid"
642
        f = StringIO()
643
        r.report(f)
644
        self.assertEqual("No revisions to pull.\n", f.getvalue())
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
656
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
671
class TestRunWithWriteLockedTarget(tests.TestCase):
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
672
    """Tests for _run_with_write_locked_target."""
673
674
    def setUp(self):
5010.2.1 by Vincent Ladeuil
Fiux test/test_branch.py imports.
675
        tests.TestCase.setUp(self)
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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)
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
688
        result = _mod_branch._run_with_write_locked_target(
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
696
                          _mod_branch._run_with_write_locked_target,
697
                          lockable, self.func_that_raises)
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
703
                          _mod_branch._run_with_write_locked_target,
704
                          lockable, self.func_that_returns_ok)
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
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,
5010.2.26 by Vincent Ladeuil
Fix imports in test_branch.py.
710
                          _mod_branch._run_with_write_locked_target,
711
                          lockable, self.func_that_raises)
3758.1.1 by Andrew Bennetts
Fix #230902 by being more careful not to squash a pre-existing exception when calling foo.unlock()
712
        self.assertEqual(['lock_write', 'func called', 'unlock'], self._calls)
713
714