/brz/remove-bazaar

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