/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2696.3.1 by Martin Pool
(broken) start switching format to dirstate-tags
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
1553.5.68 by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests
2
# 
1534.4.39 by Robert Collins
Basic BzrDir support.
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
7
#
1534.4.39 by Robert Collins
Basic BzrDir support.
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.
2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
12
#
1534.4.39 by Robert Collins
Basic BzrDir support.
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
17
"""Tests for the BzrDir facility and any format specific tests.
18
19
For interface contract tests, see tests/bzr_dir_implementations.
20
"""
21
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
22
import os
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
23
import os.path
1534.4.39 by Robert Collins
Basic BzrDir support.
24
from StringIO import StringIO
3023.1.3 by Alexander Belchenko
John's review
25
import subprocess
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
26
import sys
1534.4.39 by Robert Collins
Basic BzrDir support.
27
2204.4.1 by Aaron Bentley
Add 'formats' help topic
28
from bzrlib import (
2100.3.35 by Aaron Bentley
equality operations on bzrdir
29
    bzrdir,
30
    errors,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
31
    help_topics,
2100.3.35 by Aaron Bentley
equality operations on bzrdir
32
    repository,
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
33
    osutils,
2204.4.12 by Aaron Bentley
Deprecate bzrdir.BzrDirFormat.set_default_format
34
    symbol_versioning,
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
35
    urlutils,
3023.1.2 by Alexander Belchenko
Martin's review.
36
    win32utils,
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
37
    workingtree,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
38
    )
1508.1.25 by Robert Collins
Update per review comments.
39
import bzrlib.branch
1534.4.39 by Robert Collins
Basic BzrDir support.
40
from bzrlib.errors import (NotBranchError,
41
                           UnknownFormatError,
42
                           UnsupportedFormatError,
43
                           )
2164.2.16 by Vincent Ladeuil
Add tests.
44
from bzrlib.tests import (
45
    TestCase,
3583.1.2 by Andrew Bennetts
Add test for fix.
46
    TestCaseWithMemoryTransport,
2164.2.16 by Vincent Ladeuil
Add tests.
47
    TestCaseWithTransport,
3023.1.2 by Alexander Belchenko
Martin's review.
48
    TestSkipped,
2164.2.16 by Vincent Ladeuil
Add tests.
49
    test_sftp_transport
50
    )
3102.1.1 by Vincent Ladeuil
Rename bzrlib/test/HTTPTestUtils.py to bzrlib/tests/http_utils.py and fix
51
from bzrlib.tests.http_server import HttpServer
52
from bzrlib.tests.http_utils import (
2164.2.16 by Vincent Ladeuil
Add tests.
53
    TestCaseWithTwoWebservers,
54
    HTTPServerRedirecting,
55
    )
56
from bzrlib.tests.test_http import TestWithTransport_pycurl
1534.4.39 by Robert Collins
Basic BzrDir support.
57
from bzrlib.transport import get_transport
2164.2.16 by Vincent Ladeuil
Add tests.
58
from bzrlib.transport.http._urllib import HttpTransport_urllib
1534.4.39 by Robert Collins
Basic BzrDir support.
59
from bzrlib.transport.memory import MemoryServer
2241.1.5 by Martin Pool
Move KnitFormat2 into repofmt
60
from bzrlib.repofmt import knitrepo, weaverepo
1534.4.39 by Robert Collins
Basic BzrDir support.
61
62
63
class TestDefaultFormat(TestCase):
64
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
65
    def test_get_set_default_format(self):
1534.4.39 by Robert Collins
Basic BzrDir support.
66
        old_format = bzrdir.BzrDirFormat.get_default_format()
67
        # default is BzrDirFormat6
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
68
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
69
        bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
1534.4.39 by Robert Collins
Basic BzrDir support.
70
        # creating a bzr dir should now create an instrumented dir.
71
        try:
1685.1.42 by John Arbash Meinel
A couple more fixes to make sure memory:/// works correctly.
72
            result = bzrdir.BzrDir.create('memory:///')
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
73
            self.failUnless(isinstance(result, SampleBzrDir))
1534.4.39 by Robert Collins
Basic BzrDir support.
74
        finally:
3400.3.6 by Martin Pool
Remove code deprecated prior to 1.1 and its tests
75
            bzrdir.BzrDirFormat._set_default_format(old_format)
1534.4.39 by Robert Collins
Basic BzrDir support.
76
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
77
78
2204.4.1 by Aaron Bentley
Add 'formats' help topic
79
class TestFormatRegistry(TestCase):
80
81
    def make_format_registry(self):
82
        my_format_registry = bzrdir.BzrDirFormatRegistry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
83
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
84
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
85
            ' repositories', deprecated=True)
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
86
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', 
87
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
88
        my_format_registry.register_metadir('knit',
89
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
90
            'Format using knits',
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
91
            )
2204.4.1 by Aaron Bentley
Add 'formats' help topic
92
        my_format_registry.set_default('knit')
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
93
        my_format_registry.register_metadir(
2230.3.53 by Aaron Bentley
Merge bzr.dev
94
            'branch6',
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
95
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2230.3.53 by Aaron Bentley
Merge bzr.dev
96
            'Experimental successor to knit.  Use at your own risk.',
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
97
            branch_format='bzrlib.branch.BzrBranchFormat6',
98
            experimental=True)
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
99
        my_format_registry.register_metadir(
100
            'hidden format',
101
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
102
            'Experimental successor to knit.  Use at your own risk.',
103
            branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
104
        my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6,
105
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
106
            ' repositories', hidden=True)
107
        my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir',
108
            'BzrDirFormat6', 'Format registered lazily', deprecated=True,
109
            hidden=True)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
110
        return my_format_registry
111
112
    def test_format_registry(self):
113
        my_format_registry = self.make_format_registry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
114
        my_bzrdir = my_format_registry.make_bzrdir('lazy')
115
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
116
        my_bzrdir = my_format_registry.make_bzrdir('weave')
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
117
        self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
118
        my_bzrdir = my_format_registry.make_bzrdir('default')
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
119
        self.assertIsInstance(my_bzrdir.repository_format, 
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
120
            knitrepo.RepositoryFormatKnit1)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
121
        my_bzrdir = my_format_registry.make_bzrdir('knit')
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
122
        self.assertIsInstance(my_bzrdir.repository_format, 
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
123
            knitrepo.RepositoryFormatKnit1)
2230.3.1 by Aaron Bentley
Get branch6 creation working
124
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
2230.3.55 by Aaron Bentley
Updates from review
125
        self.assertIsInstance(my_bzrdir.get_branch_format(),
2230.3.1 by Aaron Bentley
Get branch6 creation working
126
                              bzrlib.branch.BzrBranchFormat6)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
127
128
    def test_get_help(self):
129
        my_format_registry = self.make_format_registry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
130
        self.assertEqual('Format registered lazily',
131
                         my_format_registry.get_help('lazy'))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
132
        self.assertEqual('Format using knits', 
2204.4.1 by Aaron Bentley
Add 'formats' help topic
133
                         my_format_registry.get_help('knit'))
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
134
        self.assertEqual('Format using knits', 
2204.4.1 by Aaron Bentley
Add 'formats' help topic
135
                         my_format_registry.get_help('default'))
136
        self.assertEqual('Pre-0.8 format.  Slower and does not support'
137
                         ' checkouts or shared repositories', 
138
                         my_format_registry.get_help('weave'))
139
        
140
    def test_help_topic(self):
141
        topics = help_topics.HelpTopicRegistry()
142
        topics.register('formats', self.make_format_registry().help_topic, 
143
                        'Directory formats')
144
        topic = topics.get_detail('formats')
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
145
        new, rest = topic.split('Experimental formats')
146
        experimental, deprecated = rest.split('Deprecated formats')
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
147
        self.assertContainsRe(new, 'These formats can be used')
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
148
        self.assertContainsRe(new, 
2666.1.8 by Ian Clatworthy
Fix storage formats help test
149
                ':knit:\n    \(native\) \(default\) Format using knits\n')
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
150
        self.assertContainsRe(experimental, 
151
                ':branch6:\n    \(native\) Experimental successor to knit')
2204.4.4 by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats
152
        self.assertContainsRe(deprecated, 
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
153
                ':lazy:\n    \(native\) Format registered lazily\n')
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
154
        self.assertNotContainsRe(new, 'hidden')
2204.4.1 by Aaron Bentley
Add 'formats' help topic
155
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
156
    def test_set_default_repository(self):
157
        default_factory = bzrdir.format_registry.get('default')
158
        old_default = [k for k, v in bzrdir.format_registry.iteritems()
159
                       if v == default_factory and k != 'default'][0]
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
160
        bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
161
        try:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
162
            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
163
                          bzrdir.format_registry.get('default'))
164
            self.assertIs(
165
                repository.RepositoryFormat.get_default_format().__class__,
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
166
                knitrepo.RepositoryFormatKnit3)
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
167
        finally:
168
            bzrdir.format_registry.set_default_repository(old_default)
169
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
170
    def test_aliases(self):
171
        a_registry = bzrdir.BzrDirFormatRegistry()
172
        a_registry.register('weave', bzrdir.BzrDirFormat6,
173
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
174
            ' repositories', deprecated=True)
175
        a_registry.register('weavealias', bzrdir.BzrDirFormat6,
176
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
177
            ' repositories', deprecated=True, alias=True)
178
        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
179
    
2220.2.25 by Martin Pool
doc
180
1508.1.25 by Robert Collins
Update per review comments.
181
class SampleBranch(bzrlib.branch.Branch):
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
182
    """A dummy branch for guess what, dummy use."""
183
184
    def __init__(self, dir):
185
        self.bzrdir = dir
186
187
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
188
class SampleBzrDir(bzrdir.BzrDir):
189
    """A sample BzrDir implementation to allow testing static methods."""
190
1841.2.1 by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository().
191
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
192
        """See BzrDir.create_repository."""
193
        return "A repository"
194
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
195
    def open_repository(self):
196
        """See BzrDir.open_repository."""
197
        return "A repository"
198
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
199
    def create_branch(self):
200
        """See BzrDir.create_branch."""
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
201
        return SampleBranch(self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
202
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
203
    def create_workingtree(self):
204
        """See BzrDir.create_workingtree."""
205
        return "A tree"
206
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
207
1534.4.39 by Robert Collins
Basic BzrDir support.
208
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
209
    """A sample format
210
211
    this format is initializable, unsupported to aid in testing the 
212
    open and open_downlevel routines.
213
    """
214
215
    def get_format_string(self):
216
        """See BzrDirFormat.get_format_string()."""
217
        return "Sample .bzr dir format."
218
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
219
    def initialize_on_transport(self, t):
1534.4.39 by Robert Collins
Basic BzrDir support.
220
        """Create a bzr dir."""
221
        t.mkdir('.bzr')
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
222
        t.put_bytes('.bzr/branch-format', self.get_format_string())
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
223
        return SampleBzrDir(t, self)
1534.4.39 by Robert Collins
Basic BzrDir support.
224
225
    def is_supported(self):
226
        return False
227
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
228
    def open(self, transport, _found=None):
1534.4.39 by Robert Collins
Basic BzrDir support.
229
        return "opened branch."
230
231
232
class TestBzrDirFormat(TestCaseWithTransport):
233
    """Tests for the BzrDirFormat facility."""
234
235
    def test_find_format(self):
236
        # is the right format object found for a branch?
237
        # create a branch with a few known format objects.
238
        # this is not quite the same as 
239
        t = get_transport(self.get_url())
240
        self.build_tree(["foo/", "bar/"], transport=t)
241
        def check_format(format, url):
242
            format.initialize(url)
243
            t = get_transport(url)
244
            found_format = bzrdir.BzrDirFormat.find_format(t)
245
            self.failUnless(isinstance(found_format, format.__class__))
246
        check_format(bzrdir.BzrDirFormat5(), "foo")
247
        check_format(bzrdir.BzrDirFormat6(), "bar")
248
        
249
    def test_find_format_nothing_there(self):
250
        self.assertRaises(NotBranchError,
251
                          bzrdir.BzrDirFormat.find_format,
252
                          get_transport('.'))
253
254
    def test_find_format_unknown_format(self):
255
        t = get_transport(self.get_url())
256
        t.mkdir('.bzr')
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
257
        t.put_bytes('.bzr/branch-format', '')
1534.4.39 by Robert Collins
Basic BzrDir support.
258
        self.assertRaises(UnknownFormatError,
259
                          bzrdir.BzrDirFormat.find_format,
260
                          get_transport('.'))
261
262
    def test_register_unregister_format(self):
263
        format = SampleBzrDirFormat()
264
        url = self.get_url()
265
        # make a bzrdir
266
        format.initialize(url)
267
        # register a format for it.
268
        bzrdir.BzrDirFormat.register_format(format)
269
        # which bzrdir.Open will refuse (not supported)
270
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open, url)
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
271
        # which bzrdir.open_containing will refuse (not supported)
272
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url)
1534.4.39 by Robert Collins
Basic BzrDir support.
273
        # but open_downlevel will work
274
        t = get_transport(url)
275
        self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
276
        # unregister the format
277
        bzrdir.BzrDirFormat.unregister_format(format)
278
        # now open_downlevel should fail too.
279
        self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
280
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
281
    def test_create_branch_and_repo_uses_default(self):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
282
        format = SampleBzrDirFormat()
2476.3.10 by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections.
283
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url(),
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
284
                                                      format=format)
285
        self.assertTrue(isinstance(branch, SampleBranch))
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
286
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
287
    def test_create_branch_and_repo_under_shared(self):
288
        # creating a branch and repo in a shared repo uses the
289
        # shared repository
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
290
        format = bzrdir.format_registry.make_bzrdir('knit')
291
        self.make_repository('.', shared=True, format=format)
292
        branch = bzrdir.BzrDir.create_branch_and_repo(
293
            self.get_url('child'), format=format)
294
        self.assertRaises(errors.NoRepositoryPresent,
295
                          branch.bzrdir.open_repository)
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
296
297
    def test_create_branch_and_repo_under_shared_force_new(self):
298
        # creating a branch and repo in a shared repo can be forced to 
299
        # make a new repo
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
300
        format = bzrdir.format_registry.make_bzrdir('knit')
301
        self.make_repository('.', shared=True, format=format)
302
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
303
                                                      force_new_repo=True,
304
                                                      format=format)
305
        branch.bzrdir.open_repository()
1534.6.6 by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient.
306
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
307
    def test_create_standalone_working_tree(self):
308
        format = SampleBzrDirFormat()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
309
        # note this is deliberately readonly, as this failure should 
310
        # occur before any writes.
311
        self.assertRaises(errors.NotLocalUrl,
312
                          bzrdir.BzrDir.create_standalone_workingtree,
313
                          self.get_readonly_url(), format=format)
314
        tree = bzrdir.BzrDir.create_standalone_workingtree('.', 
315
                                                           format=format)
316
        self.assertEqual('A tree', tree)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
317
1534.6.10 by Robert Collins
Finish use of repositories support.
318
    def test_create_standalone_working_tree_under_shared_repo(self):
319
        # create standalone working tree always makes a repo.
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
320
        format = bzrdir.format_registry.make_bzrdir('knit')
321
        self.make_repository('.', shared=True, format=format)
322
        # note this is deliberately readonly, as this failure should 
323
        # occur before any writes.
324
        self.assertRaises(errors.NotLocalUrl,
325
                          bzrdir.BzrDir.create_standalone_workingtree,
326
                          self.get_readonly_url('child'), format=format)
327
        tree = bzrdir.BzrDir.create_standalone_workingtree('child', 
328
            format=format)
329
        tree.bzrdir.open_repository()
1534.6.10 by Robert Collins
Finish use of repositories support.
330
331
    def test_create_branch_convenience(self):
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
332
        # outside a repo the default convenience output is a repo+branch_tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
333
        format = bzrdir.format_registry.make_bzrdir('knit')
334
        branch = bzrdir.BzrDir.create_branch_convenience('.', format=format)
335
        branch.bzrdir.open_workingtree()
336
        branch.bzrdir.open_repository()
1534.6.10 by Robert Collins
Finish use of repositories support.
337
2476.3.10 by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections.
338
    def test_create_branch_convenience_possible_transports(self):
339
        """Check that the optional 'possible_transports' is recognized"""
340
        format = bzrdir.format_registry.make_bzrdir('knit')
341
        t = self.get_transport()
342
        branch = bzrdir.BzrDir.create_branch_convenience(
343
            '.', format=format, possible_transports=[t])
344
        branch.bzrdir.open_workingtree()
345
        branch.bzrdir.open_repository()
346
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
347
    def test_create_branch_convenience_root(self):
348
        """Creating a branch at the root of a fs should work."""
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
349
        self.vfs_transport_factory = MemoryServer
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
350
        # outside a repo the default convenience output is a repo+branch_tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
351
        format = bzrdir.format_registry.make_bzrdir('knit')
352
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), 
353
                                                         format=format)
354
        self.assertRaises(errors.NoWorkingTree,
355
                          branch.bzrdir.open_workingtree)
356
        branch.bzrdir.open_repository()
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
357
1534.6.10 by Robert Collins
Finish use of repositories support.
358
    def test_create_branch_convenience_under_shared_repo(self):
359
        # inside a repo the default convenience output is a branch+ follow the
360
        # repo tree policy
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
361
        format = bzrdir.format_registry.make_bzrdir('knit')
362
        self.make_repository('.', shared=True, format=format)
363
        branch = bzrdir.BzrDir.create_branch_convenience('child',
364
            format=format)
365
        branch.bzrdir.open_workingtree()
366
        self.assertRaises(errors.NoRepositoryPresent,
367
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
368
            
369
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
370
        # inside a repo the default convenience output is a branch+ follow the
371
        # repo tree policy but we can override that
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
372
        format = bzrdir.format_registry.make_bzrdir('knit')
373
        self.make_repository('.', shared=True, format=format)
374
        branch = bzrdir.BzrDir.create_branch_convenience('child',
375
            force_new_tree=False, format=format)
376
        self.assertRaises(errors.NoWorkingTree,
377
                          branch.bzrdir.open_workingtree)
378
        self.assertRaises(errors.NoRepositoryPresent,
379
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
380
            
381
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
382
        # inside a repo the default convenience output is a branch+ follow the
383
        # repo tree policy
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
384
        format = bzrdir.format_registry.make_bzrdir('knit')
385
        repo = self.make_repository('.', shared=True, format=format)
386
        repo.set_make_working_trees(False)
387
        branch = bzrdir.BzrDir.create_branch_convenience('child', 
388
                                                         format=format)
389
        self.assertRaises(errors.NoWorkingTree,
390
                          branch.bzrdir.open_workingtree)
391
        self.assertRaises(errors.NoRepositoryPresent,
392
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
393
394
    def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self):
395
        # inside a repo the default convenience output is a branch+ follow the
396
        # repo tree policy but we can override that
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
397
        format = bzrdir.format_registry.make_bzrdir('knit')
398
        repo = self.make_repository('.', shared=True, format=format)
399
        repo.set_make_working_trees(False)
400
        branch = bzrdir.BzrDir.create_branch_convenience('child',
401
            force_new_tree=True, format=format)
402
        branch.bzrdir.open_workingtree()
403
        self.assertRaises(errors.NoRepositoryPresent,
404
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
405
406
    def test_create_branch_convenience_under_shared_repo_force_new_repo(self):
407
        # inside a repo the default convenience output is overridable to give
408
        # repo+branch+tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
409
        format = bzrdir.format_registry.make_bzrdir('knit')
410
        self.make_repository('.', shared=True, format=format)
411
        branch = bzrdir.BzrDir.create_branch_convenience('child',
412
            force_new_repo=True, format=format)
413
        branch.bzrdir.open_repository()
414
        branch.bzrdir.open_workingtree()
1534.6.10 by Robert Collins
Finish use of repositories support.
415
3242.2.14 by Aaron Bentley
Update from review comments
416
417
class TestRepositoryAcquisitionPolicy(TestCaseWithTransport):
418
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
419
    def test_acquire_repository_standalone(self):
3242.2.14 by Aaron Bentley
Update from review comments
420
        """The default acquisition policy should create a standalone branch."""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
421
        my_bzrdir = self.make_bzrdir('.')
422
        repo_policy = my_bzrdir.determine_repository_policy()
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
423
        repo = repo_policy.acquire_repository()
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
424
        self.assertEqual(repo.bzrdir.root_transport.base,
425
                         my_bzrdir.root_transport.base)
3242.2.14 by Aaron Bentley
Update from review comments
426
        self.assertFalse(repo.is_shared())
427
1534.4.39 by Robert Collins
Basic BzrDir support.
428
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
429
    def test_determine_stacking_policy(self):
430
        parent_bzrdir = self.make_bzrdir('.')
431
        child_bzrdir = self.make_bzrdir('child')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
432
        parent_bzrdir.get_config().set_default_stack_on('http://example.org')
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
433
        repo_policy = child_bzrdir.determine_repository_policy()
434
        self.assertEqual('http://example.org', repo_policy._stack_on)
435
3242.3.27 by Aaron Bentley
Interpret default stacking paths relative to config bzrdir
436
    def test_determine_stacking_policy_relative(self):
437
        parent_bzrdir = self.make_bzrdir('.')
438
        child_bzrdir = self.make_bzrdir('child')
439
        parent_bzrdir.get_config().set_default_stack_on('child2')
440
        repo_policy = child_bzrdir.determine_repository_policy()
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
441
        self.assertEqual('child2', repo_policy._stack_on)
442
        self.assertEqual(parent_bzrdir.root_transport.base,
443
                         repo_policy._stack_on_pwd)
3242.3.27 by Aaron Bentley
Interpret default stacking paths relative to config bzrdir
444
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
445
    def prepare_default_stacking(self):
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
446
        parent_bzrdir = self.make_bzrdir('.')
447
        child_branch = self.make_branch('child', format='development1')
3242.5.1 by Jonathan Lange
Allow stacked-on branch locations to be stored as relative URLs.
448
        parent_bzrdir.get_config().set_default_stack_on(child_branch.base)
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
449
        new_child_transport = parent_bzrdir.transport.clone('child2')
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
450
        return child_branch, new_child_transport
451
452
    def test_clone_on_transport_obeys_stacking_policy(self):
453
        child_branch, new_child_transport = self.prepare_default_stacking()
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
454
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
3242.5.1 by Jonathan Lange
Allow stacked-on branch locations to be stored as relative URLs.
455
        self.assertEqual(child_branch.base,
3537.3.5 by Martin Pool
merge trunk including stacking policy
456
                         new_child.open_branch().get_stacked_on_url())
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
457
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
458
    def test_sprout_obeys_stacking_policy(self):
459
        child_branch, new_child_transport = self.prepare_default_stacking()
460
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
461
        self.assertEqual(child_branch.base,
3537.3.5 by Martin Pool
merge trunk including stacking policy
462
                         new_child.open_branch().get_stacked_on_url())
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
463
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
464
    def test_add_fallback_repo_handles_absolute_urls(self):
465
        stack_on = self.make_branch('stack_on', format='development1')
466
        repo = self.make_repository('repo', format='development1')
467
        policy = bzrdir.UseExistingRepository(repo, stack_on.base)
468
        policy._add_fallback(repo)
469
470
    def test_add_fallback_repo_handles_relative_urls(self):
471
        stack_on = self.make_branch('stack_on', format='development1')
472
        repo = self.make_repository('repo', format='development1')
473
        policy = bzrdir.UseExistingRepository(repo, '.', stack_on.base)
474
        policy._add_fallback(repo)
475
476
    def test_configure_relative_branch_stacking_url(self):
477
        stack_on = self.make_branch('stack_on', format='development1')
478
        stacked = self.make_branch('stack_on/stacked', format='development1')
479
        policy = bzrdir.UseExistingRepository(stacked.repository,
480
            '.', stack_on.base)
481
        policy.configure_branch(stacked)
3537.3.5 by Martin Pool
merge trunk including stacking policy
482
        self.assertEqual('..', stacked.get_stacked_on_url())
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
483
484
    def test_relative_branch_stacking_to_absolute(self):
485
        stack_on = self.make_branch('stack_on', format='development1')
486
        stacked = self.make_branch('stack_on/stacked', format='development1')
487
        policy = bzrdir.UseExistingRepository(stacked.repository,
488
            '.', self.get_readonly_url('stack_on'))
489
        policy.configure_branch(stacked)
490
        self.assertEqual(self.get_readonly_url('stack_on'),
3537.3.5 by Martin Pool
merge trunk including stacking policy
491
                         stacked.get_stacked_on_url())
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
492
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
493
1534.4.39 by Robert Collins
Basic BzrDir support.
494
class ChrootedTests(TestCaseWithTransport):
495
    """A support class that provides readonly urls outside the local namespace.
496
497
    This is done by checking if self.transport_server is a MemoryServer. if it
498
    is then we are chrooted already, if it is not then an HttpServer is used
499
    for readonly urls.
500
    """
501
502
    def setUp(self):
503
        super(ChrootedTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
504
        if not self.vfs_transport_factory == MemoryServer:
1534.4.39 by Robert Collins
Basic BzrDir support.
505
            self.transport_readonly_server = HttpServer
506
3015.3.45 by Daniel Watkins
Extract common method.
507
    def local_branch_path(self, branch):
508
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
509
1534.4.39 by Robert Collins
Basic BzrDir support.
510
    def test_open_containing(self):
511
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
512
                          self.get_readonly_url(''))
513
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
514
                          self.get_readonly_url('g/p/q'))
515
        control = bzrdir.BzrDir.create(self.get_url())
516
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url(''))
517
        self.assertEqual('', relpath)
518
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q'))
519
        self.assertEqual('g/p/q', relpath)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
520
3015.3.46 by Daniel Watkins
Made tests more granular.
521
    def test_open_containing_tree_branch_or_repository_empty(self):
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
522
        self.assertRaises(errors.NotBranchError,
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
523
            bzrdir.BzrDir.open_containing_tree_branch_or_repository,
524
            self.get_readonly_url(''))
525
3015.3.46 by Daniel Watkins
Made tests more granular.
526
    def test_open_containing_tree_branch_or_repository_all(self):
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
527
        self.make_branch_and_tree('topdir')
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
528
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
529
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
530
                'topdir/foo')
531
        self.assertEqual(os.path.realpath('topdir'),
532
                         os.path.realpath(tree.basedir))
533
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
534
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
535
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
536
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
537
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
538
        self.assertEqual(relpath, 'foo')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
539
3015.3.46 by Daniel Watkins
Made tests more granular.
540
    def test_open_containing_tree_branch_or_repository_no_tree(self):
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
541
        self.make_branch('branch')
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
542
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
543
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
544
                'branch/foo')
545
        self.assertEqual(tree, None)
546
        self.assertEqual(os.path.realpath('branch'),
3015.3.45 by Daniel Watkins
Extract common method.
547
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
548
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
549
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
550
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
551
        self.assertEqual(relpath, 'foo')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
552
3015.3.46 by Daniel Watkins
Made tests more granular.
553
    def test_open_containing_tree_branch_or_repository_repo(self):
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
554
        self.make_repository('repo')
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
555
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
556
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
557
                'repo')
558
        self.assertEqual(tree, None)
559
        self.assertEqual(branch, None)
560
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
561
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
562
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
563
        self.assertEqual(relpath, '')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
564
3015.3.46 by Daniel Watkins
Made tests more granular.
565
    def test_open_containing_tree_branch_or_repository_shared_repo(self):
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
566
        self.make_repository('shared', shared=True)
567
        bzrdir.BzrDir.create_branch_convenience('shared/branch',
568
                                                force_new_tree=False)
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
569
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
570
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
571
                'shared/branch')
572
        self.assertEqual(tree, None)
573
        self.assertEqual(os.path.realpath('shared/branch'),
3015.3.45 by Daniel Watkins
Extract common method.
574
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
575
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
576
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
577
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
578
        self.assertEqual(relpath, '')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
579
3015.3.48 by Daniel Watkins
Further granulated tests.
580
    def test_open_containing_tree_branch_or_repository_branch_subdir(self):
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
581
        self.make_branch_and_tree('foo')
3015.3.52 by Daniel Watkins
Replaced use of os functions with use of test suite functions.
582
        self.build_tree(['foo/bar/'])
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
583
        tree, branch, repo, relpath = \
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
584
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
585
                'foo/bar')
586
        self.assertEqual(os.path.realpath('foo'),
587
                         os.path.realpath(tree.basedir))
588
        self.assertEqual(os.path.realpath('foo'),
3015.3.45 by Daniel Watkins
Extract common method.
589
                         self.local_branch_path(branch))
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
590
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
591
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
592
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
593
        self.assertEqual(relpath, 'bar')
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
594
3015.3.48 by Daniel Watkins
Further granulated tests.
595
    def test_open_containing_tree_branch_or_repository_repo_subdir(self):
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
596
        self.make_repository('bar')
3015.3.52 by Daniel Watkins
Replaced use of os functions with use of test suite functions.
597
        self.build_tree(['bar/baz/'])
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
598
        tree, branch, repo, relpath = \
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
599
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
600
                'bar/baz')
601
        self.assertEqual(tree, None)
602
        self.assertEqual(branch, None)
603
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
604
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
605
            repo.bzrdir.transport.local_abspath('repository'))
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
606
        self.assertEqual(relpath, 'baz')
3015.3.42 by Daniel Watkins
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
607
1534.6.11 by Robert Collins
Review feedback.
608
    def test_open_containing_from_transport(self):
609
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
1534.6.3 by Robert Collins
find_repository sufficiently robust.
610
                          get_transport(self.get_readonly_url('')))
1534.6.11 by Robert Collins
Review feedback.
611
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
1534.6.3 by Robert Collins
find_repository sufficiently robust.
612
                          get_transport(self.get_readonly_url('g/p/q')))
613
        control = bzrdir.BzrDir.create(self.get_url())
1534.6.11 by Robert Collins
Review feedback.
614
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
1534.6.3 by Robert Collins
find_repository sufficiently robust.
615
            get_transport(self.get_readonly_url('')))
616
        self.assertEqual('', relpath)
1534.6.11 by Robert Collins
Review feedback.
617
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
1534.6.3 by Robert Collins
find_repository sufficiently robust.
618
            get_transport(self.get_readonly_url('g/p/q')))
619
        self.assertEqual('g/p/q', relpath)
620
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
621
    def test_open_containing_tree_or_branch(self):
622
        self.make_branch_and_tree('topdir')
623
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
624
            'topdir/foo')
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
625
        self.assertEqual(os.path.realpath('topdir'),
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
626
                         os.path.realpath(tree.basedir))
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
627
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
628
                         self.local_branch_path(branch))
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
629
        self.assertIs(tree.bzrdir, branch.bzrdir)
630
        self.assertEqual('foo', relpath)
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
631
        # opening from non-local should not return the tree
632
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
633
            self.get_readonly_url('topdir/foo'))
634
        self.assertEqual(None, tree)
635
        self.assertEqual('foo', relpath)
636
        # without a tree:
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
637
        self.make_branch('topdir/foo')
638
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
639
            'topdir/foo')
640
        self.assertIs(tree, None)
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
641
        self.assertEqual(os.path.realpath('topdir/foo'),
3015.3.45 by Daniel Watkins
Extract common method.
642
                         self.local_branch_path(branch))
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
643
        self.assertEqual('', relpath)
644
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
645
    def test_open_tree_or_branch(self):
646
        self.make_branch_and_tree('topdir')
647
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir')
648
        self.assertEqual(os.path.realpath('topdir'),
649
                         os.path.realpath(tree.basedir))
650
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
651
                         self.local_branch_path(branch))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
652
        self.assertIs(tree.bzrdir, branch.bzrdir)
653
        # opening from non-local should not return the tree
3123.5.15 by Aaron Bentley
Fix open_tree_or_branch tests
654
        tree, branch = bzrdir.BzrDir.open_tree_or_branch(
655
            self.get_readonly_url('topdir'))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
656
        self.assertEqual(None, tree)
657
        # without a tree:
658
        self.make_branch('topdir/foo')
3123.5.15 by Aaron Bentley
Fix open_tree_or_branch tests
659
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir/foo')
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
660
        self.assertIs(tree, None)
661
        self.assertEqual(os.path.realpath('topdir/foo'),
3015.3.45 by Daniel Watkins
Extract common method.
662
                         self.local_branch_path(branch))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
663
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
664
    def test_open_from_transport(self):
665
        # transport pointing at bzrdir should give a bzrdir with root transport
666
        # set to the given transport
667
        control = bzrdir.BzrDir.create(self.get_url())
668
        transport = get_transport(self.get_url())
669
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport)
670
        self.assertEqual(transport.base, opened_bzrdir.root_transport.base)
671
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
672
        
673
    def test_open_from_transport_no_bzrdir(self):
674
        transport = get_transport(self.get_url())
675
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
676
                          transport)
677
678
    def test_open_from_transport_bzrdir_in_parent(self):
679
        control = bzrdir.BzrDir.create(self.get_url())
680
        transport = get_transport(self.get_url())
681
        transport.mkdir('subdir')
682
        transport = transport.clone('subdir')
683
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport,
684
                          transport)
685
2100.3.28 by Aaron Bentley
Make sprout recursive
686
    def test_sprout_recursive(self):
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
687
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
2100.3.28 by Aaron Bentley
Make sprout recursive
688
        sub_tree = self.make_branch_and_tree('tree1/subtree',
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
689
            format='dirstate-with-subtree')
2100.3.28 by Aaron Bentley
Make sprout recursive
690
        tree.add_reference(sub_tree)
691
        self.build_tree(['tree1/subtree/file'])
692
        sub_tree.add('file')
693
        tree.commit('Initial commit')
694
        tree.bzrdir.sprout('tree2')
695
        self.failUnlessExists('tree2/subtree/file')
696
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
697
    def test_cloning_metadir(self):
698
        """Ensure that cloning metadir is suitable"""
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
699
        bzrdir = self.make_bzrdir('bzrdir')
700
        bzrdir.cloning_metadir()
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
701
        branch = self.make_branch('branch', format='knit')
702
        format = branch.bzrdir.cloning_metadir()
703
        self.assertIsInstance(format.workingtree_format,
2255.2.174 by Martin Pool
remove AB1 WorkingTree and experimental-knit3
704
            workingtree.WorkingTreeFormat3)
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
705
706
    def test_sprout_recursive_treeless(self):
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
707
        tree = self.make_branch_and_tree('tree1',
708
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
709
        sub_tree = self.make_branch_and_tree('tree1/subtree',
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
710
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
711
        tree.add_reference(sub_tree)
712
        self.build_tree(['tree1/subtree/file'])
713
        sub_tree.add('file')
714
        tree.commit('Initial commit')
715
        tree.bzrdir.destroy_workingtree()
716
        repo = self.make_repository('repo', shared=True,
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
717
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
718
        repo.set_make_working_trees(False)
719
        tree.bzrdir.sprout('repo/tree2')
720
        self.failUnlessExists('repo/tree2/subtree')
721
        self.failIfExists('repo/tree2/subtree/file')
722
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
723
    def make_foo_bar_baz(self):
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
724
        foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
725
        bar = self.make_branch('foo/bar').bzrdir
726
        baz = self.make_branch('baz').bzrdir
727
        return foo, bar, baz
728
729
    def test_find_bzrdirs(self):
730
        foo, bar, baz = self.make_foo_bar_baz()
731
        transport = get_transport(self.get_url())
732
        self.assertEqualBzrdirs([baz, foo, bar],
733
                                bzrdir.BzrDir.find_bzrdirs(transport))
734
735
    def test_find_bzrdirs_list_current(self):
736
        def list_current(transport):
737
            return [s for s in transport.list_dir('') if s != 'baz']
738
739
        foo, bar, baz = self.make_foo_bar_baz()
740
        transport = get_transport(self.get_url())
741
        self.assertEqualBzrdirs([foo, bar],
742
                                bzrdir.BzrDir.find_bzrdirs(transport,
743
                                    list_current=list_current))
744
745
746
    def test_find_bzrdirs_evaluate(self):
747
        def evaluate(bzrdir):
748
            try:
749
                repo = bzrdir.open_repository()
750
            except NoRepositoryPresent:
751
                return True, bzrdir.root_transport.base
752
            else:
753
                return False, bzrdir.root_transport.base
754
755
        foo, bar, baz = self.make_foo_bar_baz()
756
        transport = get_transport(self.get_url())
757
        self.assertEqual([baz.root_transport.base, foo.root_transport.base],
758
                         list(bzrdir.BzrDir.find_bzrdirs(transport,
759
                                                         evaluate=evaluate)))
760
761
    def assertEqualBzrdirs(self, first, second):
762
        first = list(first)
763
        second = list(second)
764
        self.assertEqual(len(first), len(second))
765
        for x, y in zip(first, second):
766
            self.assertEqual(x.root_transport.base, y.root_transport.base)
767
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
768
    def test_find_branches(self):
769
        root = self.make_repository('', shared=True)
770
        foo, bar, baz = self.make_foo_bar_baz()
771
        qux = self.make_bzrdir('foo/qux')
772
        transport = get_transport(self.get_url())
773
        branches = bzrdir.BzrDir.find_branches(transport)
774
        self.assertEqual(baz.root_transport.base, branches[0].base)
775
        self.assertEqual(foo.root_transport.base, branches[1].base)
776
        self.assertEqual(bar.root_transport.base, branches[2].base)
777
778
        # ensure this works without a top-level repo
779
        branches = bzrdir.BzrDir.find_branches(transport.clone('foo'))
780
        self.assertEqual(foo.root_transport.base, branches[0].base)
781
        self.assertEqual(bar.root_transport.base, branches[1].base)
782
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
783
784
class TestMeta1DirFormat(TestCaseWithTransport):
785
    """Tests specific to the meta1 dir format."""
786
787
    def test_right_base_dirs(self):
788
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
789
        t = dir.transport
790
        branch_base = t.clone('branch').base
791
        self.assertEqual(branch_base, dir.get_branch_transport(None).base)
792
        self.assertEqual(branch_base,
1508.1.25 by Robert Collins
Update per review comments.
793
                         dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
794
        repository_base = t.clone('repository').base
795
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
796
        self.assertEqual(repository_base,
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
797
                         dir.get_repository_transport(weaverepo.RepositoryFormat7()).base)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
798
        checkout_base = t.clone('checkout').base
799
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
800
        self.assertEqual(checkout_base,
801
                         dir.get_workingtree_transport(workingtree.WorkingTreeFormat3()).base)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
802
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
803
    def test_meta1dir_uses_lockdir(self):
804
        """Meta1 format uses a LockDir to guard the whole directory, not a file."""
805
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
806
        t = dir.transport
807
        self.assertIsDirectory('branch-lock', t)
808
2100.3.35 by Aaron Bentley
equality operations on bzrdir
809
    def test_comparison(self):
810
        """Equality and inequality behave properly.
811
812
        Metadirs should compare equal iff they have the same repo, branch and
813
        tree formats.
814
        """
815
        mydir = bzrdir.format_registry.make_bzrdir('knit')
816
        self.assertEqual(mydir, mydir)
817
        self.assertFalse(mydir != mydir)
818
        otherdir = bzrdir.format_registry.make_bzrdir('knit')
819
        self.assertEqual(otherdir, mydir)
820
        self.assertFalse(otherdir != mydir)
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
821
        otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
2100.3.35 by Aaron Bentley
equality operations on bzrdir
822
        self.assertNotEqual(otherdir2, mydir)
823
        self.assertFalse(otherdir2 == mydir)
824
2255.12.1 by Robert Collins
Implement upgrade for working trees.
825
    def test_needs_conversion_different_working_tree(self):
826
        # meta1dirs need an conversion if any element is not the default.
827
        old_format = bzrdir.BzrDirFormat.get_default_format()
828
        # test with 
829
        new_default = bzrdir.format_registry.make_bzrdir('dirstate')
830
        bzrdir.BzrDirFormat._set_default_format(new_default)
831
        try:
832
            tree = self.make_branch_and_tree('tree', format='knit')
833
            self.assertTrue(tree.bzrdir.needs_format_conversion())
834
        finally:
835
            bzrdir.BzrDirFormat._set_default_format(old_format)
836
837
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
838
class TestFormat5(TestCaseWithTransport):
839
    """Tests specific to the version 5 bzrdir format."""
840
841
    def test_same_lockfiles_between_tree_repo_branch(self):
842
        # this checks that only a single lockfiles instance is created 
843
        # for format 5 objects
844
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
845
        def check_dir_components_use_same_lock(dir):
846
            ctrl_1 = dir.open_repository().control_files
847
            ctrl_2 = dir.open_branch().control_files
848
            ctrl_3 = dir.open_workingtree()._control_files
849
            self.assertTrue(ctrl_1 is ctrl_2)
850
            self.assertTrue(ctrl_2 is ctrl_3)
851
        check_dir_components_use_same_lock(dir)
852
        # and if we open it normally.
853
        dir = bzrdir.BzrDir.open(self.get_url())
854
        check_dir_components_use_same_lock(dir)
855
    
1534.5.16 by Robert Collins
Review feedback.
856
    def test_can_convert(self):
857
        # format 5 dirs are convertable
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
858
        dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
1534.5.16 by Robert Collins
Review feedback.
859
        self.assertTrue(dir.can_convert_format())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
860
    
1534.5.16 by Robert Collins
Review feedback.
861
    def test_needs_conversion(self):
862
        # format 5 dirs need a conversion if they are not the default.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
863
        # and they start of not the default.
864
        old_format = bzrdir.BzrDirFormat.get_default_format()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
865
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
866
        try:
867
            dir = bzrdir.BzrDirFormat5().initialize(self.get_url())
1534.5.16 by Robert Collins
Review feedback.
868
            self.assertFalse(dir.needs_format_conversion())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
869
        finally:
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
870
            bzrdir.BzrDirFormat._set_default_format(old_format)
1534.5.16 by Robert Collins
Review feedback.
871
        self.assertTrue(dir.needs_format_conversion())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
872
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
873
874
class TestFormat6(TestCaseWithTransport):
875
    """Tests specific to the version 6 bzrdir format."""
876
877
    def test_same_lockfiles_between_tree_repo_branch(self):
878
        # this checks that only a single lockfiles instance is created 
879
        # for format 6 objects
880
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
881
        def check_dir_components_use_same_lock(dir):
882
            ctrl_1 = dir.open_repository().control_files
883
            ctrl_2 = dir.open_branch().control_files
884
            ctrl_3 = dir.open_workingtree()._control_files
885
            self.assertTrue(ctrl_1 is ctrl_2)
886
            self.assertTrue(ctrl_2 is ctrl_3)
887
        check_dir_components_use_same_lock(dir)
888
        # and if we open it normally.
889
        dir = bzrdir.BzrDir.open(self.get_url())
890
        check_dir_components_use_same_lock(dir)
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
891
    
1534.5.16 by Robert Collins
Review feedback.
892
    def test_can_convert(self):
893
        # format 6 dirs are convertable
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
894
        dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
1534.5.16 by Robert Collins
Review feedback.
895
        self.assertTrue(dir.can_convert_format())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
896
    
1534.5.16 by Robert Collins
Review feedback.
897
    def test_needs_conversion(self):
898
        # format 6 dirs need an conversion if they are not the default.
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
899
        old_format = bzrdir.BzrDirFormat.get_default_format()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
900
        bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
901
        try:
902
            dir = bzrdir.BzrDirFormat6().initialize(self.get_url())
1534.5.16 by Robert Collins
Review feedback.
903
            self.assertTrue(dir.needs_format_conversion())
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
904
        finally:
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
905
            bzrdir.BzrDirFormat._set_default_format(old_format)
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
906
907
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
908
class NotBzrDir(bzrlib.bzrdir.BzrDir):
909
    """A non .bzr based control directory."""
910
911
    def __init__(self, transport, format):
912
        self._format = format
913
        self.root_transport = transport
914
        self.transport = transport.clone('.not')
915
916
917
class NotBzrDirFormat(bzrlib.bzrdir.BzrDirFormat):
918
    """A test class representing any non-.bzr based disk format."""
919
920
    def initialize_on_transport(self, transport):
921
        """Initialize a new .not dir in the base directory of a Transport."""
922
        transport.mkdir('.not')
923
        return self.open(transport)
924
925
    def open(self, transport):
926
        """Open this directory."""
927
        return NotBzrDir(transport, self)
928
929
    @classmethod
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
930
    def _known_formats(self):
931
        return set([NotBzrDirFormat()])
932
933
    @classmethod
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
934
    def probe_transport(self, transport):
935
        """Our format is present if the transport ends in '.not/'."""
1733.1.2 by Robert Collins
bugfix test for non .bzrdir support.
936
        if transport.has('.not'):
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
937
            return NotBzrDirFormat()
938
939
940
class TestNotBzrDir(TestCaseWithTransport):
941
    """Tests for using the bzrdir api with a non .bzr based disk format.
942
    
943
    If/when one of these is in the core, we can let the implementation tests
944
    verify this works.
945
    """
946
947
    def test_create_and_find_format(self):
948
        # create a .notbzr dir 
949
        format = NotBzrDirFormat()
950
        dir = format.initialize(self.get_url())
951
        self.assertIsInstance(dir, NotBzrDir)
952
        # now probe for it.
953
        bzrlib.bzrdir.BzrDirFormat.register_control_format(format)
954
        try:
955
            found = bzrlib.bzrdir.BzrDirFormat.find_format(
956
                get_transport(self.get_url()))
1733.1.2 by Robert Collins
bugfix test for non .bzrdir support.
957
            self.assertIsInstance(found, NotBzrDirFormat)
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
958
        finally:
959
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(format)
960
1733.1.3 by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs.
961
    def test_included_in_known_formats(self):
962
        bzrlib.bzrdir.BzrDirFormat.register_control_format(NotBzrDirFormat)
963
        try:
964
            formats = bzrlib.bzrdir.BzrDirFormat.known_formats()
965
            for format in formats:
966
                if isinstance(format, NotBzrDirFormat):
967
                    return
968
            self.fail("No NotBzrDirFormat in %s" % formats)
969
        finally:
970
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(NotBzrDirFormat)
971
1733.1.1 by Robert Collins
Support non '.bzr' control directories in bzrdir.
972
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
973
class NonLocalTests(TestCaseWithTransport):
974
    """Tests for bzrdir static behaviour on non local paths."""
975
976
    def setUp(self):
977
        super(NonLocalTests, self).setUp()
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
978
        self.vfs_transport_factory = MemoryServer
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
979
    
980
    def test_create_branch_convenience(self):
981
        # outside a repo the default convenience output is a repo+branch_tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
982
        format = bzrdir.format_registry.make_bzrdir('knit')
983
        branch = bzrdir.BzrDir.create_branch_convenience(
984
            self.get_url('foo'), format=format)
985
        self.assertRaises(errors.NoWorkingTree,
986
                          branch.bzrdir.open_workingtree)
987
        branch.bzrdir.open_repository()
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
988
989
    def test_create_branch_convenience_force_tree_not_local_fails(self):
990
        # outside a repo the default convenience output is a repo+branch_tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
991
        format = bzrdir.format_registry.make_bzrdir('knit')
992
        self.assertRaises(errors.NotLocalUrl,
993
            bzrdir.BzrDir.create_branch_convenience,
994
            self.get_url('foo'),
995
            force_new_tree=True,
996
            format=format)
997
        t = get_transport(self.get_url('.'))
998
        self.assertFalse(t.has('foo'))
1563.1.6 by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls.
999
1563.2.38 by Robert Collins
make push preserve tree formats.
1000
    def test_clone(self):
1001
        # clone into a nonlocal path works
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1002
        format = bzrdir.format_registry.make_bzrdir('knit')
1003
        branch = bzrdir.BzrDir.create_branch_convenience('local',
1004
                                                         format=format)
1563.2.38 by Robert Collins
make push preserve tree formats.
1005
        branch.bzrdir.open_workingtree()
1006
        result = branch.bzrdir.clone(self.get_url('remote'))
1007
        self.assertRaises(errors.NoWorkingTree,
1008
                          result.open_workingtree)
1009
        result.open_branch()
1010
        result.open_repository()
1011
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1012
    def test_checkout_metadir(self):
1013
        # checkout_metadir has reasonable working tree format even when no
1014
        # working tree is present
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1015
        self.make_branch('branch-knit2', format='dirstate-with-subtree')
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1016
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
1017
        checkout_format = my_bzrdir.checkout_metadir()
1018
        self.assertIsInstance(checkout_format.workingtree_format,
1019
                              workingtree.WorkingTreeFormat3)
2100.3.22 by Aaron Bentley
merge from bzr.dev
1020
2215.3.5 by Aaron Bentley
Add support for remote ls
1021
2164.2.16 by Vincent Ladeuil
Add tests.
1022
class TestHTTPRedirectionLoop(object):
1023
    """Test redirection loop between two http servers.
1024
1025
    This MUST be used by daughter classes that also inherit from
1026
    TestCaseWithTwoWebservers.
1027
1028
    We can't inherit directly from TestCaseWithTwoWebservers or the
1029
    test framework will try to create an instance which cannot
1030
    run, its implementation being incomplete. 
1031
    """
1032
1033
    # Should be defined by daughter classes to ensure redirection
2164.2.17 by Vincent Ladeuil
Add comments and fix typos
1034
    # still use the same transport implementation (not currently
1035
    # enforced as it's a bit tricky to get right (see the FIXME
1036
    # in BzrDir.open_from_transport for the unique use case so
1037
    # far)
2164.2.16 by Vincent Ladeuil
Add tests.
1038
    _qualifier = None
1039
1040
    def create_transport_readonly_server(self):
1041
        return HTTPServerRedirecting()
1042
1043
    def create_transport_secondary_server(self):
1044
        return HTTPServerRedirecting()
1045
1046
    def setUp(self):
1047
        # Both servers redirect to each server creating a loop
1048
        super(TestHTTPRedirectionLoop, self).setUp()
1049
        # The redirections will point to the new server
1050
        self.new_server = self.get_readonly_server()
1051
        # The requests to the old server will be redirected
1052
        self.old_server = self.get_secondary_server()
1053
        # Configure the redirections
1054
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
1055
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
1056
1057
    def _qualified_url(self, host, port):
1058
        return 'http+%s://%s:%s' % (self._qualifier, host, port)
1059
1060
    def test_loop(self):
1061
        # Starting from either server should loop
1062
        old_url = self._qualified_url(self.old_server.host, 
1063
                                      self.old_server.port)
1064
        oldt = self._transport(old_url)
1065
        self.assertRaises(errors.NotBranchError,
1066
                          bzrdir.BzrDir.open_from_transport, oldt)
1067
        new_url = self._qualified_url(self.new_server.host, 
1068
                                      self.new_server.port)
1069
        newt = self._transport(new_url)
1070
        self.assertRaises(errors.NotBranchError,
1071
                          bzrdir.BzrDir.open_from_transport, newt)
1072
1073
1074
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop,
1075
                                  TestCaseWithTwoWebservers):
1076
    """Tests redirections for urllib implementation"""
1077
1078
    _qualifier = 'urllib'
1079
    _transport = HttpTransport_urllib
1080
1081
1082
1083
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
1084
                                  TestHTTPRedirectionLoop,
1085
                                  TestCaseWithTwoWebservers):
1086
    """Tests redirections for pycurl implementation"""
1087
1088
    _qualifier = 'pycurl'
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1089
1090
1091
class TestDotBzrHidden(TestCaseWithTransport):
1092
3023.1.3 by Alexander Belchenko
John's review
1093
    ls = ['ls']
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1094
    if sys.platform == 'win32':
3023.1.3 by Alexander Belchenko
John's review
1095
        ls = [os.environ['COMSPEC'], '/C', 'dir', '/B']
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1096
1097
    def get_ls(self):
3023.1.3 by Alexander Belchenko
John's review
1098
        f = subprocess.Popen(self.ls, stdout=subprocess.PIPE,
1099
            stderr=subprocess.PIPE)
1100
        out, err = f.communicate()
1101
        self.assertEqual(0, f.returncode, 'Calling %s failed: %s'
1102
                         % (self.ls, err))
1103
        return out.splitlines()
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1104
1105
    def test_dot_bzr_hidden(self):
3023.1.2 by Alexander Belchenko
Martin's review.
1106
        if sys.platform == 'win32' and not win32utils.has_win32file:
1107
            raise TestSkipped('unable to make file hidden without pywin32 library')
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1108
        b = bzrdir.BzrDir.create('.')
3044.1.1 by Martin Pool
Fix up calls to TestCase.build_tree passing a string rather than a list
1109
        self.build_tree(['a'])
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1110
        self.assertEquals(['a'], self.get_ls())
1111
1112
    def test_dot_bzr_hidden_with_url(self):
3023.1.2 by Alexander Belchenko
Martin's review.
1113
        if sys.platform == 'win32' and not win32utils.has_win32file:
1114
            raise TestSkipped('unable to make file hidden without pywin32 library')
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1115
        b = bzrdir.BzrDir.create(urlutils.local_path_to_url('.'))
3044.1.1 by Martin Pool
Fix up calls to TestCase.build_tree passing a string rather than a list
1116
        self.build_tree(['a'])
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1117
        self.assertEquals(['a'], self.get_ls())
3583.1.2 by Andrew Bennetts
Add test for fix.
1118
1119
1120
class _TestBzrDirFormat(bzrdir.BzrDirMetaFormat1):
1121
    """Test BzrDirFormat implementation for TestBzrDirSprout."""
1122
1123
    def _open(self, transport):
1124
        return _TestBzrDir(transport, self)
1125
1126
1127
class _TestBzrDir(bzrdir.BzrDirMeta1):
1128
    """Test BzrDir implementation for TestBzrDirSprout.
1129
    
1130
    When created a _TestBzrDir already has repository and a branch.  The branch
1131
    is a test double as well.
1132
    """
1133
1134
    def __init__(self, *args, **kwargs):
1135
        super(_TestBzrDir, self).__init__(*args, **kwargs)
1136
        self.test_branch = _TestBranch()
1137
        self.test_branch.repository = self.create_repository()
1138
1139
    def open_branch(self, unsupported=False):
1140
        return self.test_branch
1141
1142
    def cloning_metadir(self):
1143
        return _TestBzrDirFormat()
1144
1145
1146
class _TestBranch(bzrlib.branch.Branch):
1147
    """Test Branch implementation for TestBzrDirSprout."""
1148
1149
    def __init__(self, *args, **kwargs):
1150
        super(_TestBranch, self).__init__(*args, **kwargs)
1151
        self.calls = []
1152
    
1153
    def sprout(self, *args, **kwargs):
1154
        self.calls.append('sprout')
1155
1156
1157
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1158
1159
    def test_sprout_uses_branch_sprout(self):
1160
        """BzrDir.sprout calls Branch.sprout.
1161
1162
        Usually, BzrDir.sprout should delegate to the branch's sprout method
1163
        for part of the work.  This allows the source branch to control the
1164
        choice of format for the new branch.
1165
        
1166
        There are exceptions, but this tests avoids them:
1167
          - if there's no branch in the source bzrdir,
1168
          - or if the stacking has been requested and the format needs to be
1169
            overridden to satisfy that.
1170
        """
1171
        # Make an instrumented bzrdir.
1172
        t = self.get_transport('source')
1173
        t.ensure_base()
1174
        source_bzrdir = _TestBzrDirFormat().initialize_on_transport(t)
1175
        # The instrumented bzrdir has a test_branch attribute that logs calls
1176
        # made to the branch contained in that bzrdir.  Initially the test
1177
        # branch exists but no calls have been made to it.
1178
        self.assertEqual([], source_bzrdir.test_branch.calls)
1179
1180
        # Sprout the bzrdir
1181
        target_url = self.get_url('target')
1182
        result = source_bzrdir.sprout(target_url, recurse='no')
1183
1184
        # The bzrdir called the branch's sprout method.
1185
        self.assertEqual(['sprout'], source_bzrdir.test_branch.calls)
1186