/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2006-2011 Canonical Ltd
3650.3.10 by Aaron Bentley
Ensure that sprout chooses a rich-root format as needed
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.4.39 by Robert Collins
Basic BzrDir support.
16
17
"""Tests for the BzrDir facility and any format specific tests.
18
4523.1.4 by Martin Pool
Rename remaining *_implementations tests
19
For interface contract tests, see tests/per_bzr_dir.
1534.4.39 by Robert Collins
Basic BzrDir support.
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
3023.1.3 by Alexander Belchenko
John's review
23
import subprocess
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
24
import sys
1534.4.39 by Robert Collins
Basic BzrDir support.
25
2204.4.1 by Aaron Bentley
Add 'formats' help topic
26
from bzrlib import (
5215.4.1 by Marius Kruger
BzrDir.find_branches should not fall over when encountering branches with missing repos
27
    branch,
2100.3.35 by Aaron Bentley
equality operations on bzrdir
28
    bzrdir,
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
29
    config,
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
30
    controldir,
2100.3.35 by Aaron Bentley
equality operations on bzrdir
31
    errors,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
32
    help_topics,
5535.3.9 by Andrew Bennetts
Fix test failures.
33
    lock,
2100.3.35 by Aaron Bentley
equality operations on bzrdir
34
    repository,
5535.4.15 by Andrew Bennetts
Fix a test failure.
35
    revision as _mod_revision,
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
36
    osutils,
4017.2.1 by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
37
    remote,
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
38
    symbol_versioning,
5609.9.1 by Martin
Blindly change all users of get_transport to address the function via the transport module
39
    transport as _mod_transport,
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
40
    urlutils,
3023.1.2 by Alexander Belchenko
Martin's review.
41
    win32utils,
5816.5.4 by Jelmer Vernooij
Merge bzr.dev.
42
    workingtree_3,
5816.5.6 by Jelmer Vernooij
Fix default working tree format.
43
    workingtree_4,
2204.4.1 by Aaron Bentley
Add 'formats' help topic
44
    )
1508.1.25 by Robert Collins
Update per review comments.
45
import bzrlib.branch
5582.10.50 by Jelmer Vernooij
Move more weave-specific tests to bzrlib.plugins.weave_fmt.
46
from bzrlib.errors import (
47
    NotBranchError,
48
    NoColocatedBranchSupport,
49
    UnknownFormatError,
50
    UnsupportedFormatError,
51
    )
2164.2.16 by Vincent Ladeuil
Add tests.
52
from bzrlib.tests import (
53
    TestCase,
3583.1.2 by Andrew Bennetts
Add test for fix.
54
    TestCaseWithMemoryTransport,
2164.2.16 by Vincent Ladeuil
Add tests.
55
    TestCaseWithTransport,
3023.1.2 by Alexander Belchenko
Martin's review.
56
    TestSkipped,
2164.2.16 by Vincent Ladeuil
Add tests.
57
    )
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
58
from bzrlib.tests import(
59
    http_server,
60
    http_utils,
2164.2.16 by Vincent Ladeuil
Add tests.
61
    )
62
from bzrlib.tests.test_http import TestWithTransport_pycurl
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
63
from bzrlib.transport import (
64
    memory,
5215.3.2 by Marius Kruger
* Move TestCaseWithMemoryTransport.make_smart_server => TestCaseWithTransport
65
    pathfilter,
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
66
    )
2164.2.16 by Vincent Ladeuil
Add tests.
67
from bzrlib.transport.http._urllib import HttpTransport_urllib
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
68
from bzrlib.transport.nosmart import NoSmartTransportDecorator
69
from bzrlib.transport.readonly import ReadonlyTransportDecorator
5757.1.6 by Jelmer Vernooij
Fix another import.
70
from bzrlib.repofmt import knitrepo, knitpack_repo
1534.4.39 by Robert Collins
Basic BzrDir support.
71
72
73
class TestDefaultFormat(TestCase):
74
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
75
    def test_get_set_default_format(self):
1534.4.39 by Robert Collins
Basic BzrDir support.
76
        old_format = bzrdir.BzrDirFormat.get_default_format()
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
77
        # default is BzrDirMetaFormat1
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
78
        self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
5363.2.7 by Jelmer Vernooij
Fix tests.
79
        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
1534.4.39 by Robert Collins
Basic BzrDir support.
80
        # creating a bzr dir should now create an instrumented dir.
81
        try:
1685.1.42 by John Arbash Meinel
A couple more fixes to make sure memory:/// works correctly.
82
            result = bzrdir.BzrDir.create('memory:///')
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
83
            self.assertIsInstance(result, SampleBzrDir)
1534.4.39 by Robert Collins
Basic BzrDir support.
84
        finally:
5363.2.7 by Jelmer Vernooij
Fix tests.
85
            controldir.ControlDirFormat._set_default_format(old_format)
1534.4.39 by Robert Collins
Basic BzrDir support.
86
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
87
88
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
89
class DeprecatedBzrDirFormat(bzrdir.BzrDirFormat):
90
    """A deprecated bzr dir format."""
91
92
2204.4.1 by Aaron Bentley
Add 'formats' help topic
93
class TestFormatRegistry(TestCase):
94
95
    def make_format_registry(self):
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
96
        my_format_registry = controldir.ControlDirFormatRegistry()
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
97
        my_format_registry.register('deprecated', DeprecatedBzrDirFormat,
98
            'Some format.  Slower and unawesome and deprecated.',
99
            deprecated=True)
100
        my_format_registry.register_lazy('lazy', 'bzrlib.tests.test_bzrdir',
101
            'DeprecatedBzrDirFormat', 'Format registered lazily',
102
            deprecated=True)
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
103
        bzrdir.register_metadir(my_format_registry, 'knit',
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
104
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
105
            'Format using knits',
2241.1.21 by Martin Pool
Change register_metadir to take fully-qualified repository class name.
106
            )
2204.4.1 by Aaron Bentley
Add 'formats' help topic
107
        my_format_registry.set_default('knit')
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
108
        bzrdir.register_metadir(my_format_registry,
2230.3.53 by Aaron Bentley
Merge bzr.dev
109
            'branch6',
2255.2.211 by Robert Collins
Remove knit2 repository format- it has never been supported.
110
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
2230.3.53 by Aaron Bentley
Merge bzr.dev
111
            'Experimental successor to knit.  Use at your own risk.',
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
112
            branch_format='bzrlib.branch.BzrBranchFormat6',
113
            experimental=True)
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
114
        bzrdir.register_metadir(my_format_registry,
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
115
            'hidden format',
116
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
117
            'Experimental successor to knit.  Use at your own risk.',
118
            branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True)
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
119
        my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
120
            'Old format.  Slower and does not support things. ', hidden=True)
121
        my_format_registry.register_lazy('hiddenlazy', 'bzrlib.tests.test_bzrdir',
122
            'DeprecatedBzrDirFormat', 'Format registered lazily',
123
            deprecated=True, hidden=True)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
124
        return my_format_registry
125
126
    def test_format_registry(self):
127
        my_format_registry = self.make_format_registry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
128
        my_bzrdir = my_format_registry.make_bzrdir('lazy')
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
129
        self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
130
        my_bzrdir = my_format_registry.make_bzrdir('deprecated')
131
        self.assertIsInstance(my_bzrdir, DeprecatedBzrDirFormat)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
132
        my_bzrdir = my_format_registry.make_bzrdir('default')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
        self.assertIsInstance(my_bzrdir.repository_format,
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
134
            knitrepo.RepositoryFormatKnit1)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
135
        my_bzrdir = my_format_registry.make_bzrdir('knit')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
136
        self.assertIsInstance(my_bzrdir.repository_format,
2241.1.6 by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
137
            knitrepo.RepositoryFormatKnit1)
2230.3.1 by Aaron Bentley
Get branch6 creation working
138
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
2230.3.55 by Aaron Bentley
Updates from review
139
        self.assertIsInstance(my_bzrdir.get_branch_format(),
2230.3.1 by Aaron Bentley
Get branch6 creation working
140
                              bzrlib.branch.BzrBranchFormat6)
2204.4.1 by Aaron Bentley
Add 'formats' help topic
141
142
    def test_get_help(self):
143
        my_format_registry = self.make_format_registry()
2204.4.7 by Aaron Bentley
restore register_lazy, remove register_factory, other updates
144
        self.assertEqual('Format registered lazily',
145
                         my_format_registry.get_help('lazy'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
146
        self.assertEqual('Format using knits',
2204.4.1 by Aaron Bentley
Add 'formats' help topic
147
                         my_format_registry.get_help('knit'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
148
        self.assertEqual('Format using knits',
2204.4.1 by Aaron Bentley
Add 'formats' help topic
149
                         my_format_registry.get_help('default'))
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
150
        self.assertEqual('Some format.  Slower and unawesome and deprecated.',
151
                         my_format_registry.get_help('deprecated'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
152
2204.4.1 by Aaron Bentley
Add 'formats' help topic
153
    def test_help_topic(self):
154
        topics = help_topics.HelpTopicRegistry()
3892.1.3 by Ian Clatworthy
tweak test suite to support the split up formats topic
155
        registry = self.make_format_registry()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
156
        topics.register('current-formats', registry.help_topic,
3892.1.3 by Ian Clatworthy
tweak test suite to support the split up formats topic
157
                        'Current formats')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
158
        topics.register('other-formats', registry.help_topic,
3892.1.3 by Ian Clatworthy
tweak test suite to support the split up formats topic
159
                        'Other formats')
160
        new = topics.get_detail('current-formats')
161
        rest = topics.get_detail('other-formats')
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
162
        experimental, deprecated = rest.split('Deprecated formats')
4927.2.10 by Ian Clatworthy
fix test failures
163
        self.assertContainsRe(new, 'formats-help')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
164
        self.assertContainsRe(new,
2666.1.8 by Ian Clatworthy
Fix storage formats help test
165
                ':knit:\n    \(native\) \(default\) Format using knits\n')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
166
        self.assertContainsRe(experimental,
2939.2.3 by Ian Clatworthy
add tests for experimental formats including help content checking
167
                ':branch6:\n    \(native\) Experimental successor to knit')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
168
        self.assertContainsRe(deprecated,
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
169
                ':lazy:\n    \(native\) Format registered lazily\n')
1551.13.2 by Aaron Bentley
Hide dirstate-with-subtree format
170
        self.assertNotContainsRe(new, 'hidden')
2204.4.1 by Aaron Bentley
Add 'formats' help topic
171
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
172
    def test_set_default_repository(self):
173
        default_factory = bzrdir.format_registry.get('default')
174
        old_default = [k for k, v in bzrdir.format_registry.iteritems()
175
                       if v == default_factory and k != 'default'][0]
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
176
        bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
177
        try:
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
178
            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
179
                          bzrdir.format_registry.get('default'))
180
            self.assertIs(
5651.3.9 by Jelmer Vernooij
Avoid using deprecated functions.
181
                repository.format_registry.get_default().__class__,
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
182
                knitrepo.RepositoryFormatKnit3)
2204.4.11 by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests
183
        finally:
184
            bzrdir.format_registry.set_default_repository(old_default)
185
3152.2.2 by Robert Collins
The bzrdir format registry now accepts an ``alias`` keyword to
186
    def test_aliases(self):
5363.2.10 by Jelmer Vernooij
base ControlDir on ControlComponent.
187
        a_registry = controldir.ControlDirFormatRegistry()
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
188
        a_registry.register('deprecated', DeprecatedBzrDirFormat,
189
            'Old format.  Slower and does not support stuff',
190
            deprecated=True)
191
        a_registry.register('deprecatedalias', DeprecatedBzrDirFormat,
192
            'Old format.  Slower and does not support stuff',
193
            deprecated=True, alias=True)
194
        self.assertEqual(frozenset(['deprecatedalias']), a_registry.aliases())
3928.3.4 by John Arbash Meinel
SampleBzrDir now needs to return a real repo from open_repository
195
2220.2.25 by Martin Pool
doc
196
1508.1.25 by Robert Collins
Update per review comments.
197
class SampleBranch(bzrlib.branch.Branch):
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
198
    """A dummy branch for guess what, dummy use."""
199
200
    def __init__(self, dir):
201
        self.bzrdir = dir
202
203
3928.3.4 by John Arbash Meinel
SampleBzrDir now needs to return a real repo from open_repository
204
class SampleRepository(bzrlib.repository.Repository):
205
    """A dummy repo."""
206
207
    def __init__(self, dir):
208
        self.bzrdir = dir
209
210
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
211
class SampleBzrDir(bzrdir.BzrDir):
212
    """A sample BzrDir implementation to allow testing static methods."""
213
1841.2.1 by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository().
214
    def create_repository(self, shared=False):
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
215
        """See BzrDir.create_repository."""
216
        return "A repository"
217
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.
218
    def open_repository(self):
219
        """See BzrDir.open_repository."""
3928.3.4 by John Arbash Meinel
SampleBzrDir now needs to return a real repo from open_repository
220
        return SampleRepository(self)
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.
221
5051.3.3 by Jelmer Vernooij
Add tests for colo branches.
222
    def create_branch(self, name=None):
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
223
        """See BzrDir.create_branch."""
5051.3.3 by Jelmer Vernooij
Add tests for colo branches.
224
        if name is not None:
225
            raise NoColocatedBranchSupport(self)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
226
        return SampleBranch(self)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
227
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
228
    def create_workingtree(self):
229
        """See BzrDir.create_workingtree."""
230
        return "A tree"
231
1534.4.40 by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used.
232
1534.4.39 by Robert Collins
Basic BzrDir support.
233
class SampleBzrDirFormat(bzrdir.BzrDirFormat):
234
    """A sample format
235
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
236
    this format is initializable, unsupported to aid in testing the
1534.4.39 by Robert Collins
Basic BzrDir support.
237
    open and open_downlevel routines.
238
    """
239
240
    def get_format_string(self):
241
        """See BzrDirFormat.get_format_string()."""
242
        return "Sample .bzr dir format."
243
2830.1.1 by Ian Clatworthy
bzrdir.py code clean-ups
244
    def initialize_on_transport(self, t):
1534.4.39 by Robert Collins
Basic BzrDir support.
245
        """Create a bzr dir."""
246
        t.mkdir('.bzr')
1955.3.9 by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes
247
        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.
248
        return SampleBzrDir(t, self)
1534.4.39 by Robert Collins
Basic BzrDir support.
249
250
    def is_supported(self):
251
        return False
252
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
253
    def open(self, transport, _found=None):
1534.4.39 by Robert Collins
Basic BzrDir support.
254
        return "opened branch."
255
256
5669.1.2 by Jelmer Vernooij
Review comments from Vincent.
257
class BzrDirFormatTest1(bzrdir.BzrDirMetaFormat1):
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
258
259
    @staticmethod
260
    def get_format_string():
261
        return "Test format 1"
262
263
5669.1.2 by Jelmer Vernooij
Review comments from Vincent.
264
class BzrDirFormatTest2(bzrdir.BzrDirMetaFormat1):
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
265
266
    @staticmethod
267
    def get_format_string():
268
        return "Test format 2"
269
270
1534.4.39 by Robert Collins
Basic BzrDir support.
271
class TestBzrDirFormat(TestCaseWithTransport):
272
    """Tests for the BzrDirFormat facility."""
273
274
    def test_find_format(self):
275
        # is the right format object found for a branch?
276
        # create a branch with a few known format objects.
5712.3.18 by Jelmer Vernooij
Some more test fixes.
277
        bzrdir.BzrProber.formats.register(BzrDirFormatTest1.get_format_string(),
278
            BzrDirFormatTest1())
279
        self.addCleanup(bzrdir.BzrProber.formats.remove,
280
            BzrDirFormatTest1.get_format_string())
281
        bzrdir.BzrProber.formats.register(BzrDirFormatTest2.get_format_string(),
282
            BzrDirFormatTest2())
283
        self.addCleanup(bzrdir.BzrProber.formats.remove,
284
            BzrDirFormatTest2.get_format_string())
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
285
        t = self.get_transport()
1534.4.39 by Robert Collins
Basic BzrDir support.
286
        self.build_tree(["foo/", "bar/"], transport=t)
287
        def check_format(format, url):
288
            format.initialize(url)
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
289
            t = _mod_transport.get_transport_from_path(url)
1534.4.39 by Robert Collins
Basic BzrDir support.
290
            found_format = bzrdir.BzrDirFormat.find_format(t)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
291
            self.assertIsInstance(found_format, format.__class__)
5669.1.2 by Jelmer Vernooij
Review comments from Vincent.
292
        check_format(BzrDirFormatTest1(), "foo")
293
        check_format(BzrDirFormatTest2(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
294
1534.4.39 by Robert Collins
Basic BzrDir support.
295
    def test_find_format_nothing_there(self):
296
        self.assertRaises(NotBranchError,
297
                          bzrdir.BzrDirFormat.find_format,
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
298
                          _mod_transport.get_transport_from_path('.'))
1534.4.39 by Robert Collins
Basic BzrDir support.
299
300
    def test_find_format_unknown_format(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
301
        t = self.get_transport()
1534.4.39 by Robert Collins
Basic BzrDir support.
302
        t.mkdir('.bzr')
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
303
        t.put_bytes('.bzr/branch-format', '')
1534.4.39 by Robert Collins
Basic BzrDir support.
304
        self.assertRaises(UnknownFormatError,
305
                          bzrdir.BzrDirFormat.find_format,
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
306
                          _mod_transport.get_transport_from_path('.'))
1534.4.39 by Robert Collins
Basic BzrDir support.
307
308
    def test_register_unregister_format(self):
309
        format = SampleBzrDirFormat()
310
        url = self.get_url()
311
        # make a bzrdir
312
        format.initialize(url)
313
        # register a format for it.
5712.3.18 by Jelmer Vernooij
Some more test fixes.
314
        bzrdir.BzrProber.formats.register(format.get_format_string(), format)
1534.4.39 by Robert Collins
Basic BzrDir support.
315
        # which bzrdir.Open will refuse (not supported)
316
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open, url)
1596.2.1 by Robert Collins
Fix BzrDir.open_containing of unsupported branches.
317
        # which bzrdir.open_containing will refuse (not supported)
318
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url)
1534.4.39 by Robert Collins
Basic BzrDir support.
319
        # but open_downlevel will work
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
320
        t = _mod_transport.get_transport_from_url(url)
1534.4.39 by Robert Collins
Basic BzrDir support.
321
        self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
322
        # unregister the format
5712.3.18 by Jelmer Vernooij
Some more test fixes.
323
        bzrdir.BzrProber.formats.remove(format.get_format_string())
1534.4.39 by Robert Collins
Basic BzrDir support.
324
        # now open_downlevel should fail too.
325
        self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
326
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.
327
    def test_create_branch_and_repo_uses_default(self):
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
328
        format = SampleBzrDirFormat()
2476.3.10 by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections.
329
        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
330
                                                      format=format)
331
        self.assertTrue(isinstance(branch, SampleBranch))
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
332
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.
333
    def test_create_branch_and_repo_under_shared(self):
334
        # creating a branch and repo in a shared repo uses the
335
        # shared repository
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
336
        format = bzrdir.format_registry.make_bzrdir('knit')
337
        self.make_repository('.', shared=True, format=format)
338
        branch = bzrdir.BzrDir.create_branch_and_repo(
339
            self.get_url('child'), format=format)
340
        self.assertRaises(errors.NoRepositoryPresent,
341
                          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.
342
343
    def test_create_branch_and_repo_under_shared_force_new(self):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
344
        # creating a branch and repo in a shared repo can be forced to
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.
345
        # make a new repo
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
346
        format = bzrdir.format_registry.make_bzrdir('knit')
347
        self.make_repository('.', shared=True, format=format)
348
        branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
349
                                                      force_new_repo=True,
350
                                                      format=format)
351
        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.
352
1534.4.42 by Robert Collins
add working tree to the BzrDir facilities.
353
    def test_create_standalone_working_tree(self):
354
        format = SampleBzrDirFormat()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
355
        # note this is deliberately readonly, as this failure should
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
356
        # occur before any writes.
357
        self.assertRaises(errors.NotLocalUrl,
358
                          bzrdir.BzrDir.create_standalone_workingtree,
359
                          self.get_readonly_url(), format=format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
360
        tree = bzrdir.BzrDir.create_standalone_workingtree('.',
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
361
                                                           format=format)
362
        self.assertEqual('A tree', tree)
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
363
1534.6.10 by Robert Collins
Finish use of repositories support.
364
    def test_create_standalone_working_tree_under_shared_repo(self):
365
        # create standalone working tree always makes a repo.
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
366
        format = bzrdir.format_registry.make_bzrdir('knit')
367
        self.make_repository('.', shared=True, format=format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
368
        # note this is deliberately readonly, as this failure should
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
369
        # occur before any writes.
370
        self.assertRaises(errors.NotLocalUrl,
371
                          bzrdir.BzrDir.create_standalone_workingtree,
372
                          self.get_readonly_url('child'), format=format)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
373
        tree = bzrdir.BzrDir.create_standalone_workingtree('child',
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
374
            format=format)
375
        tree.bzrdir.open_repository()
1534.6.10 by Robert Collins
Finish use of repositories support.
376
377
    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.
378
        # 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
379
        format = bzrdir.format_registry.make_bzrdir('knit')
380
        branch = bzrdir.BzrDir.create_branch_convenience('.', format=format)
381
        branch.bzrdir.open_workingtree()
382
        branch.bzrdir.open_repository()
1534.6.10 by Robert Collins
Finish use of repositories support.
383
2476.3.10 by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections.
384
    def test_create_branch_convenience_possible_transports(self):
385
        """Check that the optional 'possible_transports' is recognized"""
386
        format = bzrdir.format_registry.make_bzrdir('knit')
387
        t = self.get_transport()
388
        branch = bzrdir.BzrDir.create_branch_convenience(
389
            '.', format=format, possible_transports=[t])
390
        branch.bzrdir.open_workingtree()
391
        branch.bzrdir.open_repository()
392
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
393
    def test_create_branch_convenience_root(self):
394
        """Creating a branch at the root of a fs should work."""
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
395
        self.vfs_transport_factory = memory.MemoryServer
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
396
        # 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
397
        format = bzrdir.format_registry.make_bzrdir('knit')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
398
        branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
399
                                                         format=format)
400
        self.assertRaises(errors.NoWorkingTree,
401
                          branch.bzrdir.open_workingtree)
402
        branch.bzrdir.open_repository()
1725.2.5 by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop
403
1534.6.10 by Robert Collins
Finish use of repositories support.
404
    def test_create_branch_convenience_under_shared_repo(self):
405
        # inside a repo the default convenience output is a branch+ follow the
406
        # repo tree policy
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
            format=format)
411
        branch.bzrdir.open_workingtree()
412
        self.assertRaises(errors.NoRepositoryPresent,
413
                          branch.bzrdir.open_repository)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
414
1534.6.10 by Robert Collins
Finish use of repositories support.
415
    def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
416
        # inside a repo the default convenience output is a branch+ follow the
417
        # repo tree policy but we can override that
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
418
        format = bzrdir.format_registry.make_bzrdir('knit')
419
        self.make_repository('.', shared=True, format=format)
420
        branch = bzrdir.BzrDir.create_branch_convenience('child',
421
            force_new_tree=False, format=format)
422
        self.assertRaises(errors.NoWorkingTree,
423
                          branch.bzrdir.open_workingtree)
424
        self.assertRaises(errors.NoRepositoryPresent,
425
                          branch.bzrdir.open_repository)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
426
1534.6.10 by Robert Collins
Finish use of repositories support.
427
    def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
428
        # inside a repo the default convenience output is a branch+ follow the
429
        # repo tree policy
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
430
        format = bzrdir.format_registry.make_bzrdir('knit')
431
        repo = self.make_repository('.', shared=True, format=format)
432
        repo.set_make_working_trees(False)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
433
        branch = bzrdir.BzrDir.create_branch_convenience('child',
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
434
                                                         format=format)
435
        self.assertRaises(errors.NoWorkingTree,
436
                          branch.bzrdir.open_workingtree)
437
        self.assertRaises(errors.NoRepositoryPresent,
438
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
439
440
    def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self):
441
        # inside a repo the default convenience output is a branch+ follow the
442
        # repo tree policy but we can override that
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
443
        format = bzrdir.format_registry.make_bzrdir('knit')
444
        repo = self.make_repository('.', shared=True, format=format)
445
        repo.set_make_working_trees(False)
446
        branch = bzrdir.BzrDir.create_branch_convenience('child',
447
            force_new_tree=True, format=format)
448
        branch.bzrdir.open_workingtree()
449
        self.assertRaises(errors.NoRepositoryPresent,
450
                          branch.bzrdir.open_repository)
1534.6.10 by Robert Collins
Finish use of repositories support.
451
452
    def test_create_branch_convenience_under_shared_repo_force_new_repo(self):
453
        # inside a repo the default convenience output is overridable to give
454
        # repo+branch+tree
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
455
        format = bzrdir.format_registry.make_bzrdir('knit')
456
        self.make_repository('.', shared=True, format=format)
457
        branch = bzrdir.BzrDir.create_branch_convenience('child',
458
            force_new_repo=True, format=format)
459
        branch.bzrdir.open_repository()
460
        branch.bzrdir.open_workingtree()
1534.6.10 by Robert Collins
Finish use of repositories support.
461
3242.2.14 by Aaron Bentley
Update from review comments
462
463
class TestRepositoryAcquisitionPolicy(TestCaseWithTransport):
464
3242.2.10 by Aaron Bentley
Rename RepositoryPolicy.apply to acquire_repository
465
    def test_acquire_repository_standalone(self):
3242.2.14 by Aaron Bentley
Update from review comments
466
        """The default acquisition policy should create a standalone branch."""
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
467
        my_bzrdir = self.make_bzrdir('.')
468
        repo_policy = my_bzrdir.determine_repository_policy()
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
469
        repo, is_new = repo_policy.acquire_repository()
3242.2.1 by Aaron Bentley
Abstract policy decisions into determine_repository_policy
470
        self.assertEqual(repo.bzrdir.root_transport.base,
471
                         my_bzrdir.root_transport.base)
3242.2.14 by Aaron Bentley
Update from review comments
472
        self.assertFalse(repo.is_shared())
473
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
474
    def test_determine_stacking_policy(self):
475
        parent_bzrdir = self.make_bzrdir('.')
476
        child_bzrdir = self.make_bzrdir('child')
3242.3.11 by Aaron Bentley
Clean up BzrDirConfig usage
477
        parent_bzrdir.get_config().set_default_stack_on('http://example.org')
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
478
        repo_policy = child_bzrdir.determine_repository_policy()
479
        self.assertEqual('http://example.org', repo_policy._stack_on)
480
3242.3.27 by Aaron Bentley
Interpret default stacking paths relative to config bzrdir
481
    def test_determine_stacking_policy_relative(self):
482
        parent_bzrdir = self.make_bzrdir('.')
483
        child_bzrdir = self.make_bzrdir('child')
484
        parent_bzrdir.get_config().set_default_stack_on('child2')
485
        repo_policy = child_bzrdir.determine_repository_policy()
3242.3.32 by Aaron Bentley
Defer handling relative stacking URLs as late as possible.
486
        self.assertEqual('child2', repo_policy._stack_on)
487
        self.assertEqual(parent_bzrdir.root_transport.base,
488
                         repo_policy._stack_on_pwd)
3242.3.27 by Aaron Bentley
Interpret default stacking paths relative to config bzrdir
489
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
490
    def prepare_default_stacking(self, child_format='1.6'):
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
491
        parent_bzrdir = self.make_bzrdir('.')
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
492
        child_branch = self.make_branch('child', format=child_format)
3242.5.1 by Jonathan Lange
Allow stacked-on branch locations to be stored as relative URLs.
493
        parent_bzrdir.get_config().set_default_stack_on(child_branch.base)
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
494
        new_child_transport = parent_bzrdir.transport.clone('child2')
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
495
        return child_branch, new_child_transport
496
497
    def test_clone_on_transport_obeys_stacking_policy(self):
498
        child_branch, new_child_transport = self.prepare_default_stacking()
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
499
        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.
500
        self.assertEqual(child_branch.base,
3537.3.5 by Martin Pool
merge trunk including stacking policy
501
                         new_child.open_branch().get_stacked_on_url())
3242.3.5 by Aaron Bentley
Implement stacking for clone_on_transport
502
4126.1.1 by Andrew Bennetts
Fix bug when pushing stackable branch in unstackable repo to default-stacking target.
503
    def test_default_stacking_with_stackable_branch_unstackable_repo(self):
504
        # Make stackable source branch with an unstackable repo format.
505
        source_bzrdir = self.make_bzrdir('source')
5757.1.6 by Jelmer Vernooij
Fix another import.
506
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
507
        source_branch = bzrlib.branch.BzrBranchFormat7().initialize(
508
            source_bzrdir)
4126.1.1 by Andrew Bennetts
Fix bug when pushing stackable branch in unstackable repo to default-stacking target.
509
        # Make a directory with a default stacking policy
510
        parent_bzrdir = self.make_bzrdir('parent')
511
        stacked_on = self.make_branch('parent/stacked-on', format='pack-0.92')
512
        parent_bzrdir.get_config().set_default_stack_on(stacked_on.base)
513
        # Clone source into directory
514
        target = source_bzrdir.clone(self.get_url('parent/target'))
515
6164.2.8 by Jelmer Vernooij
Move ex_stacked_on
516
    def test_format_initialize_on_transport_ex_stacked_on(self):
517
        # trunk is a stackable format.  Note that its in the same server area
518
        # which is what launchpad does, but not sufficient to exercise the
519
        # general case.
520
        trunk = self.make_branch('trunk', format='1.9')
521
        t = self.get_transport('stacked')
522
        old_fmt = bzrdir.format_registry.make_bzrdir('pack-0.92')
523
        repo_name = old_fmt.repository_format.network_name()
524
        # Should end up with a 1.9 format (stackable)
525
        repo, control, require_stacking, repo_policy = \
526
            old_fmt.initialize_on_transport_ex(t,
527
                    repo_format_name=repo_name, stacked_on='../trunk',
528
                    stack_on_pwd=t.base)
529
        if repo is not None:
530
            # Repositories are open write-locked
531
            self.assertTrue(repo.is_write_locked())
532
            self.addCleanup(repo.unlock)
533
        else:
534
            repo = control.open_repository()
535
        self.assertIsInstance(control, bzrdir.BzrDir)
536
        opened = bzrdir.BzrDir.open(t.base)
537
        if not isinstance(old_fmt, remote.RemoteBzrDirFormat):
538
            self.assertEqual(control._format.network_name(),
539
                old_fmt.network_name())
540
            self.assertEqual(control._format.network_name(),
541
                opened._format.network_name())
542
        self.assertEqual(control.__class__, opened.__class__)
543
        self.assertLength(1, repo._fallback_repositories)
544
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
545
    def test_sprout_obeys_stacking_policy(self):
546
        child_branch, new_child_transport = self.prepare_default_stacking()
547
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
548
        self.assertEqual(child_branch.base,
3537.3.5 by Martin Pool
merge trunk including stacking policy
549
                         new_child.open_branch().get_stacked_on_url())
3242.3.28 by Aaron Bentley
Use repository acquisition policy for sprouting
550
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
551
    def test_clone_ignores_policy_for_unsupported_formats(self):
552
        child_branch, new_child_transport = self.prepare_default_stacking(
553
            child_format='pack-0.92')
554
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
555
        self.assertRaises(errors.UnstackableBranchFormat,
556
                          new_child.open_branch().get_stacked_on_url)
557
558
    def test_sprout_ignores_policy_for_unsupported_formats(self):
559
        child_branch, new_child_transport = self.prepare_default_stacking(
560
            child_format='pack-0.92')
561
        new_child = child_branch.bzrdir.sprout(new_child_transport.base)
562
        self.assertRaises(errors.UnstackableBranchFormat,
563
                          new_child.open_branch().get_stacked_on_url)
564
565
    def test_sprout_upgrades_format_if_stacked_specified(self):
566
        child_branch, new_child_transport = self.prepare_default_stacking(
567
            child_format='pack-0.92')
568
        new_child = child_branch.bzrdir.sprout(new_child_transport.base,
569
                                               stacked=True)
570
        self.assertEqual(child_branch.bzrdir.root_transport.base,
571
                         new_child.open_branch().get_stacked_on_url())
3650.3.10 by Aaron Bentley
Ensure that sprout chooses a rich-root format as needed
572
        repo = new_child.open_repository()
573
        self.assertTrue(repo._format.supports_external_lookups)
574
        self.assertFalse(repo.supports_rich_root())
575
3650.5.1 by Aaron Bentley
Fix push to use clone all the time.
576
    def test_clone_on_transport_upgrades_format_if_stacked_on_specified(self):
577
        child_branch, new_child_transport = self.prepare_default_stacking(
578
            child_format='pack-0.92')
579
        new_child = child_branch.bzrdir.clone_on_transport(new_child_transport,
580
            stacked_on=child_branch.bzrdir.root_transport.base)
581
        self.assertEqual(child_branch.bzrdir.root_transport.base,
582
                         new_child.open_branch().get_stacked_on_url())
583
        repo = new_child.open_repository()
584
        self.assertTrue(repo._format.supports_external_lookups)
585
        self.assertFalse(repo.supports_rich_root())
586
3650.3.10 by Aaron Bentley
Ensure that sprout chooses a rich-root format as needed
587
    def test_sprout_upgrades_to_rich_root_format_if_needed(self):
588
        child_branch, new_child_transport = self.prepare_default_stacking(
589
            child_format='rich-root-pack')
3665.2.3 by John Arbash Meinel
Fix a test that was expected to fail.
590
        new_child = child_branch.bzrdir.sprout(new_child_transport.base,
591
                                               stacked=True)
3650.3.10 by Aaron Bentley
Ensure that sprout chooses a rich-root format as needed
592
        repo = new_child.open_repository()
593
        self.assertTrue(repo._format.supports_external_lookups)
594
        self.assertTrue(repo.supports_rich_root())
3650.3.1 by Aaron Bentley
Ensure stacking policy does not cause format upgrades
595
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
596
    def test_add_fallback_repo_handles_absolute_urls(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
597
        stack_on = self.make_branch('stack_on', format='1.6')
598
        repo = self.make_repository('repo', format='1.6')
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
599
        policy = bzrdir.UseExistingRepository(repo, stack_on.base)
600
        policy._add_fallback(repo)
601
602
    def test_add_fallback_repo_handles_relative_urls(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
603
        stack_on = self.make_branch('stack_on', format='1.6')
604
        repo = self.make_repository('repo', format='1.6')
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
605
        policy = bzrdir.UseExistingRepository(repo, '.', stack_on.base)
606
        policy._add_fallback(repo)
607
608
    def test_configure_relative_branch_stacking_url(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
609
        stack_on = self.make_branch('stack_on', format='1.6')
610
        stacked = self.make_branch('stack_on/stacked', format='1.6')
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
611
        policy = bzrdir.UseExistingRepository(stacked.repository,
612
            '.', stack_on.base)
613
        policy.configure_branch(stacked)
3537.3.5 by Martin Pool
merge trunk including stacking policy
614
        self.assertEqual('..', stacked.get_stacked_on_url())
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
615
616
    def test_relative_branch_stacking_to_absolute(self):
3735.1.2 by Robert Collins
Remove 1.5 series dev formats and document development2 a little better.
617
        stack_on = self.make_branch('stack_on', format='1.6')
618
        stacked = self.make_branch('stack_on/stacked', format='1.6')
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
619
        policy = bzrdir.UseExistingRepository(stacked.repository,
620
            '.', self.get_readonly_url('stack_on'))
621
        policy.configure_branch(stacked)
622
        self.assertEqual(self.get_readonly_url('stack_on'),
3537.3.5 by Martin Pool
merge trunk including stacking policy
623
                         stacked.get_stacked_on_url())
3242.3.33 by Aaron Bentley
Handle relative URL stacking cleanly
624
3242.3.4 by Aaron Bentley
Initial determination of stacking policy
625
1534.4.39 by Robert Collins
Basic BzrDir support.
626
class ChrootedTests(TestCaseWithTransport):
627
    """A support class that provides readonly urls outside the local namespace.
628
629
    This is done by checking if self.transport_server is a MemoryServer. if it
630
    is then we are chrooted already, if it is not then an HttpServer is used
631
    for readonly urls.
632
    """
633
634
    def setUp(self):
635
        super(ChrootedTests, self).setUp()
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
636
        if not self.vfs_transport_factory == memory.MemoryServer:
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
637
            self.transport_readonly_server = http_server.HttpServer
1534.4.39 by Robert Collins
Basic BzrDir support.
638
3015.3.45 by Daniel Watkins
Extract common method.
639
    def local_branch_path(self, branch):
640
         return os.path.realpath(urlutils.local_path_from_url(branch.base))
641
1534.4.39 by Robert Collins
Basic BzrDir support.
642
    def test_open_containing(self):
643
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
644
                          self.get_readonly_url(''))
645
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
646
                          self.get_readonly_url('g/p/q'))
647
        control = bzrdir.BzrDir.create(self.get_url())
648
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url(''))
649
        self.assertEqual('', relpath)
650
        branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q'))
651
        self.assertEqual('g/p/q', relpath)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
652
3015.3.46 by Daniel Watkins
Made tests more granular.
653
    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.
654
        self.assertRaises(errors.NotBranchError,
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
655
            bzrdir.BzrDir.open_containing_tree_branch_or_repository,
656
            self.get_readonly_url(''))
657
3015.3.46 by Daniel Watkins
Made tests more granular.
658
    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.
659
        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.
660
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
661
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
662
                'topdir/foo')
663
        self.assertEqual(os.path.realpath('topdir'),
664
                         os.path.realpath(tree.basedir))
665
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
666
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
667
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
668
            osutils.realpath(os.path.join('topdir', '.bzr', 'repository')),
669
            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.
670
        self.assertEqual(relpath, 'foo')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
671
3015.3.46 by Daniel Watkins
Made tests more granular.
672
    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.
673
        self.make_branch('branch')
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
674
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
675
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
676
                'branch/foo')
677
        self.assertEqual(tree, None)
678
        self.assertEqual(os.path.realpath('branch'),
3015.3.45 by Daniel Watkins
Extract common method.
679
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
680
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
681
            osutils.realpath(os.path.join('branch', '.bzr', 'repository')),
682
            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.
683
        self.assertEqual(relpath, 'foo')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
684
3015.3.46 by Daniel Watkins
Made tests more granular.
685
    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.
686
        self.make_repository('repo')
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
687
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
688
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
689
                'repo')
690
        self.assertEqual(tree, None)
691
        self.assertEqual(branch, None)
692
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
693
            osutils.realpath(os.path.join('repo', '.bzr', 'repository')),
694
            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.
695
        self.assertEqual(relpath, '')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
696
3015.3.46 by Daniel Watkins
Made tests more granular.
697
    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.
698
        self.make_repository('shared', shared=True)
699
        bzrdir.BzrDir.create_branch_convenience('shared/branch',
700
                                                force_new_tree=False)
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
701
        tree, branch, repo, relpath = \
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
702
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
703
                'shared/branch')
704
        self.assertEqual(tree, None)
705
        self.assertEqual(os.path.realpath('shared/branch'),
3015.3.45 by Daniel Watkins
Extract common method.
706
                         self.local_branch_path(branch))
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
707
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
708
            osutils.realpath(os.path.join('shared', '.bzr', 'repository')),
709
            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.
710
        self.assertEqual(relpath, '')
3015.3.38 by Daniel Watkins
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
711
3015.3.48 by Daniel Watkins
Further granulated tests.
712
    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.
713
        self.make_branch_and_tree('foo')
3015.3.52 by Daniel Watkins
Replaced use of os functions with use of test suite functions.
714
        self.build_tree(['foo/bar/'])
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
715
        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.
716
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
717
                'foo/bar')
718
        self.assertEqual(os.path.realpath('foo'),
719
                         os.path.realpath(tree.basedir))
720
        self.assertEqual(os.path.realpath('foo'),
3015.3.45 by Daniel Watkins
Extract common method.
721
                         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.
722
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
723
            osutils.realpath(os.path.join('foo', '.bzr', 'repository')),
724
            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.
725
        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.
726
3015.3.48 by Daniel Watkins
Further granulated tests.
727
    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.
728
        self.make_repository('bar')
3015.3.52 by Daniel Watkins
Replaced use of os functions with use of test suite functions.
729
        self.build_tree(['bar/baz/'])
3015.3.57 by Daniel Watkins
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
730
        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.
731
            bzrdir.BzrDir.open_containing_tree_branch_or_repository(
732
                'bar/baz')
733
        self.assertEqual(tree, None)
734
        self.assertEqual(branch, None)
735
        self.assertEqual(
3616.2.12 by Mark Hammond
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
736
            osutils.realpath(os.path.join('bar', '.bzr', 'repository')),
737
            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.
738
        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.
739
1534.6.11 by Robert Collins
Review feedback.
740
    def test_open_containing_from_transport(self):
5609.9.1 by Martin
Blindly change all users of get_transport to address the function via the transport module
741
        self.assertRaises(NotBranchError,
742
            bzrdir.BzrDir.open_containing_from_transport,
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
743
            _mod_transport.get_transport_from_url(self.get_readonly_url('')))
5609.9.1 by Martin
Blindly change all users of get_transport to address the function via the transport module
744
        self.assertRaises(NotBranchError,
745
            bzrdir.BzrDir.open_containing_from_transport,
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
746
            _mod_transport.get_transport_from_url(
747
                self.get_readonly_url('g/p/q')))
1534.6.3 by Robert Collins
find_repository sufficiently robust.
748
        control = bzrdir.BzrDir.create(self.get_url())
1534.6.11 by Robert Collins
Review feedback.
749
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
750
            _mod_transport.get_transport_from_url(
751
                self.get_readonly_url('')))
1534.6.3 by Robert Collins
find_repository sufficiently robust.
752
        self.assertEqual('', relpath)
1534.6.11 by Robert Collins
Review feedback.
753
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
754
            _mod_transport.get_transport_from_url(
755
                self.get_readonly_url('g/p/q')))
1534.6.3 by Robert Collins
find_repository sufficiently robust.
756
        self.assertEqual('g/p/q', relpath)
757
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
758
    def test_open_containing_tree_or_branch(self):
759
        self.make_branch_and_tree('topdir')
760
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
761
            'topdir/foo')
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
762
        self.assertEqual(os.path.realpath('topdir'),
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
763
                         os.path.realpath(tree.basedir))
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
764
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
765
                         self.local_branch_path(branch))
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
766
        self.assertIs(tree.bzrdir, branch.bzrdir)
767
        self.assertEqual('foo', relpath)
2381.1.1 by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's.
768
        # opening from non-local should not return the tree
769
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
770
            self.get_readonly_url('topdir/foo'))
771
        self.assertEqual(None, tree)
772
        self.assertEqual('foo', relpath)
773
        # without a tree:
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
774
        self.make_branch('topdir/foo')
775
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
776
            'topdir/foo')
777
        self.assertIs(tree, None)
2215.3.7 by Aaron Bentley
Remove (new) trailing whitespace
778
        self.assertEqual(os.path.realpath('topdir/foo'),
3015.3.45 by Daniel Watkins
Extract common method.
779
                         self.local_branch_path(branch))
2215.3.2 by Aaron Bentley
Add open_containing_tree_or_branch
780
        self.assertEqual('', relpath)
781
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
782
    def test_open_tree_or_branch(self):
783
        self.make_branch_and_tree('topdir')
784
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir')
785
        self.assertEqual(os.path.realpath('topdir'),
786
                         os.path.realpath(tree.basedir))
787
        self.assertEqual(os.path.realpath('topdir'),
3015.3.45 by Daniel Watkins
Extract common method.
788
                         self.local_branch_path(branch))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
789
        self.assertIs(tree.bzrdir, branch.bzrdir)
790
        # opening from non-local should not return the tree
3123.5.15 by Aaron Bentley
Fix open_tree_or_branch tests
791
        tree, branch = bzrdir.BzrDir.open_tree_or_branch(
792
            self.get_readonly_url('topdir'))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
793
        self.assertEqual(None, tree)
794
        # without a tree:
795
        self.make_branch('topdir/foo')
3123.5.15 by Aaron Bentley
Fix open_tree_or_branch tests
796
        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir/foo')
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
797
        self.assertIs(tree, None)
798
        self.assertEqual(os.path.realpath('topdir/foo'),
3015.3.45 by Daniel Watkins
Extract common method.
799
                         self.local_branch_path(branch))
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
800
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
801
    def test_open_from_transport(self):
802
        # transport pointing at bzrdir should give a bzrdir with root transport
803
        # set to the given transport
804
        control = bzrdir.BzrDir.create(self.get_url())
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
805
        t = self.get_transport()
806
        opened_bzrdir = bzrdir.BzrDir.open_from_transport(t)
807
        self.assertEqual(t.base, opened_bzrdir.root_transport.base)
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
808
        self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
809
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
810
    def test_open_from_transport_no_bzrdir(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
811
        t = self.get_transport()
812
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
813
814
    def test_open_from_transport_bzrdir_in_parent(self):
815
        control = bzrdir.BzrDir.create(self.get_url())
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
816
        t = self.get_transport()
817
        t.mkdir('subdir')
818
        t = t.clone('subdir')
819
        self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, t)
1910.11.5 by Andrew Bennetts
Add tests for BzrDir.open_from_transport.
820
2100.3.28 by Aaron Bentley
Make sprout recursive
821
    def test_sprout_recursive(self):
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
822
        tree = self.make_branch_and_tree('tree1',
823
                                         format='dirstate-with-subtree')
2100.3.28 by Aaron Bentley
Make sprout recursive
824
        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.
825
            format='dirstate-with-subtree')
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
826
        sub_tree.set_root_id('subtree-root')
2100.3.28 by Aaron Bentley
Make sprout recursive
827
        tree.add_reference(sub_tree)
828
        self.build_tree(['tree1/subtree/file'])
829
        sub_tree.add('file')
830
        tree.commit('Initial commit')
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
831
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
832
        tree2.lock_read()
833
        self.addCleanup(tree2.unlock)
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
834
        self.assertPathExists('tree2/subtree/file')
4100.2.4 by Aaron Bentley
More support for not autodetecting tree refs
835
        self.assertEqual('tree-reference', tree2.kind('subtree-root'))
2100.3.28 by Aaron Bentley
Make sprout recursive
836
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
837
    def test_cloning_metadir(self):
838
        """Ensure that cloning metadir is suitable"""
2100.3.34 by Aaron Bentley
Fix BzrDir.cloning_metadir with no format
839
        bzrdir = self.make_bzrdir('bzrdir')
840
        bzrdir.cloning_metadir()
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
841
        branch = self.make_branch('branch', format='knit')
842
        format = branch.bzrdir.cloning_metadir()
843
        self.assertIsInstance(format.workingtree_format,
5816.5.6 by Jelmer Vernooij
Fix default working tree format.
844
            workingtree_4.WorkingTreeFormat6)
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
845
846
    def test_sprout_recursive_treeless(self):
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
847
        tree = self.make_branch_and_tree('tree1',
848
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
849
        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.
850
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
851
        tree.add_reference(sub_tree)
852
        self.build_tree(['tree1/subtree/file'])
853
        sub_tree.add('file')
854
        tree.commit('Initial commit')
5409.1.20 by Vincent Ladeuil
Revert to 'conflict' being the default orphaning policy and fix fallouts.
855
        # The following line force the orhaning to reveal bug #634470
856
        tree.branch.get_config().set_user_option(
5409.1.24 by Vincent Ladeuil
Rename bzrlib.transform.orphan_policy to bzr.transform.orphan_policy.
857
            'bzr.transform.orphan_policy', 'move')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
858
        tree.bzrdir.destroy_workingtree()
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
859
        # FIXME: subtree/.bzr is left here which allows the test to pass (or
860
        # fail :-( ) -- vila 20100909
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
861
        repo = self.make_repository('repo', shared=True,
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
862
            format='dirstate-with-subtree')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
863
        repo.set_make_working_trees(False)
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
864
        # FIXME: we just deleted the workingtree and now we want to use it ????
865
        # At a minimum, we should use tree.branch below (but this fails too
866
        # currently) or stop calling this test 'treeless'. Specifically, I've
867
        # turn the line below into an assertRaises when 'subtree/.bzr' is
868
        # orphaned and sprout tries to access the branch there (which is left
869
        # by bzrdir.BzrDirMeta1.destroy_workingtree when it ignores the
5409.7.2 by Vincent Ladeuil
Add NEWS entry, a missing test and some cleanup.
870
        # [DeletingParent('Not deleting', u'subtree', None)] conflict). See bug
871
        # #634470.  -- vila 20100909
5409.1.7 by Vincent Ladeuil
First orphaning implementation (some tests lacking).
872
        self.assertRaises(errors.NotBranchError,
873
                          tree.bzrdir.sprout, 'repo/tree2')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
874
#        self.assertPathExists('repo/tree2/subtree')
875
#        self.assertPathDoesNotExist('repo/tree2/subtree/file')
2100.3.32 by Aaron Bentley
fix tree format, basis_tree call, in sprout
876
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
877
    def make_foo_bar_baz(self):
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
878
        foo = bzrdir.BzrDir.create_branch_convenience('foo').bzrdir
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
879
        bar = self.make_branch('foo/bar').bzrdir
880
        baz = self.make_branch('baz').bzrdir
881
        return foo, bar, baz
882
883
    def test_find_bzrdirs(self):
884
        foo, bar, baz = self.make_foo_bar_baz()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
885
        t = self.get_transport()
886
        self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_bzrdirs(t))
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
887
5215.3.4 by Marius Kruger
extract make_fake_permission_denied_transport and standardise the assert urls a little
888
    def make_fake_permission_denied_transport(self, transport, paths):
5215.3.9 by Marius Kruger
* Tried to improve code docs and NEWS as per review
889
        """Create a transport that raises PermissionDenied for some paths."""
5215.3.2 by Marius Kruger
* Move TestCaseWithMemoryTransport.make_smart_server => TestCaseWithTransport
890
        def filter(path):
5215.3.4 by Marius Kruger
extract make_fake_permission_denied_transport and standardise the assert urls a little
891
            if path in paths:
5215.3.2 by Marius Kruger
* Move TestCaseWithMemoryTransport.make_smart_server => TestCaseWithTransport
892
                raise errors.PermissionDenied(path)
893
            return path
894
        path_filter_server = pathfilter.PathFilteringServer(transport, filter)
895
        path_filter_server.start_server()
5215.3.9 by Marius Kruger
* Tried to improve code docs and NEWS as per review
896
        self.addCleanup(path_filter_server.stop_server)
5215.3.2 by Marius Kruger
* Move TestCaseWithMemoryTransport.make_smart_server => TestCaseWithTransport
897
        path_filter_transport = pathfilter.PathFilteringTransport(
898
            path_filter_server, '.')
5215.3.4 by Marius Kruger
extract make_fake_permission_denied_transport and standardise the assert urls a little
899
        return (path_filter_server, path_filter_transport)
900
5215.3.10 by Robert Collins
Merge trunk, adjusting NEWS and fixing up the permission denied test to be clearer and more focused.
901
    def assertBranchUrlsEndWith(self, expect_url_suffix, actual_bzrdirs):
902
        """Check that each branch url ends with the given suffix."""
903
        for actual_bzrdir in actual_bzrdirs:
5215.3.5 by Marius Kruger
factor out _assert_branch_urls
904
            self.assertEndsWith(actual_bzrdir.user_url, expect_url_suffix)
5215.3.4 by Marius Kruger
extract make_fake_permission_denied_transport and standardise the assert urls a little
905
906
    def test_find_bzrdirs_permission_denied(self):
907
        foo, bar, baz = self.make_foo_bar_baz()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
908
        t = self.get_transport()
5215.3.10 by Robert Collins
Merge trunk, adjusting NEWS and fixing up the permission denied test to be clearer and more focused.
909
        path_filter_server, path_filter_transport = \
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
910
            self.make_fake_permission_denied_transport(t, ['foo'])
5215.3.5 by Marius Kruger
factor out _assert_branch_urls
911
        # local transport
5215.3.10 by Robert Collins
Merge trunk, adjusting NEWS and fixing up the permission denied test to be clearer and more focused.
912
        self.assertBranchUrlsEndWith('/baz/',
5215.3.9 by Marius Kruger
* Tried to improve code docs and NEWS as per review
913
            bzrdir.BzrDir.find_bzrdirs(path_filter_transport))
5215.3.2 by Marius Kruger
* Move TestCaseWithMemoryTransport.make_smart_server => TestCaseWithTransport
914
        # smart server
915
        smart_transport = self.make_smart_server('.',
916
            backing_server=path_filter_server)
5215.3.10 by Robert Collins
Merge trunk, adjusting NEWS and fixing up the permission denied test to be clearer and more focused.
917
        self.assertBranchUrlsEndWith('/baz/',
5215.3.9 by Marius Kruger
* Tried to improve code docs and NEWS as per review
918
            bzrdir.BzrDir.find_bzrdirs(smart_transport))
5215.4.1 by Marius Kruger
BzrDir.find_branches should not fall over when encountering branches with missing repos
919
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
920
    def test_find_bzrdirs_list_current(self):
921
        def list_current(transport):
922
            return [s for s in transport.list_dir('') if s != 'baz']
923
924
        foo, bar, baz = self.make_foo_bar_baz()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
925
        t = self.get_transport()
926
        self.assertEqualBzrdirs(
927
            [foo, bar],
928
            bzrdir.BzrDir.find_bzrdirs(t, list_current=list_current))
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
929
930
    def test_find_bzrdirs_evaluate(self):
931
        def evaluate(bzrdir):
932
            try:
933
                repo = bzrdir.open_repository()
6083.1.1 by Jelmer Vernooij
Use get_transport_from_{url,path} in more places.
934
            except errors.NoRepositoryPresent:
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
935
                return True, bzrdir.root_transport.base
936
            else:
937
                return False, bzrdir.root_transport.base
938
939
        foo, bar, baz = self.make_foo_bar_baz()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
940
        t = self.get_transport()
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
941
        self.assertEqual([baz.root_transport.base, foo.root_transport.base],
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
942
                         list(bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate)))
3140.1.1 by Aaron Bentley
Implement find_bzrdir functionality
943
944
    def assertEqualBzrdirs(self, first, second):
945
        first = list(first)
946
        second = list(second)
947
        self.assertEqual(len(first), len(second))
948
        for x, y in zip(first, second):
949
            self.assertEqual(x.root_transport.base, y.root_transport.base)
950
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
951
    def test_find_branches(self):
952
        root = self.make_repository('', shared=True)
953
        foo, bar, baz = self.make_foo_bar_baz()
954
        qux = self.make_bzrdir('foo/qux')
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
955
        t = self.get_transport()
956
        branches = bzrdir.BzrDir.find_branches(t)
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
957
        self.assertEqual(baz.root_transport.base, branches[0].base)
958
        self.assertEqual(foo.root_transport.base, branches[1].base)
959
        self.assertEqual(bar.root_transport.base, branches[2].base)
960
961
        # ensure this works without a top-level repo
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
962
        branches = bzrdir.BzrDir.find_branches(t.clone('foo'))
3140.1.3 by Aaron Bentley
Add support for finding branches to BzrDir
963
        self.assertEqual(foo.root_transport.base, branches[0].base)
964
        self.assertEqual(bar.root_transport.base, branches[1].base)
965
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
966
5215.4.4 by Robert Collins
Merge prerequisite branch and tweak test to be more compact and faster.
967
class TestMissingRepoBranchesSkipped(TestCaseWithMemoryTransport):
968
969
    def test_find_bzrdirs_missing_repo(self):
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
970
        t = self.get_transport()
5215.4.4 by Robert Collins
Merge prerequisite branch and tweak test to be more compact and faster.
971
        arepo = self.make_repository('arepo', shared=True)
972
        abranch_url = arepo.user_url + '/abranch'
973
        abranch = bzrdir.BzrDir.create(abranch_url).create_branch()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
974
        t.delete_tree('arepo/.bzr')
5215.4.4 by Robert Collins
Merge prerequisite branch and tweak test to be more compact and faster.
975
        self.assertRaises(errors.NoRepositoryPresent,
976
            branch.Branch.open, abranch_url)
977
        self.make_branch('baz')
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
978
        for actual_bzrdir in bzrdir.BzrDir.find_branches(t):
5215.4.4 by Robert Collins
Merge prerequisite branch and tweak test to be more compact and faster.
979
            self.assertEndsWith(actual_bzrdir.user_url, '/baz/')
980
981
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
982
class TestMeta1DirFormat(TestCaseWithTransport):
983
    """Tests specific to the meta1 dir format."""
984
985
    def test_right_base_dirs(self):
986
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
987
        t = dir.transport
988
        branch_base = t.clone('branch').base
989
        self.assertEqual(branch_base, dir.get_branch_transport(None).base)
990
        self.assertEqual(branch_base,
1508.1.25 by Robert Collins
Update per review comments.
991
                         dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
992
        repository_base = t.clone('repository').base
993
        self.assertEqual(repository_base, dir.get_repository_transport(None).base)
5669.1.2 by Jelmer Vernooij
Review comments from Vincent.
994
        repository_format = repository.format_registry.get_default()
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
995
        self.assertEqual(repository_base,
5669.1.1 by Jelmer Vernooij
Remove some dependencies on weave formats from bt.test_bzrdir.
996
                         dir.get_repository_transport(repository_format).base)
1534.4.47 by Robert Collins
Split out repository into .bzr/repository
997
        checkout_base = t.clone('checkout').base
998
        self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base)
999
        self.assertEqual(checkout_base,
5816.5.4 by Jelmer Vernooij
Merge bzr.dev.
1000
                         dir.get_workingtree_transport(workingtree_3.WorkingTreeFormat3()).base)
1534.5.3 by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.
1001
1553.5.69 by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used.
1002
    def test_meta1dir_uses_lockdir(self):
1003
        """Meta1 format uses a LockDir to guard the whole directory, not a file."""
1004
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
1005
        t = dir.transport
1006
        self.assertIsDirectory('branch-lock', t)
1007
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1008
    def test_comparison(self):
1009
        """Equality and inequality behave properly.
1010
1011
        Metadirs should compare equal iff they have the same repo, branch and
1012
        tree formats.
1013
        """
1014
        mydir = bzrdir.format_registry.make_bzrdir('knit')
1015
        self.assertEqual(mydir, mydir)
1016
        self.assertFalse(mydir != mydir)
1017
        otherdir = bzrdir.format_registry.make_bzrdir('knit')
1018
        self.assertEqual(otherdir, mydir)
1019
        self.assertFalse(otherdir != mydir)
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1020
        otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
2100.3.35 by Aaron Bentley
equality operations on bzrdir
1021
        self.assertNotEqual(otherdir2, mydir)
1022
        self.assertFalse(otherdir2 == mydir)
1023
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1024
    def test_needs_conversion_different_working_tree(self):
1025
        # meta1dirs need an conversion if any element is not the default.
3943.2.5 by Martin Pool
deprecate needs_format_conversion(format=None)
1026
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
1027
        tree = self.make_branch_and_tree('tree', format='knit')
1028
        self.assertTrue(tree.bzrdir.needs_format_conversion(
1029
            new_format))
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1030
4017.2.1 by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
1031
    def test_initialize_on_format_uses_smart_transport(self):
1032
        self.setup_smart_server_with_call_log()
1033
        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
1034
        transport = self.get_transport('target')
1035
        transport.ensure_base()
1036
        self.reset_smart_call_log()
1037
        instance = new_format.initialize_on_transport(transport)
1038
        self.assertIsInstance(instance, remote.RemoteBzrDir)
1039
        rpc_count = len(self.hpss_calls)
1040
        # This figure represent the amount of work to perform this use case. It
1041
        # is entirely ok to reduce this number if a test fails due to rpc_count
1042
        # being too low. If rpc_count increases, more network roundtrips have
1043
        # become necessary for this use case. Please do not adjust this number
1044
        # upwards without agreement from bzr's network support maintainers.
4017.2.2 by Robert Collins
Perform creation of BzrDirMetaFormat1 control directories using an RPC where possible. (Robert Collins)
1045
        self.assertEqual(2, rpc_count)
4017.2.1 by Robert Collins
Add BzrDirFormatMeta1 test for the amount of rpc calls made initializing over the network.
1046
2255.12.1 by Robert Collins
Implement upgrade for working trees.
1047
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.
1048
class NonLocalTests(TestCaseWithTransport):
1049
    """Tests for bzrdir static behaviour on non local paths."""
1050
1051
    def setUp(self):
1052
        super(NonLocalTests, self).setUp()
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
1053
        self.vfs_transport_factory = memory.MemoryServer
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1054
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.
1055
    def test_create_branch_convenience(self):
1056
        # 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
1057
        format = bzrdir.format_registry.make_bzrdir('knit')
1058
        branch = bzrdir.BzrDir.create_branch_convenience(
1059
            self.get_url('foo'), format=format)
1060
        self.assertRaises(errors.NoWorkingTree,
1061
                          branch.bzrdir.open_workingtree)
1062
        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.
1063
1064
    def test_create_branch_convenience_force_tree_not_local_fails(self):
1065
        # 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
1066
        format = bzrdir.format_registry.make_bzrdir('knit')
1067
        self.assertRaises(errors.NotLocalUrl,
1068
            bzrdir.BzrDir.create_branch_convenience,
1069
            self.get_url('foo'),
1070
            force_new_tree=True,
1071
            format=format)
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
1072
        t = self.get_transport()
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1073
        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.
1074
1563.2.38 by Robert Collins
make push preserve tree formats.
1075
    def test_clone(self):
1076
        # clone into a nonlocal path works
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
1077
        format = bzrdir.format_registry.make_bzrdir('knit')
1078
        branch = bzrdir.BzrDir.create_branch_convenience('local',
1079
                                                         format=format)
1563.2.38 by Robert Collins
make push preserve tree formats.
1080
        branch.bzrdir.open_workingtree()
1081
        result = branch.bzrdir.clone(self.get_url('remote'))
1082
        self.assertRaises(errors.NoWorkingTree,
1083
                          result.open_workingtree)
1084
        result.open_branch()
1085
        result.open_repository()
1086
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1087
    def test_checkout_metadir(self):
1088
        # checkout_metadir has reasonable working tree format even when no
1089
        # working tree is present
2255.2.194 by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests.
1090
        self.make_branch('branch-knit2', format='dirstate-with-subtree')
2100.3.21 by Aaron Bentley
Work on checking out by-reference trees
1091
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
1092
        checkout_format = my_bzrdir.checkout_metadir()
1093
        self.assertIsInstance(checkout_format.workingtree_format,
5816.5.7 by Jelmer Vernooij
Fix more imports.
1094
                              workingtree_4.WorkingTreeFormat4)
2100.3.22 by Aaron Bentley
merge from bzr.dev
1095
2215.3.5 by Aaron Bentley
Add support for remote ls
1096
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1097
class TestHTTPRedirections(object):
1098
    """Test redirection between two http servers.
2164.2.16 by Vincent Ladeuil
Add tests.
1099
1100
    This MUST be used by daughter classes that also inherit from
1101
    TestCaseWithTwoWebservers.
1102
1103
    We can't inherit directly from TestCaseWithTwoWebservers or the
1104
    test framework will try to create an instance which cannot
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1105
    run, its implementation being incomplete.
2164.2.16 by Vincent Ladeuil
Add tests.
1106
    """
1107
1108
    def create_transport_readonly_server(self):
5273.1.4 by Vincent Ladeuil
The default http protocol version wasn't properly defined and as such not respected by some parametrized tests.
1109
        # We don't set the http protocol version, relying on the default
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1110
        return http_utils.HTTPServerRedirecting()
2164.2.16 by Vincent Ladeuil
Add tests.
1111
1112
    def create_transport_secondary_server(self):
5273.1.4 by Vincent Ladeuil
The default http protocol version wasn't properly defined and as such not respected by some parametrized tests.
1113
        # We don't set the http protocol version, relying on the default
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1114
        return http_utils.HTTPServerRedirecting()
2164.2.16 by Vincent Ladeuil
Add tests.
1115
1116
    def setUp(self):
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1117
        super(TestHTTPRedirections, self).setUp()
2164.2.16 by Vincent Ladeuil
Add tests.
1118
        # The redirections will point to the new server
1119
        self.new_server = self.get_readonly_server()
1120
        # The requests to the old server will be redirected
1121
        self.old_server = self.get_secondary_server()
1122
        # Configure the redirections
1123
        self.old_server.redirect_to(self.new_server.host, self.new_server.port)
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1124
1125
    def test_loop(self):
1126
        # Both servers redirect to each other creating a loop
2164.2.16 by Vincent Ladeuil
Add tests.
1127
        self.new_server.redirect_to(self.old_server.host, self.old_server.port)
1128
        # Starting from either server should loop
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1129
        old_url = self._qualified_url(self.old_server.host,
2164.2.16 by Vincent Ladeuil
Add tests.
1130
                                      self.old_server.port)
1131
        oldt = self._transport(old_url)
1132
        self.assertRaises(errors.NotBranchError,
1133
                          bzrdir.BzrDir.open_from_transport, oldt)
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1134
        new_url = self._qualified_url(self.new_server.host,
2164.2.16 by Vincent Ladeuil
Add tests.
1135
                                      self.new_server.port)
1136
        newt = self._transport(new_url)
1137
        self.assertRaises(errors.NotBranchError,
1138
                          bzrdir.BzrDir.open_from_transport, newt)
1139
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1140
    def test_qualifier_preserved(self):
1141
        wt = self.make_branch_and_tree('branch')
1142
        old_url = self._qualified_url(self.old_server.host,
1143
                                      self.old_server.port)
1144
        start = self._transport(old_url).clone('branch')
1145
        bdir = bzrdir.BzrDir.open_from_transport(start)
1146
        # Redirection should preserve the qualifier, hence the transport class
1147
        # itself.
1148
        self.assertIsInstance(bdir.root_transport, type(start))
1149
1150
1151
class TestHTTPRedirections_urllib(TestHTTPRedirections,
1152
                                  http_utils.TestCaseWithTwoWebservers):
2164.2.16 by Vincent Ladeuil
Add tests.
1153
    """Tests redirections for urllib implementation"""
1154
1155
    _transport = HttpTransport_urllib
1156
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1157
    def _qualified_url(self, host, port):
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
1158
        result = 'http+urllib://%s:%s' % (host, port)
1159
        self.permit_url(result)
1160
        return result
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1161
2164.2.16 by Vincent Ladeuil
Add tests.
1162
1163
1164
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl,
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1165
                                  TestHTTPRedirections,
1166
                                  http_utils.TestCaseWithTwoWebservers):
2164.2.16 by Vincent Ladeuil
Add tests.
1167
    """Tests redirections for pycurl implementation"""
1168
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1169
    def _qualified_url(self, host, port):
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
1170
        result = 'http+pycurl://%s:%s' % (host, port)
1171
        self.permit_url(result)
1172
        return result
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1173
1174
1175
class TestHTTPRedirections_nosmart(TestHTTPRedirections,
1176
                                  http_utils.TestCaseWithTwoWebservers):
1177
    """Tests redirections for the nosmart decorator"""
1178
1179
    _transport = NoSmartTransportDecorator
1180
1181
    def _qualified_url(self, host, port):
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
1182
        result = 'nosmart+http://%s:%s' % (host, port)
1183
        self.permit_url(result)
1184
        return result
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1185
1186
1187
class TestHTTPRedirections_readonly(TestHTTPRedirections,
1188
                                    http_utils.TestCaseWithTwoWebservers):
1189
    """Tests redirections for readonly decoratror"""
1190
1191
    _transport = ReadonlyTransportDecorator
1192
1193
    def _qualified_url(self, host, port):
4691.2.1 by Robert Collins
Add stronger test isolation by interception BzrDir.open and checking the thing being opened is known to the test suite.
1194
        result = 'readonly+http://%s:%s' % (host, port)
1195
        self.permit_url(result)
1196
        return result
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1197
1198
1199
class TestDotBzrHidden(TestCaseWithTransport):
1200
3023.1.3 by Alexander Belchenko
John's review
1201
    ls = ['ls']
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1202
    if sys.platform == 'win32':
3023.1.3 by Alexander Belchenko
John's review
1203
        ls = [os.environ['COMSPEC'], '/C', 'dir', '/B']
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1204
1205
    def get_ls(self):
3023.1.3 by Alexander Belchenko
John's review
1206
        f = subprocess.Popen(self.ls, stdout=subprocess.PIPE,
1207
            stderr=subprocess.PIPE)
1208
        out, err = f.communicate()
1209
        self.assertEqual(0, f.returncode, 'Calling %s failed: %s'
1210
                         % (self.ls, err))
1211
        return out.splitlines()
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1212
1213
    def test_dot_bzr_hidden(self):
3023.1.2 by Alexander Belchenko
Martin's review.
1214
        if sys.platform == 'win32' and not win32utils.has_win32file:
1215
            raise TestSkipped('unable to make file hidden without pywin32 library')
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1216
        b = bzrdir.BzrDir.create('.')
3044.1.1 by Martin Pool
Fix up calls to TestCase.build_tree passing a string rather than a list
1217
        self.build_tree(['a'])
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1218
        self.assertEquals(['a'], self.get_ls())
1219
1220
    def test_dot_bzr_hidden_with_url(self):
3023.1.2 by Alexander Belchenko
Martin's review.
1221
        if sys.platform == 'win32' and not win32utils.has_win32file:
1222
            raise TestSkipped('unable to make file hidden without pywin32 library')
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1223
        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
1224
        self.build_tree(['a'])
3023.1.1 by Alexander Belchenko
Mark .bzr directories as "hidden" on Windows (#71147)
1225
        self.assertEquals(['a'], self.get_ls())
3583.1.2 by Andrew Bennetts
Add test for fix.
1226
1227
1228
class _TestBzrDirFormat(bzrdir.BzrDirMetaFormat1):
1229
    """Test BzrDirFormat implementation for TestBzrDirSprout."""
1230
1231
    def _open(self, transport):
1232
        return _TestBzrDir(transport, self)
1233
1234
1235
class _TestBzrDir(bzrdir.BzrDirMeta1):
1236
    """Test BzrDir implementation for TestBzrDirSprout.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1237
3583.1.2 by Andrew Bennetts
Add test for fix.
1238
    When created a _TestBzrDir already has repository and a branch.  The branch
1239
    is a test double as well.
1240
    """
1241
1242
    def __init__(self, *args, **kwargs):
1243
        super(_TestBzrDir, self).__init__(*args, **kwargs)
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
1244
        self.test_branch = _TestBranch(self.transport)
3583.1.2 by Andrew Bennetts
Add test for fix.
1245
        self.test_branch.repository = self.create_repository()
1246
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
1247
    def open_branch(self, unsupported=False, possible_transports=None):
3583.1.2 by Andrew Bennetts
Add test for fix.
1248
        return self.test_branch
1249
3650.3.13 by Aaron Bentley
Make cloning_metadir handle stacking requirements
1250
    def cloning_metadir(self, require_stacking=False):
3583.1.2 by Andrew Bennetts
Add test for fix.
1251
        return _TestBzrDirFormat()
1252
1253
4086.1.3 by Andrew Bennetts
Fix bzrlib.tests.test_bzrdir.
1254
class _TestBranchFormat(bzrlib.branch.BranchFormat):
1255
    """Test Branch format for TestBzrDirSprout."""
1256
1257
3583.1.2 by Andrew Bennetts
Add test for fix.
1258
class _TestBranch(bzrlib.branch.Branch):
1259
    """Test Branch implementation for TestBzrDirSprout."""
1260
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
1261
    def __init__(self, transport, *args, **kwargs):
4086.1.3 by Andrew Bennetts
Fix bzrlib.tests.test_bzrdir.
1262
        self._format = _TestBranchFormat()
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
1263
        self._transport = transport
1264
        self.base = transport.base
3583.1.2 by Andrew Bennetts
Add test for fix.
1265
        super(_TestBranch, self).__init__(*args, **kwargs)
1266
        self.calls = []
3650.3.7 by Aaron Bentley
Fix test
1267
        self._parent = None
1268
3583.1.2 by Andrew Bennetts
Add test for fix.
1269
    def sprout(self, *args, **kwargs):
1270
        self.calls.append('sprout')
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
1271
        return _TestBranch(self._transport)
3583.1.2 by Andrew Bennetts
Add test for fix.
1272
3650.3.4 by Aaron Bentley
Update test to permit calling copy_content_into
1273
    def copy_content_into(self, destination, revision_id=None):
1274
        self.calls.append('copy_content_into')
1275
5535.4.15 by Andrew Bennetts
Fix a test failure.
1276
    def last_revision(self):
1277
        return _mod_revision.NULL_REVISION
1278
3650.3.7 by Aaron Bentley
Fix test
1279
    def get_parent(self):
1280
        return self._parent
1281
6015.15.7 by John Arbash Meinel
Fix the 11 tests that still failed.
1282
    def _get_config(self):
1283
        return config.TransportConfig(self._transport, 'branch.conf')
1284
3650.3.7 by Aaron Bentley
Fix test
1285
    def set_parent(self, parent):
1286
        self._parent = parent
1287
5535.3.9 by Andrew Bennetts
Fix test failures.
1288
    def lock_read(self):
1289
        return lock.LogicalLockResult(self.unlock)
1290
1291
    def unlock(self):
1292
        return
1293
3583.1.2 by Andrew Bennetts
Add test for fix.
1294
1295
class TestBzrDirSprout(TestCaseWithMemoryTransport):
1296
1297
    def test_sprout_uses_branch_sprout(self):
1298
        """BzrDir.sprout calls Branch.sprout.
1299
1300
        Usually, BzrDir.sprout should delegate to the branch's sprout method
1301
        for part of the work.  This allows the source branch to control the
1302
        choice of format for the new branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1303
3583.1.2 by Andrew Bennetts
Add test for fix.
1304
        There are exceptions, but this tests avoids them:
1305
          - if there's no branch in the source bzrdir,
1306
          - or if the stacking has been requested and the format needs to be
1307
            overridden to satisfy that.
1308
        """
1309
        # Make an instrumented bzrdir.
1310
        t = self.get_transport('source')
1311
        t.ensure_base()
1312
        source_bzrdir = _TestBzrDirFormat().initialize_on_transport(t)
1313
        # The instrumented bzrdir has a test_branch attribute that logs calls
1314
        # made to the branch contained in that bzrdir.  Initially the test
1315
        # branch exists but no calls have been made to it.
1316
        self.assertEqual([], source_bzrdir.test_branch.calls)
1317
1318
        # Sprout the bzrdir
1319
        target_url = self.get_url('target')
1320
        result = source_bzrdir.sprout(target_url, recurse='no')
1321
1322
        # The bzrdir called the branch's sprout method.
3650.3.4 by Aaron Bentley
Update test to permit calling copy_content_into
1323
        self.assertSubset(['sprout'], source_bzrdir.test_branch.calls)
3650.3.5 by Aaron Bentley
Fix parent location when copying content
1324
1325
    def test_sprout_parent(self):
1326
        grandparent_tree = self.make_branch('grandparent')
1327
        parent = grandparent_tree.bzrdir.sprout('parent').open_branch()
1328
        branch_tree = parent.bzrdir.sprout('branch').open_branch()
1329
        self.assertContainsRe(branch_tree.get_parent(), '/parent/$')
4160.1.1 by Robert Collins
Add a BzrDir.pre_open hook for use by the smart server gaol.
1330
1331
1332
class TestBzrDirHooks(TestCaseWithMemoryTransport):
1333
1334
    def test_pre_open_called(self):
1335
        calls = []
1336
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', calls.append, None)
1337
        transport = self.get_transport('foo')
1338
        url = transport.base
1339
        self.assertRaises(errors.NotBranchError, bzrdir.BzrDir.open, url)
1340
        self.assertEqual([transport.base], [t.base for t in calls])
1341
1342
    def test_pre_open_actual_exceptions_raised(self):
1343
        count = [0]
1344
        def fail_once(transport):
1345
            count[0] += 1
1346
            if count[0] == 1:
1347
                raise errors.BzrError("fail")
1348
        bzrdir.BzrDir.hooks.install_named_hook('pre_open', fail_once, None)
1349
        transport = self.get_transport('foo')
1350
        url = transport.base
1351
        err = self.assertRaises(errors.BzrError, bzrdir.BzrDir.open, url)
1352
        self.assertEqual('fail', err._preformatted_string)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1353
1354
    def test_post_repo_init(self):
6207.3.8 by Jelmer Vernooij
Fix a bunch of tests.
1355
        from bzrlib.controldir import RepoInitHookParams
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1356
        calls = []
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
1357
        bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
1358
            calls.append, None)
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
1359
        self.make_repository('foo')
1360
        self.assertLength(1, calls)
1361
        params = calls[0]
1362
        self.assertIsInstance(params, RepoInitHookParams)
1363
        self.assertTrue(hasattr(params, 'bzrdir'))
1364
        self.assertTrue(hasattr(params, 'repository'))
5050.21.3 by Andrew Bennetts
Add a test for RepoInitHookParams.__repr__ too.
1365
1366
    def test_post_repo_init_hook_repr(self):
1367
        param_reprs = []
1368
        bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
1369
            lambda params: param_reprs.append(repr(params)), None)
1370
        self.make_repository('foo')
1371
        self.assertLength(1, param_reprs)
1372
        param_repr = param_reprs[0]
1373
        self.assertStartsWith(param_repr, '<RepoInitHookParams for ')
1374
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
1375
1376
class TestGenerateBackupName(TestCaseWithMemoryTransport):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
1377
    # FIXME: This may need to be unified with test_osutils.TestBackupNames or
1378
    # moved to per_bzrdir or per_transport for better coverage ?
1379
    # -- vila 20100909
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
1380
1381
    def setUp(self):
1382
        super(TestGenerateBackupName, self).setUp()
5609.9.4 by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible.
1383
        self._transport = self.get_transport()
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
1384
        bzrdir.BzrDir.create(self.get_url(),
1385
            possible_transports=[self._transport])
1386
        self._bzrdir = bzrdir.BzrDir.open_from_transport(self._transport)
1387
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
1388
    def test_deprecated_generate_backup_name(self):
1389
        res = self.applyDeprecated(
1390
                symbol_versioning.deprecated_in((2, 3, 0)),
1391
                self._bzrdir.generate_backup_name, 'whatever')
1392
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
1393
    def test_new(self):
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
1394
        self.assertEqual("a.~1~", self._bzrdir._available_backup_name("a"))
5340.8.4 by Marius Kruger
* gen_backup_name => generate_backup_name
1395
1396
    def test_exiting(self):
1397
        self._transport.put_bytes("a.~1~", "some content")
5409.5.4 by Vincent Ladeuil
Deprecate BzrDir.generate_backup_name and use osutils.available_backup_name.
1398
        self.assertEqual("a.~2~", self._bzrdir._available_backup_name("a"))
5669.3.8 by Jelmer Vernooij
Refactor, move to bzrlib.controldir.
1399
6083.2.11 by Jelmer Vernooij
Add development-colo format.
1400
1401
class TestMeta1DirColoFormat(TestCaseWithTransport):
1402
    """Tests specific to the meta1 dir with colocated branches format."""
1403
1404
    def test_supports_colo(self):
1405
        format = bzrdir.BzrDirMetaFormat1Colo()
1406
        self.assertTrue(format.colocated_branches)
6207.1.1 by Jelmer Vernooij
Support upgrading between 2a and development-colo.
1407
1408
    def test_upgrade_from_2a(self):
1409
        tree = self.make_branch_and_tree('.', format='2a')
1410
        format = bzrdir.BzrDirMetaFormat1Colo()
1411
        self.assertTrue(tree.bzrdir.needs_format_conversion(format))
1412
        converter = tree.bzrdir._format.get_converter(format)
1413
        result = converter.convert(tree.bzrdir, None)
1414
        self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1Colo)
1415
        self.assertFalse(result.needs_format_conversion(format))
1416
1417
    def test_downgrade_to_2a(self):
1418
        tree = self.make_branch_and_tree('.', format='development-colo')
1419
        format = bzrdir.BzrDirMetaFormat1()
1420
        self.assertTrue(tree.bzrdir.needs_format_conversion(format))
1421
        converter = tree.bzrdir._format.get_converter(format)
1422
        result = converter.convert(tree.bzrdir, None)
1423
        self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)
1424
        self.assertFalse(result.needs_format_conversion(format))
1425
1426
    def test_downgrade_to_2a_too_many_branches(self):
1427
        tree = self.make_branch_and_tree('.', format='development-colo')
1428
        tree.bzrdir.create_branch(name="another-colocated-branch")
1429
        converter = tree.bzrdir._format.get_converter(
1430
            bzrdir.BzrDirMetaFormat1())
1431
        self.assertRaises(errors.BzrError, converter.convert, tree.bzrdir,
1432
            None)
6239.1.1 by Jelmer Vernooij
Create lock directories in .bzr/, not .
1433