/brz/remove-bazaar

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