/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1740.6.1 by Martin Pool
Remove Scratch objects used by doctests
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
905 by Martin Pool
- merge aaron's append_multiple.patch
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
17
"""Tests for branch implementations - tests a branch format."""
18
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
19
import os
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
20
import sys
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
21
1878.1.3 by John Arbash Meinel
some test cleanups
22
from bzrlib import (
23
    branch,
24
    bzrdir,
25
    errors,
26
    gpg,
27
    urlutils,
28
    transactions,
29
    repository,
30
    )
1534.4.2 by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches.
31
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
32
from bzrlib.delta import TreeDelta
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
33
from bzrlib.errors import (FileExists,
34
                           NoSuchRevision,
1534.4.5 by Robert Collins
Turn branch format.open into a factory.
35
                           NoSuchFile,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
36
                           UninitializableFormat,
37
                           NotBranchError,
38
                           )
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
39
from bzrlib.osutils import getcwd
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
40
import bzrlib.revision
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
41
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
42
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
43
from bzrlib.tests.HttpServer import HttpServer
1260 by Martin Pool
- some updates for fetch/update function
44
from bzrlib.trace import mutter
1534.4.4 by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
45
from bzrlib.transport import get_transport
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
46
from bzrlib.transport.memory import MemoryServer
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
47
from bzrlib.upgrade import upgrade
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
48
from bzrlib.workingtree import WorkingTree
1092.2.25 by Robert Collins
support ghosts in commits
49
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
50
1185.16.56 by Martin Pool
doc
51
# TODO: Make a branch using basis branch, and check that it 
52
# doesn't request any files that could have been avoided, by 
53
# hooking into the Transport.
54
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
55
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
56
class TestCaseWithBranch(TestCaseWithBzrDir):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
57
58
    def setUp(self):
59
        super(TestCaseWithBranch, self).setUp()
60
        self.branch = None
61
62
    def get_branch(self):
63
        if self.branch is None:
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
64
            self.branch = self.make_branch('')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
65
        return self.branch
66
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
67
    def make_branch(self, relpath, format=None):
68
        repo = self.make_repository(relpath, format=format)
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.
69
        # fixme RBC 20060210 this isnt necessarily a fixable thing,
70
        # Skipped is the wrong exception to raise.
71
        try:
72
            return self.branch_format.initialize(repo.bzrdir)
73
        except errors.UninitializableFormat:
74
            raise TestSkipped('Uninitializable branch format')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
75
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
76
    def make_repository(self, relpath, shared=False, format=None):
77
        made_control = self.make_bzrdir(relpath, format=format)
78
        return made_control.create_repository(shared=shared)
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
79
80
81
class TestBranch(TestCaseWithBranch):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
82
1102 by Martin Pool
- merge test refactoring from robertc
83
    def test_append_revisions(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
84
        """Test appending more than one revision"""
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
85
        br = self.get_branch()
905 by Martin Pool
- merge aaron's append_multiple.patch
86
        br.append_revision("rev1")
87
        self.assertEquals(br.revision_history(), ["rev1",])
88
        br.append_revision("rev2", "rev3")
89
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
2229.2.1 by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository
90
        self.assertRaises(errors.ReservedId, br.append_revision, 'current:')
1110 by Martin Pool
- merge aaron's merge improvements:
91
1260 by Martin Pool
- some updates for fetch/update function
92
    def test_fetch_revisions(self):
93
        """Test fetch-revision operation."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
94
        get_transport(self.get_url()).mkdir('b1')
95
        get_transport(self.get_url()).mkdir('b2')
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.
96
        wt = self.make_branch_and_tree('b1')
97
        b1 = wt.branch
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
98
        b2 = self.make_branch('b2')
1185.31.35 by John Arbash Meinel
Couple small fixes, all tests pass on cygwin.
99
        file('b1/foo', 'w').write('hello')
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
100
        wt.add(['foo'], ['foo-id'])
101
        wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
1260 by Martin Pool
- some updates for fetch/update function
102
103
        mutter('start fetch')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
104
        self.assertEqual((1, []), b2.fetch(b1))
1260 by Martin Pool
- some updates for fetch/update function
105
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
106
        rev = b2.repository.get_revision('revision-1')
107
        tree = b2.repository.revision_tree('revision-1')
1534.1.32 by Robert Collins
Deprecate direct use of fetch.Fetcher.
108
        self.assertEqual(tree.get_file_text('foo-id'), 'hello')
1260 by Martin Pool
- some updates for fetch/update function
109
1770.3.3 by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta().
110
    def test_get_revision_delta(self):
111
        tree_a = self.make_branch_and_tree('a')
112
        self.build_tree(['a/foo'])
113
        tree_a.add('foo', 'file1')
114
        tree_a.commit('rev1', rev_id='rev1')
115
        self.build_tree(['a/vla'])
116
        tree_a.add('vla', 'file2')
117
        tree_a.commit('rev2', rev_id='rev2')
118
119
        delta = tree_a.branch.get_revision_delta(1)
120
        self.assertIsInstance(delta, TreeDelta)
121
        self.assertEqual([('foo', 'file1', 'file')], delta.added)
122
        delta = tree_a.branch.get_revision_delta(2)
123
        self.assertIsInstance(delta, TreeDelta)
124
        self.assertEqual([('vla', 'file2', 'file')], delta.added)
125
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
126
    def get_unbalanced_tree_pair(self):
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
127
        """Return two branches, a and b, with one file in a."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
128
        get_transport(self.get_url()).mkdir('a')
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.
129
        tree_a = self.make_branch_and_tree('a')
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
130
        file('a/b', 'wb').write('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
131
        tree_a.add('b')
132
        tree_a.commit("silly commit", rev_id='A')
133
134
        get_transport(self.get_url()).mkdir('b')
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.
135
        tree_b = self.make_branch_and_tree('b')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
136
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
137
138
    def get_balanced_branch_pair(self):
139
        """Returns br_a, br_b as with one commit in a, and b has a's stores."""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
140
        tree_a, tree_b = self.get_unbalanced_tree_pair()
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.
141
        tree_b.branch.repository.fetch(tree_a.branch.repository)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
142
        return tree_a, tree_b
1442.1.67 by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull().
143
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
144
    def test_clone_branch(self):
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
145
        """Copy the stores from one branch to another"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
146
        tree_a, tree_b = self.get_balanced_branch_pair()
147
        tree_b.commit("silly commit")
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
148
        os.mkdir('c')
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
149
        # this fails to test that the history from a was not used.
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.
150
        dir_c = tree_a.bzrdir.clone('c', basis=tree_b.bzrdir)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
151
        self.assertEqual(tree_a.branch.revision_history(),
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.
152
                         dir_c.open_branch().revision_history())
1393.1.23 by Martin Pool
- fix cloning of part of a branch
153
1185.66.8 by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation
154
    def test_clone_partial(self):
1393.1.23 by Martin Pool
- fix cloning of part of a branch
155
        """Copy only part of the history of a 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.
156
        # TODO: RBC 20060208 test with a revision not on revision-history.
157
        #       what should that behaviour be ? Emailed the list.
158
        wt_a = self.make_branch_and_tree('a')
159
        self.build_tree(['a/one'])
160
        wt_a.add(['one'])
161
        wt_a.commit('commit one', rev_id='1')
162
        self.build_tree(['a/two'])
163
        wt_a.add(['two'])
164
        wt_a.commit('commit two', rev_id='2')
165
        repo_b = self.make_repository('b')
166
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
167
        br_b = wt_a.bzrdir.open_branch().clone(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
168
        self.assertEqual('1', br_b.last_revision())
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.
169
170
    def test_sprout_partial(self):
171
        # test sprouting with a prefix of the revision-history.
172
        # also needs not-on-revision-history behaviour defined.
173
        wt_a = self.make_branch_and_tree('a')
174
        self.build_tree(['a/one'])
175
        wt_a.add(['one'])
176
        wt_a.commit('commit one', rev_id='1')
177
        self.build_tree(['a/two'])
178
        wt_a.add(['two'])
179
        wt_a.commit('commit two', rev_id='2')
180
        repo_b = self.make_repository('b')
181
        wt_a.bzrdir.open_repository().copy_content_into(repo_b)
182
        br_b = wt_a.bzrdir.open_branch().sprout(repo_b.bzrdir, revision_id='1')
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
183
        self.assertEqual('1', br_b.last_revision())
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.
184
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
185
    def get_parented_branch(self):
186
        wt_a = self.make_branch_and_tree('a')
187
        self.build_tree(['a/one'])
188
        wt_a.add(['one'])
189
        wt_a.commit('commit one', rev_id='1')
190
191
        branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch()
192
        self.assertEqual(wt_a.branch.base, branch_b.get_parent())
193
        return branch_b
194
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.
195
    def test_clone_branch_nickname(self):
196
        # test the nick name is preserved always
197
        raise TestSkipped('XXX branch cloning is not yet tested..')
198
199
    def test_clone_branch_parent(self):
200
        # test the parent is preserved always
1864.7.2 by John Arbash Meinel
Test that we copy the parent across properly (if it is available)
201
        branch_b = self.get_parented_branch()
202
        repo_c = self.make_repository('c')
203
        branch_b.repository.copy_content_into(repo_c)
204
        branch_c = branch_b.clone(repo_c.bzrdir)
205
        self.assertNotEqual(None, branch_c.get_parent())
206
        self.assertEqual(branch_b.get_parent(), branch_c.get_parent())
207
208
        # We can also set a specific parent, and it should be honored
209
        random_parent = 'http://bazaar-vcs.org/path/to/branch'
210
        branch_b.set_parent(random_parent)
211
        repo_d = self.make_repository('d')
212
        branch_b.repository.copy_content_into(repo_d)
213
        branch_d = branch_b.clone(repo_d.bzrdir)
214
        self.assertEqual(random_parent, branch_d.get_parent())
215
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.
216
    def test_sprout_branch_nickname(self):
217
        # test the nick name is reset always
218
        raise TestSkipped('XXX branch sprouting is not yet tested..')
219
220
    def test_sprout_branch_parent(self):
221
        source = self.make_branch('source')
222
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
223
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
1804.1.1 by Aaron Bentley
Add support for submit location to bundles
224
225
    def test_submit_branch(self):
226
        """Submit location can be queried and set"""
227
        branch = self.make_branch('branch')
228
        self.assertEqual(branch.get_submit_branch(), None)
229
        branch.set_submit_branch('sftp://example.com')
230
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.com')
231
        branch.set_submit_branch('sftp://example.net')
232
        self.assertEqual(branch.get_submit_branch(), 'sftp://example.net')
1393.1.23 by Martin Pool
- fix cloning of part of a branch
233
        
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
234
    def test_record_initial_ghost(self):
235
        """Branches should support having ghosts."""
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.
236
        wt = self.make_branch_and_tree('.')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
237
        wt.set_parent_ids(['non:existent@rev--ision--0--2'],
238
            allow_leftmost_as_ghost=True)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
239
        rev_id = wt.commit('commit against a ghost first parent.')
240
        rev = wt.branch.repository.get_revision(rev_id)
241
        self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2'])
1092.2.25 by Robert Collins
support ghosts in commits
242
        # parent_sha1s is not populated now, WTF. rbc 20051003
243
        self.assertEqual(len(rev.parent_sha1s), 0)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
244
245
    def test_record_two_ghosts(self):
246
        """Recording with all ghosts works."""
247
        wt = self.make_branch_and_tree('.')
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
248
        wt.set_parent_ids([
249
                'foo@azkhazan-123123-abcabc',
250
                'wibble@fofof--20050401--1928390812',
251
            ],
252
            allow_leftmost_as_ghost=True)
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
253
        rev_id = wt.commit("commit from ghost base with one merge")
254
        # the revision should have been committed with two parents
255
        rev = wt.branch.repository.get_revision(rev_id)
256
        self.assertEqual(['foo@azkhazan-123123-abcabc',
257
            'wibble@fofof--20050401--1928390812'],
258
            rev.parent_ids)
1092.2.25 by Robert Collins
support ghosts in commits
259
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
260
    def test_bad_revision(self):
1534.4.28 by Robert Collins
first cut at merge from integration.
261
        self.assertRaises(errors.InvalidRevisionId,
262
                          self.get_branch().repository.get_revision,
263
                          None)
1185.12.90 by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml
264
1092.2.28 by Robert Collins
reenable test of fetching a branch with ghosts
265
# TODO 20051003 RBC:
1092.2.25 by Robert Collins
support ghosts in commits
266
# compare the gpg-to-sign info for a commit with a ghost and 
267
#     an identical tree without a ghost
268
# fetch missing should rewrite the TOC of weaves to list newly available parents.
1393.1.9 by Martin Pool
- tidy up test assertion
269
        
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
270
    def test_sign_existing_revision(self):
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.
271
        wt = self.make_branch_and_tree('.')
272
        branch = wt.branch
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
273
        wt.commit("base", allow_pointless=True, rev_id='A')
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
274
        from bzrlib.testament import Testament
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
275
        strategy = gpg.LoopbackGPGStrategy(None)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
276
        branch.repository.sign_revision('A', strategy)
277
        self.assertEqual(Testament.from_revision(branch.repository, 
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
278
                         'A').as_short_text(),
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
279
                         branch.repository.get_signature_text('A'))
1442.1.60 by Robert Collins
gpg sign commits if the policy says we need to
280
1442.1.62 by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions.
281
    def test_store_signature(self):
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
282
        wt = self.make_branch_and_tree('.')
283
        branch = wt.branch
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
284
        branch.repository.store_revision_signature(
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
285
            gpg.LoopbackGPGStrategy(None), 'FOO', 'A')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
286
        self.assertRaises(errors.NoSuchRevision,
287
                          branch.repository.has_signature_for_revision_id,
288
                          'A')
289
        wt.commit("base", allow_pointless=True, rev_id='A')
1185.65.1 by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch
290
        self.assertEqual('FOO', 
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
291
                         branch.repository.get_signature_text('A'))
1469 by Robert Collins
Change Transport.* to work with URL's.
292
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
293
    def test_branch_keeps_signatures(self):
294
        wt = self.make_branch_and_tree('source')
295
        wt.commit('A', allow_pointless=True, rev_id='A')
296
        wt.branch.repository.sign_revision('A',
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
297
            gpg.LoopbackGPGStrategy(None))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
298
        #FIXME: clone should work to urls,
299
        # wt.clone should work to disks.
300
        self.build_tree(['target/'])
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.
301
        d2 = wt.bzrdir.clone('target')
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
302
        self.assertEqual(wt.branch.repository.get_signature_text('A'),
303
                         d2.open_repository().get_signature_text('A'))
1534.4.30 by Robert Collins
Test signature preservation on clone and upgrade.
304
1185.35.11 by Aaron Bentley
Added support for branch nicks
305
    def test_nicks(self):
306
        """Branch nicknames"""
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
307
        t = get_transport(self.get_url())
308
        t.mkdir('bzr.dev')
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
309
        branch = self.make_branch('bzr.dev')
1185.35.11 by Aaron Bentley
Added support for branch nicks
310
        self.assertEqual(branch.nick, 'bzr.dev')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
311
        t.move('bzr.dev', 'bzr.ab')
312
        branch = Branch.open(self.get_url('bzr.ab'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
313
        self.assertEqual(branch.nick, 'bzr.ab')
314
        branch.nick = "Aaron's branch"
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
315
        branch.nick = "Aaron's branch"
1534.4.28 by Robert Collins
first cut at merge from integration.
316
        self.failUnless(
317
            t.has(
318
                t.relpath(
319
                    branch.control_files.controlfilename("branch.conf")
320
                    )
321
                )
322
            )
1185.35.11 by Aaron Bentley
Added support for branch nicks
323
        self.assertEqual(branch.nick, "Aaron's branch")
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
324
        t.move('bzr.ab', 'integration')
325
        branch = Branch.open(self.get_url('integration'))
1185.35.11 by Aaron Bentley
Added support for branch nicks
326
        self.assertEqual(branch.nick, "Aaron's branch")
1185.35.12 by Aaron Bentley
Got writes of existing tree configs working.
327
        branch.nick = u"\u1234"
328
        self.assertEqual(branch.nick, u"\u1234")
1185.35.11 by Aaron Bentley
Added support for branch nicks
329
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
330
    def test_create_open_branch_uses_repository(self):
331
        try:
332
            repo = self.make_repository('.', shared=True)
333
        except errors.IncompatibleFormat:
334
            return
335
        repo.bzrdir.root_transport.mkdir('child')
336
        child_dir = self.bzrdir_format.initialize('child')
337
        try:
338
            child_branch = self.branch_format.initialize(child_dir)
339
        except errors.UninitializableFormat:
340
            # branch references are not default init'able.
341
            return
342
        self.assertEqual(repo.bzrdir.root_transport.base,
343
                         child_branch.repository.bzrdir.root_transport.base)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
344
        child_branch = branch.Branch.open(self.get_url('child'))
1534.6.4 by Robert Collins
Creating or opening a branch will use the repository if the format supports that.
345
        self.assertEqual(repo.bzrdir.root_transport.base,
346
                         child_branch.repository.bzrdir.root_transport.base)
347
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
348
    def test_format_description(self):
349
        tree = self.make_branch_and_tree('tree')
350
        text = tree.branch._format.get_format_description()
351
        self.failUnless(len(text))
352
1732.2.4 by Martin Pool
Split check into Branch.check and Repository.check
353
    def test_check_branch_report_results(self):
354
        """Checking a branch produces results which can be printed"""
355
        branch = self.make_branch('.')
356
        result = branch.check()
357
        # reports results through logging
358
        result.report_results(verbose=True)
359
        result.report_results(verbose=False)
360
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
361
    def test_get_commit_builder(self):
362
        self.assertIsInstance(self.make_branch(".").get_commit_builder([]), 
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
363
            repository.CommitBuilder)
1740.3.1 by Jelmer Vernooij
Introduce and use CommitBuilder objects.
364
1792.1.1 by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history.
365
    def test_generate_revision_history(self):
366
        """Create a fake revision history easily."""
367
        tree = self.make_branch_and_tree('.')
368
        rev1 = tree.commit('foo')
369
        orig_history = tree.branch.revision_history()
370
        rev2 = tree.commit('bar', allow_pointless=True)
371
        tree.branch.generate_revision_history(rev1)
372
        self.assertEqual(orig_history, tree.branch.revision_history())
373
1836.3.1 by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION.
374
    def test_generate_revision_history_NULL_REVISION(self):
375
        tree = self.make_branch_and_tree('.')
376
        rev1 = tree.commit('foo')
377
        tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION)
378
        self.assertEqual([], tree.branch.revision_history())
379
1551.8.6 by Aaron Bentley
Rename test
380
    def test_create_checkout(self):
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
381
        tree_a = self.make_branch_and_tree('a')
382
        branch_a = tree_a.branch
1551.8.5 by Aaron Bentley
Change name to create_checkout
383
        checkout_b = branch_a.create_checkout('b')
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
384
        self.assertEqual(None, checkout_b.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
385
        checkout_b.commit('rev1', rev_id='rev1')
386
        self.assertEqual('rev1', branch_a.last_revision())
387
        self.assertNotEqual(checkout_b.branch.base, branch_a.base)
388
1551.8.5 by Aaron Bentley
Change name to create_checkout
389
        checkout_c = branch_a.create_checkout('c', lightweight=True)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
390
        self.assertEqual('rev1', checkout_c.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
391
        checkout_c.commit('rev2', rev_id='rev2')
392
        self.assertEqual('rev2', branch_a.last_revision())
393
        self.assertEqual(checkout_c.branch.base, branch_a.base)
394
395
        os.mkdir('d')
1551.8.5 by Aaron Bentley
Change name to create_checkout
396
        checkout_d = branch_a.create_checkout('d', lightweight=True)
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
397
        self.assertEqual('rev2', checkout_d.last_revision())
1551.8.3 by Aaron Bentley
Make create_checkout_convenience a Branch method
398
        os.mkdir('e')
1551.8.5 by Aaron Bentley
Change name to create_checkout
399
        checkout_e = branch_a.create_checkout('e')
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
400
        self.assertEqual('rev2', checkout_e.last_revision())
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
401
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
402
    def test_create_anonymous_lightweight_checkout(self):
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
403
        """A lightweight checkout from a readonly branch should succeed."""
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
404
        tree_a = self.make_branch_and_tree('a')
405
        rev_id = tree_a.commit('put some content in the branch')
406
        source_branch = bzrlib.branch.Branch.open(
407
            'readonly+' + tree_a.bzrdir.root_transport.base)
408
        # sanity check that the test will be valid
409
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
410
            source_branch.lock_write)
411
        checkout = source_branch.create_checkout('c', lightweight=True)
412
        self.assertEqual(rev_id, checkout.last_revision())
413
1997.1.5 by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the
414
    def test_create_anonymous_heavyweight_checkout(self):
415
        """A regular checkout from a readonly branch should succeed."""
416
        tree_a = self.make_branch_and_tree('a')
417
        rev_id = tree_a.commit('put some content in the branch')
418
        source_branch = bzrlib.branch.Branch.open(
419
            'readonly+' + tree_a.bzrdir.root_transport.base)
420
        # sanity check that the test will be valid
421
        self.assertRaises((errors.LockError, errors.TransportNotPossible),
422
            source_branch.lock_write)
423
        checkout = source_branch.create_checkout('c')
424
        self.assertEqual(rev_id, checkout.last_revision())
425
1551.8.4 by Aaron Bentley
Tweak import style
426
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
427
class ChrootedTests(TestCaseWithBranch):
428
    """A support class that provides readonly urls outside the local namespace.
429
430
    This is done by checking if self.transport_server is a MemoryServer. if it
431
    is then we are chrooted already, if it is not then an HttpServer is used
432
    for readonly urls.
433
    """
434
435
    def setUp(self):
436
        super(ChrootedTests, self).setUp()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
437
        if not self.transport_server == MemoryServer:
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
438
            self.transport_readonly_server = HttpServer
1425 by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar
439
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
440
    def test_open_containing(self):
441
        self.assertRaises(NotBranchError, Branch.open_containing,
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
442
                          self.get_readonly_url(''))
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
443
        self.assertRaises(NotBranchError, Branch.open_containing,
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
444
                          self.get_readonly_url('g/p/q'))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
445
        branch = self.make_branch('.')
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
446
        branch, relpath = Branch.open_containing(self.get_readonly_url(''))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
447
        self.assertEqual('', relpath)
1534.4.11 by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
448
        branch, relpath = Branch.open_containing(self.get_readonly_url('g/p/q'))
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
449
        self.assertEqual('g/p/q', relpath)
1185.12.18 by Aaron Bentley
Fixed error handling when NotBranch on HTTP
450
        
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
451
452
class InstrumentedTransaction(object):
453
454
    def finish(self):
455
        self.calls.append('finish')
456
457
    def __init__(self):
458
        self.calls = []
459
460
1442.1.63 by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py.
461
class TestDecorator(object):
462
463
    def __init__(self):
464
        self._calls = []
465
466
    def lock_read(self):
467
        self._calls.append('lr')
468
469
    def lock_write(self):
470
        self._calls.append('lw')
471
472
    def unlock(self):
473
        self._calls.append('ul')
474
475
    @needs_read_lock
476
    def do_with_read(self):
477
        return 1
478
479
    @needs_read_lock
480
    def except_with_read(self):
481
        raise RuntimeError
482
483
    @needs_write_lock
484
    def do_with_write(self):
485
        return 2
486
487
    @needs_write_lock
488
    def except_with_write(self):
489
        raise RuntimeError
490
491
492
class TestDecorators(TestCase):
493
494
    def test_needs_read_lock(self):
495
        branch = TestDecorator()
496
        self.assertEqual(1, branch.do_with_read())
497
        self.assertEqual(['lr', 'ul'], branch._calls)
498
499
    def test_excepts_in_read_lock(self):
500
        branch = TestDecorator()
501
        self.assertRaises(RuntimeError, branch.except_with_read)
502
        self.assertEqual(['lr', 'ul'], branch._calls)
503
504
    def test_needs_write_lock(self):
505
        branch = TestDecorator()
506
        self.assertEqual(2, branch.do_with_write())
507
        self.assertEqual(['lw', 'ul'], branch._calls)
508
509
    def test_excepts_in_write_lock(self):
510
        branch = TestDecorator()
511
        self.assertRaises(RuntimeError, branch.except_with_write)
512
        self.assertEqual(['lw', 'ul'], branch._calls)
513
514
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
515
class TestBranchTransaction(TestCaseWithBranch):
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
516
517
    def setUp(self):
518
        super(TestBranchTransaction, self).setUp()
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
519
        self.branch = None
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
520
        
521
    def test_default_get_transaction(self):
522
        """branch.get_transaction on a new branch should give a PassThrough."""
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
523
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
524
                                   transactions.PassThroughTransaction))
525
526
    def test__set_new_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
527
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
528
529
    def test__set_over_existing_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
530
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
531
        self.assertRaises(errors.LockError,
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
532
                          self.get_branch()._set_transaction,
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
533
                          transactions.ReadOnlyTransaction())
534
535
    def test_finish_no_transaction_raises(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
536
        self.assertRaises(errors.LockError, self.get_branch()._finish_transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
537
538
    def test_finish_readonly_transaction_works(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
539
        self.get_branch()._set_transaction(transactions.ReadOnlyTransaction())
540
        self.get_branch()._finish_transaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
541
        self.assertEqual(None, self.get_branch().control_files._transaction)
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
542
543
    def test_unlock_calls_finish(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
544
        self.get_branch().lock_read()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
545
        transaction = InstrumentedTransaction()
1534.4.28 by Robert Collins
first cut at merge from integration.
546
        self.get_branch().control_files._transaction = transaction
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
547
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
548
        self.assertEqual(['finish'], transaction.calls)
549
550
    def test_lock_read_acquires_ro_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
551
        self.get_branch().lock_read()
552
        self.failUnless(isinstance(self.get_branch().get_transaction(),
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
553
                                   transactions.ReadOnlyTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
554
        self.get_branch().unlock()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
555
        
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
556
    def test_lock_write_acquires_write_transaction(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
557
        self.get_branch().lock_write()
1417.1.6 by Robert Collins
introduce transactions for grouping actions done to and with branches
558
        # cannot use get_transaction as its magic
1534.4.28 by Robert Collins
first cut at merge from integration.
559
        self.failUnless(isinstance(self.get_branch().control_files._transaction,
1563.2.35 by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too.
560
                                   transactions.WriteTransaction))
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
561
        self.get_branch().unlock()
562
563
564
class TestBranchPushLocations(TestCaseWithBranch):
565
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
566
    def test_get_push_location_unset(self):
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
567
        self.assertEqual(None, self.get_branch().get_push_location())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
568
569
    def test_get_push_location_exact(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
570
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
571
                                   ensure_config_dir_exists)
572
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
573
        fn = locations_config_filename()
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
574
        print >> open(fn, 'wt'), ("[%s]\n"
575
                                  "push_location=foo" %
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
576
                                  self.get_branch().base[:-1])
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
577
        self.assertEqual("foo", self.get_branch().get_push_location())
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
578
579
    def test_set_push_location(self):
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
580
        from bzrlib.config import (locations_config_filename,
1185.31.43 by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp
581
                                   ensure_config_dir_exists)
582
        ensure_config_dir_exists()
1770.2.2 by Aaron Bentley
Rename branches.conf to locations.conf
583
        fn = locations_config_filename()
1878.1.3 by John Arbash Meinel
some test cleanups
584
        branch = self.get_branch()
585
        branch.set_push_location('foo')
586
        local_path = urlutils.local_path_from_url(branch.base[:-1])
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
587
        self.assertFileEqual("[%s]\n"
2120.6.6 by James Henstridge
fix test_set_push_location test
588
                             "push_location = foo\n"
2120.6.8 by James Henstridge
Change syntax for setting config option policies. Rather than
589
                             "push_location:policy = norecurse" % local_path,
1185.31.39 by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(),
590
                             fn)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
591
592
    # TODO RBC 20051029 test getting a push location from a branch in a 
593
    # recursive section - that is, it appends the branch name.
1534.4.1 by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib.
594
595
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
596
class TestFormat(TestCaseWithBranch):
597
    """Tests for the format itself."""
598
599
    def test_format_initialize_find_open(self):
600
        # loopback test to check the current format initializes to itself.
1534.4.7 by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
601
        if not self.branch_format.is_supported():
602
            # unsupported formats are not loopback testable
603
            # because the default open will not open them and
604
            # they may not be initializable.
605
            return
606
        # supported formats must be able to init and open
1534.4.12 by Robert Collins
Tweak formats implementation test to exercise readonly and readwrite transports.
607
        t = get_transport(self.get_url())
608
        readonly_t = get_transport(self.get_readonly_url())
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
609
        made_branch = self.make_branch('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
610
        self.failUnless(isinstance(made_branch, branch.Branch))
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
611
612
        # find it via bzrdir opening:
613
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
614
        direct_opened_branch = opened_control.open_branch()
615
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
616
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
617
        self.failUnless(isinstance(direct_opened_branch._format,
618
                        self.branch_format.__class__))
619
620
        # find it via Branch.open
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
621
        opened_branch = branch.Branch.open(readonly_t.base)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
622
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
623
        self.assertEqual(made_branch._format.__class__,
624
                         opened_branch._format.__class__)
625
        # if it has a unique id string, can we probe for it ?
626
        try:
627
            self.branch_format.get_format_string()
628
        except NotImplementedError:
629
            return
1534.4.3 by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
630
        self.assertEqual(self.branch_format,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
631
                         branch.BranchFormat.find_format(opened_control))
1711.8.1 by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures
632
633