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