2389.1.1
by Martin Pool
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, |
1 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1553.5.68
by Martin Pool
Add new TestCaseWithTransport.assertIsDirectory() and tests |
2 |
#
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
3 |
# This program is free software; you can redistribute it and/or modify
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
7 |
#
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
8 |
# This program is distributed in the hope that it will be useful,
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
2052.3.1
by John Arbash Meinel
Add tests to cleanup the copyright of all source files |
12 |
#
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
13 |
# You should have received a copy of the GNU General Public License
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Tests for the BzrDir facility and any format specific tests.
|
|
18 |
||
19 |
For interface contract tests, see tests/bzr_dir_implementations.
|
|
20 |
"""
|
|
21 |
||
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
22 |
import os.path |
1534.4.39
by Robert Collins
Basic BzrDir support. |
23 |
from StringIO import StringIO |
24 |
||
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
25 |
from bzrlib import ( |
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
26 |
bzrdir, |
27 |
errors, |
|
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
28 |
help_topics, |
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
29 |
repository, |
2204.4.12
by Aaron Bentley
Deprecate bzrdir.BzrDirFormat.set_default_format |
30 |
symbol_versioning, |
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
31 |
urlutils, |
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
32 |
workingtree, |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
33 |
)
|
1508.1.25
by Robert Collins
Update per review comments. |
34 |
import bzrlib.branch |
1534.4.39
by Robert Collins
Basic BzrDir support. |
35 |
from bzrlib.errors import (NotBranchError, |
36 |
UnknownFormatError, |
|
37 |
UnsupportedFormatError, |
|
38 |
)
|
|
2164.2.16
by Vincent Ladeuil
Add tests. |
39 |
from bzrlib.tests import ( |
40 |
TestCase, |
|
41 |
TestCaseWithTransport, |
|
42 |
test_sftp_transport
|
|
43 |
)
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
44 |
from bzrlib.tests.HttpServer import HttpServer |
2164.2.16
by Vincent Ladeuil
Add tests. |
45 |
from bzrlib.tests.HTTPTestUtil import ( |
46 |
TestCaseWithTwoWebservers, |
|
47 |
HTTPServerRedirecting, |
|
48 |
)
|
|
49 |
from bzrlib.tests.test_http import TestWithTransport_pycurl |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
50 |
from bzrlib.transport import get_transport |
2164.2.16
by Vincent Ladeuil
Add tests. |
51 |
from bzrlib.transport.http._urllib import HttpTransport_urllib |
1534.4.39
by Robert Collins
Basic BzrDir support. |
52 |
from bzrlib.transport.memory import MemoryServer |
2241.1.5
by Martin Pool
Move KnitFormat2 into repofmt |
53 |
from bzrlib.repofmt import knitrepo, weaverepo |
1534.4.39
by Robert Collins
Basic BzrDir support. |
54 |
|
55 |
||
56 |
class TestDefaultFormat(TestCase): |
|
57 |
||
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
58 |
def test_get_set_default_format(self): |
1534.4.39
by Robert Collins
Basic BzrDir support. |
59 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
60 |
# default is BzrDirFormat6
|
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
61 |
self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1)) |
2204.4.12
by Aaron Bentley
Deprecate bzrdir.BzrDirFormat.set_default_format |
62 |
self.applyDeprecated(symbol_versioning.zero_fourteen, |
63 |
bzrdir.BzrDirFormat.set_default_format, |
|
64 |
SampleBzrDirFormat()) |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
65 |
# creating a bzr dir should now create an instrumented dir.
|
66 |
try: |
|
1685.1.42
by John Arbash Meinel
A couple more fixes to make sure memory:/// works correctly. |
67 |
result = bzrdir.BzrDir.create('memory:///') |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
68 |
self.failUnless(isinstance(result, SampleBzrDir)) |
1534.4.39
by Robert Collins
Basic BzrDir support. |
69 |
finally: |
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
70 |
self.applyDeprecated(symbol_versioning.zero_fourteen, |
71 |
bzrdir.BzrDirFormat.set_default_format, old_format) |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
72 |
self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format()) |
73 |
||
74 |
||
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
75 |
class TestFormatRegistry(TestCase): |
76 |
||
77 |
def make_format_registry(self): |
|
78 |
my_format_registry = bzrdir.BzrDirFormatRegistry() |
|
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
79 |
my_format_registry.register('weave', bzrdir.BzrDirFormat6, |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
80 |
'Pre-0.8 format. Slower and does not support checkouts or shared'
|
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
81 |
' repositories', deprecated=True) |
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
82 |
my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir', |
83 |
'BzrDirFormat6', 'Format registered lazily', deprecated=True) |
|
2241.1.21
by Martin Pool
Change register_metadir to take fully-qualified repository class name. |
84 |
my_format_registry.register_metadir('knit', |
85 |
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1', |
|
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
86 |
'Format using knits', |
2241.1.21
by Martin Pool
Change register_metadir to take fully-qualified repository class name. |
87 |
)
|
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
88 |
my_format_registry.set_default('knit') |
2241.1.21
by Martin Pool
Change register_metadir to take fully-qualified repository class name. |
89 |
my_format_registry.register_metadir( |
2230.3.53
by Aaron Bentley
Merge bzr.dev |
90 |
'branch6', |
2255.2.211
by Robert Collins
Remove knit2 repository format- it has never been supported. |
91 |
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3', |
2230.3.53
by Aaron Bentley
Merge bzr.dev |
92 |
'Experimental successor to knit. Use at your own risk.', |
2255.2.158
by Martin Pool
Most of the integration of dirstate and subtree |
93 |
branch_format='bzrlib.branch.BzrBranchFormat6') |
1551.13.2
by Aaron Bentley
Hide dirstate-with-subtree format |
94 |
my_format_registry.register_metadir( |
95 |
'hidden format', |
|
96 |
'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3', |
|
97 |
'Experimental successor to knit. Use at your own risk.', |
|
98 |
branch_format='bzrlib.branch.BzrBranchFormat6', hidden=True) |
|
99 |
my_format_registry.register('hiddenweave', bzrdir.BzrDirFormat6, |
|
100 |
'Pre-0.8 format. Slower and does not support checkouts or shared'
|
|
101 |
' repositories', hidden=True) |
|
102 |
my_format_registry.register_lazy('hiddenlazy', 'bzrlib.bzrdir', |
|
103 |
'BzrDirFormat6', 'Format registered lazily', deprecated=True, |
|
104 |
hidden=True) |
|
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
105 |
return my_format_registry |
106 |
||
107 |
def test_format_registry(self): |
|
108 |
my_format_registry = self.make_format_registry() |
|
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
109 |
my_bzrdir = my_format_registry.make_bzrdir('lazy') |
110 |
self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6) |
|
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
111 |
my_bzrdir = my_format_registry.make_bzrdir('weave') |
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
112 |
self.assertIsInstance(my_bzrdir, bzrdir.BzrDirFormat6) |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
113 |
my_bzrdir = my_format_registry.make_bzrdir('default') |
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
114 |
self.assertIsInstance(my_bzrdir.repository_format, |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
115 |
knitrepo.RepositoryFormatKnit1) |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
116 |
my_bzrdir = my_format_registry.make_bzrdir('knit') |
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
117 |
self.assertIsInstance(my_bzrdir.repository_format, |
2241.1.6
by Martin Pool
Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and |
118 |
knitrepo.RepositoryFormatKnit1) |
2230.3.1
by Aaron Bentley
Get branch6 creation working |
119 |
my_bzrdir = my_format_registry.make_bzrdir('branch6') |
2230.3.55
by Aaron Bentley
Updates from review |
120 |
self.assertIsInstance(my_bzrdir.get_branch_format(), |
2230.3.1
by Aaron Bentley
Get branch6 creation working |
121 |
bzrlib.branch.BzrBranchFormat6) |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
122 |
|
123 |
def test_get_help(self): |
|
124 |
my_format_registry = self.make_format_registry() |
|
2204.4.7
by Aaron Bentley
restore register_lazy, remove register_factory, other updates |
125 |
self.assertEqual('Format registered lazily', |
126 |
my_format_registry.get_help('lazy')) |
|
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
127 |
self.assertEqual('Format using knits', |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
128 |
my_format_registry.get_help('knit')) |
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
129 |
self.assertEqual('Format using knits', |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
130 |
my_format_registry.get_help('default')) |
131 |
self.assertEqual('Pre-0.8 format. Slower and does not support' |
|
132 |
' checkouts or shared repositories', |
|
133 |
my_format_registry.get_help('weave')) |
|
134 |
||
135 |
def test_help_topic(self): |
|
136 |
topics = help_topics.HelpTopicRegistry() |
|
137 |
topics.register('formats', self.make_format_registry().help_topic, |
|
138 |
'Directory formats') |
|
139 |
topic = topics.get_detail('formats') |
|
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
140 |
new, deprecated = topic.split('Deprecated formats') |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
141 |
self.assertContainsRe(new, 'These formats can be used') |
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
142 |
self.assertContainsRe(new, |
2666.1.8
by Ian Clatworthy
Fix storage formats help test |
143 |
':knit:\n \(native\) \(default\) Format using knits\n') |
2204.4.4
by Aaron Bentley
Use BzrDirFormatInfo to distinguish native and deprecated formats |
144 |
self.assertContainsRe(deprecated, |
2666.1.1
by Ian Clatworthy
Bazaar User Reference generated from online help |
145 |
':lazy:\n \(native\) Format registered lazily\n') |
1551.13.2
by Aaron Bentley
Hide dirstate-with-subtree format |
146 |
self.assertNotContainsRe(new, 'hidden') |
2204.4.1
by Aaron Bentley
Add 'formats' help topic |
147 |
|
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
148 |
def test_set_default_repository(self): |
149 |
default_factory = bzrdir.format_registry.get('default') |
|
150 |
old_default = [k for k, v in bzrdir.format_registry.iteritems() |
|
151 |
if v == default_factory and k != 'default'][0] |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
152 |
bzrdir.format_registry.set_default_repository('dirstate-with-subtree') |
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
153 |
try: |
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
154 |
self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'), |
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
155 |
bzrdir.format_registry.get('default')) |
156 |
self.assertIs( |
|
157 |
repository.RepositoryFormat.get_default_format().__class__, |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
158 |
knitrepo.RepositoryFormatKnit3) |
2204.4.11
by Aaron Bentley
deprecate Repository.set_default_format, update upgrade tests |
159 |
finally: |
160 |
bzrdir.format_registry.set_default_repository(old_default) |
|
161 |
||
2220.2.25
by Martin Pool
doc |
162 |
|
1508.1.25
by Robert Collins
Update per review comments. |
163 |
class SampleBranch(bzrlib.branch.Branch): |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
164 |
"""A dummy branch for guess what, dummy use."""
|
165 |
||
166 |
def __init__(self, dir): |
|
167 |
self.bzrdir = dir |
|
168 |
||
169 |
||
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
170 |
class SampleBzrDir(bzrdir.BzrDir): |
171 |
"""A sample BzrDir implementation to allow testing static methods."""
|
|
172 |
||
1841.2.1
by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository(). |
173 |
def create_repository(self, shared=False): |
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
174 |
"""See BzrDir.create_repository."""
|
175 |
return "A repository" |
|
176 |
||
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. |
177 |
def open_repository(self): |
178 |
"""See BzrDir.open_repository."""
|
|
179 |
return "A repository" |
|
180 |
||
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
181 |
def create_branch(self): |
182 |
"""See BzrDir.create_branch."""
|
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
183 |
return SampleBranch(self) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
184 |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
185 |
def create_workingtree(self): |
186 |
"""See BzrDir.create_workingtree."""
|
|
187 |
return "A tree" |
|
188 |
||
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
189 |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
190 |
class SampleBzrDirFormat(bzrdir.BzrDirFormat): |
191 |
"""A sample format
|
|
192 |
||
193 |
this format is initializable, unsupported to aid in testing the
|
|
194 |
open and open_downlevel routines.
|
|
195 |
"""
|
|
196 |
||
197 |
def get_format_string(self): |
|
198 |
"""See BzrDirFormat.get_format_string()."""
|
|
199 |
return "Sample .bzr dir format." |
|
200 |
||
2476.3.8
by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check |
201 |
def initialize(self, url, possible_transports=None): |
1534.4.39
by Robert Collins
Basic BzrDir support. |
202 |
"""Create a bzr dir."""
|
2476.3.8
by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check |
203 |
t = get_transport(url, possible_transports) |
1534.4.39
by Robert Collins
Basic BzrDir support. |
204 |
t.mkdir('.bzr') |
1955.3.9
by John Arbash Meinel
Find more occurrances of put() and replace with put_file or put_bytes |
205 |
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. |
206 |
return SampleBzrDir(t, self) |
1534.4.39
by Robert Collins
Basic BzrDir support. |
207 |
|
208 |
def is_supported(self): |
|
209 |
return False |
|
210 |
||
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
211 |
def open(self, transport, _found=None): |
1534.4.39
by Robert Collins
Basic BzrDir support. |
212 |
return "opened branch." |
213 |
||
214 |
||
215 |
class TestBzrDirFormat(TestCaseWithTransport): |
|
216 |
"""Tests for the BzrDirFormat facility."""
|
|
217 |
||
218 |
def test_find_format(self): |
|
219 |
# is the right format object found for a branch?
|
|
220 |
# create a branch with a few known format objects.
|
|
221 |
# this is not quite the same as
|
|
222 |
t = get_transport(self.get_url()) |
|
223 |
self.build_tree(["foo/", "bar/"], transport=t) |
|
224 |
def check_format(format, url): |
|
225 |
format.initialize(url) |
|
226 |
t = get_transport(url) |
|
227 |
found_format = bzrdir.BzrDirFormat.find_format(t) |
|
228 |
self.failUnless(isinstance(found_format, format.__class__)) |
|
229 |
check_format(bzrdir.BzrDirFormat5(), "foo") |
|
230 |
check_format(bzrdir.BzrDirFormat6(), "bar") |
|
231 |
||
232 |
def test_find_format_nothing_there(self): |
|
233 |
self.assertRaises(NotBranchError, |
|
234 |
bzrdir.BzrDirFormat.find_format, |
|
235 |
get_transport('.')) |
|
236 |
||
237 |
def test_find_format_unknown_format(self): |
|
238 |
t = get_transport(self.get_url()) |
|
239 |
t.mkdir('.bzr') |
|
1955.3.13
by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings. |
240 |
t.put_bytes('.bzr/branch-format', '') |
1534.4.39
by Robert Collins
Basic BzrDir support. |
241 |
self.assertRaises(UnknownFormatError, |
242 |
bzrdir.BzrDirFormat.find_format, |
|
243 |
get_transport('.')) |
|
244 |
||
245 |
def test_register_unregister_format(self): |
|
246 |
format = SampleBzrDirFormat() |
|
247 |
url = self.get_url() |
|
248 |
# make a bzrdir
|
|
249 |
format.initialize(url) |
|
250 |
# register a format for it.
|
|
251 |
bzrdir.BzrDirFormat.register_format(format) |
|
252 |
# which bzrdir.Open will refuse (not supported)
|
|
253 |
self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open, url) |
|
1596.2.1
by Robert Collins
Fix BzrDir.open_containing of unsupported branches. |
254 |
# which bzrdir.open_containing will refuse (not supported)
|
255 |
self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url) |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
256 |
# but open_downlevel will work
|
257 |
t = get_transport(url) |
|
258 |
self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url)) |
|
259 |
# unregister the format
|
|
260 |
bzrdir.BzrDirFormat.unregister_format(format) |
|
261 |
# now open_downlevel should fail too.
|
|
262 |
self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url) |
|
263 |
||
1534.4.40
by Robert Collins
Add RepositoryFormats and allow bzrdir.open or create _repository to be used. |
264 |
def test_create_repository(self): |
265 |
format = SampleBzrDirFormat() |
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
266 |
repo = bzrdir.BzrDir.create_repository(self.get_url(), format=format) |
267 |
self.assertEqual('A repository', repo) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
268 |
|
1841.2.1
by Jelmer Vernooij
Fix handling of `shared' parameter in BzrDir.create_repository(). |
269 |
def test_create_repository_shared(self): |
270 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
|
271 |
repo = bzrdir.BzrDir.create_repository('.', shared=True) |
|
272 |
self.assertTrue(repo.is_shared()) |
|
273 |
||
1841.2.2
by Jelmer Vernooij
Add more tests for create_repository(). |
274 |
def test_create_repository_nonshared(self): |
275 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
|
276 |
repo = bzrdir.BzrDir.create_repository('.') |
|
277 |
self.assertFalse(repo.is_shared()) |
|
278 |
||
1534.6.10
by Robert Collins
Finish use of repositories support. |
279 |
def test_create_repository_under_shared(self): |
280 |
# an explicit create_repository always does so.
|
|
281 |
# we trust the format is right from the 'create_repository test'
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
282 |
format = bzrdir.format_registry.make_bzrdir('knit') |
283 |
self.make_repository('.', shared=True, format=format) |
|
284 |
repo = bzrdir.BzrDir.create_repository(self.get_url('child'), |
|
285 |
format=format) |
|
286 |
self.assertTrue(isinstance(repo, repository.Repository)) |
|
287 |
self.assertTrue(repo.bzrdir.root_transport.base.endswith('child/')) |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
288 |
|
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. |
289 |
def test_create_branch_and_repo_uses_default(self): |
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
290 |
format = SampleBzrDirFormat() |
2476.3.10
by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections. |
291 |
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 |
292 |
format=format) |
293 |
self.assertTrue(isinstance(branch, SampleBranch)) |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
294 |
|
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. |
295 |
def test_create_branch_and_repo_under_shared(self): |
296 |
# creating a branch and repo in a shared repo uses the
|
|
297 |
# shared repository
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
298 |
format = bzrdir.format_registry.make_bzrdir('knit') |
299 |
self.make_repository('.', shared=True, format=format) |
|
300 |
branch = bzrdir.BzrDir.create_branch_and_repo( |
|
301 |
self.get_url('child'), format=format) |
|
302 |
self.assertRaises(errors.NoRepositoryPresent, |
|
303 |
branch.bzrdir.open_repository) |
|
1534.6.6
by Robert Collins
Move find_repository to bzrdir, its not quite ideal there but its simpler and until someone chooses to vary the search by branch type its completely sufficient. |
304 |
|
305 |
def test_create_branch_and_repo_under_shared_force_new(self): |
|
306 |
# creating a branch and repo in a shared repo can be forced to
|
|
307 |
# make a new repo
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
308 |
format = bzrdir.format_registry.make_bzrdir('knit') |
309 |
self.make_repository('.', shared=True, format=format) |
|
310 |
branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'), |
|
311 |
force_new_repo=True, |
|
312 |
format=format) |
|
313 |
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. |
314 |
|
1534.4.42
by Robert Collins
add working tree to the BzrDir facilities. |
315 |
def test_create_standalone_working_tree(self): |
316 |
format = SampleBzrDirFormat() |
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
317 |
# note this is deliberately readonly, as this failure should
|
318 |
# occur before any writes.
|
|
319 |
self.assertRaises(errors.NotLocalUrl, |
|
320 |
bzrdir.BzrDir.create_standalone_workingtree, |
|
321 |
self.get_readonly_url(), format=format) |
|
322 |
tree = bzrdir.BzrDir.create_standalone_workingtree('.', |
|
323 |
format=format) |
|
324 |
self.assertEqual('A tree', tree) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
325 |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
326 |
def test_create_standalone_working_tree_under_shared_repo(self): |
327 |
# create standalone working tree always makes a repo.
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
328 |
format = bzrdir.format_registry.make_bzrdir('knit') |
329 |
self.make_repository('.', shared=True, format=format) |
|
330 |
# note this is deliberately readonly, as this failure should
|
|
331 |
# occur before any writes.
|
|
332 |
self.assertRaises(errors.NotLocalUrl, |
|
333 |
bzrdir.BzrDir.create_standalone_workingtree, |
|
334 |
self.get_readonly_url('child'), format=format) |
|
335 |
tree = bzrdir.BzrDir.create_standalone_workingtree('child', |
|
336 |
format=format) |
|
337 |
tree.bzrdir.open_repository() |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
338 |
|
339 |
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. |
340 |
# 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 |
341 |
format = bzrdir.format_registry.make_bzrdir('knit') |
342 |
branch = bzrdir.BzrDir.create_branch_convenience('.', format=format) |
|
343 |
branch.bzrdir.open_workingtree() |
|
344 |
branch.bzrdir.open_repository() |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
345 |
|
2476.3.10
by Vincent Ladeuil
Add a test for create_branch_convenience. Mark some places to test for multiple connections. |
346 |
def test_create_branch_convenience_possible_transports(self): |
347 |
"""Check that the optional 'possible_transports' is recognized"""
|
|
348 |
format = bzrdir.format_registry.make_bzrdir('knit') |
|
349 |
t = self.get_transport() |
|
350 |
branch = bzrdir.BzrDir.create_branch_convenience( |
|
351 |
'.', format=format, possible_transports=[t]) |
|
352 |
branch.bzrdir.open_workingtree() |
|
353 |
branch.bzrdir.open_repository() |
|
354 |
||
1725.2.5
by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop |
355 |
def test_create_branch_convenience_root(self): |
356 |
"""Creating a branch at the root of a fs should work."""
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
357 |
self.vfs_transport_factory = MemoryServer |
1725.2.5
by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop |
358 |
# 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 |
359 |
format = bzrdir.format_registry.make_bzrdir('knit') |
360 |
branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(), |
|
361 |
format=format) |
|
362 |
self.assertRaises(errors.NoWorkingTree, |
|
363 |
branch.bzrdir.open_workingtree) |
|
364 |
branch.bzrdir.open_repository() |
|
1725.2.5
by Robert Collins
Bugfix create_branch_convenience at the root of a file system to not loop |
365 |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
366 |
def test_create_branch_convenience_under_shared_repo(self): |
367 |
# inside a repo the default convenience output is a branch+ follow the
|
|
368 |
# repo tree policy
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
369 |
format = bzrdir.format_registry.make_bzrdir('knit') |
370 |
self.make_repository('.', shared=True, format=format) |
|
371 |
branch = bzrdir.BzrDir.create_branch_convenience('child', |
|
372 |
format=format) |
|
373 |
branch.bzrdir.open_workingtree() |
|
374 |
self.assertRaises(errors.NoRepositoryPresent, |
|
375 |
branch.bzrdir.open_repository) |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
376 |
|
377 |
def test_create_branch_convenience_under_shared_repo_force_no_tree(self): |
|
378 |
# inside a repo the default convenience output is a branch+ follow the
|
|
379 |
# repo tree policy but we can override that
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
380 |
format = bzrdir.format_registry.make_bzrdir('knit') |
381 |
self.make_repository('.', shared=True, format=format) |
|
382 |
branch = bzrdir.BzrDir.create_branch_convenience('child', |
|
383 |
force_new_tree=False, format=format) |
|
384 |
self.assertRaises(errors.NoWorkingTree, |
|
385 |
branch.bzrdir.open_workingtree) |
|
386 |
self.assertRaises(errors.NoRepositoryPresent, |
|
387 |
branch.bzrdir.open_repository) |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
388 |
|
389 |
def test_create_branch_convenience_under_shared_repo_no_tree_policy(self): |
|
390 |
# inside a repo the default convenience output is a branch+ follow the
|
|
391 |
# repo tree policy
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
392 |
format = bzrdir.format_registry.make_bzrdir('knit') |
393 |
repo = self.make_repository('.', shared=True, format=format) |
|
394 |
repo.set_make_working_trees(False) |
|
395 |
branch = bzrdir.BzrDir.create_branch_convenience('child', |
|
396 |
format=format) |
|
397 |
self.assertRaises(errors.NoWorkingTree, |
|
398 |
branch.bzrdir.open_workingtree) |
|
399 |
self.assertRaises(errors.NoRepositoryPresent, |
|
400 |
branch.bzrdir.open_repository) |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
401 |
|
402 |
def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self): |
|
403 |
# inside a repo the default convenience output is a branch+ follow the
|
|
404 |
# repo tree policy but we can override that
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
405 |
format = bzrdir.format_registry.make_bzrdir('knit') |
406 |
repo = self.make_repository('.', shared=True, format=format) |
|
407 |
repo.set_make_working_trees(False) |
|
408 |
branch = bzrdir.BzrDir.create_branch_convenience('child', |
|
409 |
force_new_tree=True, format=format) |
|
410 |
branch.bzrdir.open_workingtree() |
|
411 |
self.assertRaises(errors.NoRepositoryPresent, |
|
412 |
branch.bzrdir.open_repository) |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
413 |
|
414 |
def test_create_branch_convenience_under_shared_repo_force_new_repo(self): |
|
415 |
# inside a repo the default convenience output is overridable to give
|
|
416 |
# repo+branch+tree
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
417 |
format = bzrdir.format_registry.make_bzrdir('knit') |
418 |
self.make_repository('.', shared=True, format=format) |
|
419 |
branch = bzrdir.BzrDir.create_branch_convenience('child', |
|
420 |
force_new_repo=True, format=format) |
|
421 |
branch.bzrdir.open_repository() |
|
422 |
branch.bzrdir.open_workingtree() |
|
1534.6.10
by Robert Collins
Finish use of repositories support. |
423 |
|
1534.4.39
by Robert Collins
Basic BzrDir support. |
424 |
|
425 |
class ChrootedTests(TestCaseWithTransport): |
|
426 |
"""A support class that provides readonly urls outside the local namespace.
|
|
427 |
||
428 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
429 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
430 |
for readonly urls.
|
|
431 |
"""
|
|
432 |
||
433 |
def setUp(self): |
|
434 |
super(ChrootedTests, self).setUp() |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
435 |
if not self.vfs_transport_factory == MemoryServer: |
1534.4.39
by Robert Collins
Basic BzrDir support. |
436 |
self.transport_readonly_server = HttpServer |
437 |
||
438 |
def test_open_containing(self): |
|
439 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing, |
|
440 |
self.get_readonly_url('')) |
|
441 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing, |
|
442 |
self.get_readonly_url('g/p/q')) |
|
443 |
control = bzrdir.BzrDir.create(self.get_url()) |
|
444 |
branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('')) |
|
445 |
self.assertEqual('', relpath) |
|
446 |
branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q')) |
|
447 |
self.assertEqual('g/p/q', relpath) |
|
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
448 |
|
1534.6.11
by Robert Collins
Review feedback. |
449 |
def test_open_containing_from_transport(self): |
450 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport, |
|
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
451 |
get_transport(self.get_readonly_url(''))) |
1534.6.11
by Robert Collins
Review feedback. |
452 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport, |
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
453 |
get_transport(self.get_readonly_url('g/p/q'))) |
454 |
control = bzrdir.BzrDir.create(self.get_url()) |
|
1534.6.11
by Robert Collins
Review feedback. |
455 |
branch, relpath = bzrdir.BzrDir.open_containing_from_transport( |
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
456 |
get_transport(self.get_readonly_url(''))) |
457 |
self.assertEqual('', relpath) |
|
1534.6.11
by Robert Collins
Review feedback. |
458 |
branch, relpath = bzrdir.BzrDir.open_containing_from_transport( |
1534.6.3
by Robert Collins
find_repository sufficiently robust. |
459 |
get_transport(self.get_readonly_url('g/p/q'))) |
460 |
self.assertEqual('g/p/q', relpath) |
|
461 |
||
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
462 |
def test_open_containing_tree_or_branch(self): |
463 |
def local_branch_path(branch): |
|
2215.3.4
by Aaron Bentley
rewrap some text |
464 |
return os.path.realpath( |
465 |
urlutils.local_path_from_url(branch.base)) |
|
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
466 |
|
467 |
self.make_branch_and_tree('topdir') |
|
468 |
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch( |
|
469 |
'topdir/foo') |
|
2215.3.7
by Aaron Bentley
Remove (new) trailing whitespace |
470 |
self.assertEqual(os.path.realpath('topdir'), |
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
471 |
os.path.realpath(tree.basedir)) |
2215.3.7
by Aaron Bentley
Remove (new) trailing whitespace |
472 |
self.assertEqual(os.path.realpath('topdir'), |
2215.3.4
by Aaron Bentley
rewrap some text |
473 |
local_branch_path(branch)) |
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
474 |
self.assertIs(tree.bzrdir, branch.bzrdir) |
475 |
self.assertEqual('foo', relpath) |
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
476 |
# opening from non-local should not return the tree
|
477 |
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch( |
|
478 |
self.get_readonly_url('topdir/foo')) |
|
479 |
self.assertEqual(None, tree) |
|
480 |
self.assertEqual('foo', relpath) |
|
481 |
# without a tree:
|
|
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
482 |
self.make_branch('topdir/foo') |
483 |
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch( |
|
484 |
'topdir/foo') |
|
485 |
self.assertIs(tree, None) |
|
2215.3.7
by Aaron Bentley
Remove (new) trailing whitespace |
486 |
self.assertEqual(os.path.realpath('topdir/foo'), |
2215.3.2
by Aaron Bentley
Add open_containing_tree_or_branch |
487 |
local_branch_path(branch)) |
488 |
self.assertEqual('', relpath) |
|
489 |
||
1910.11.5
by Andrew Bennetts
Add tests for BzrDir.open_from_transport. |
490 |
def test_open_from_transport(self): |
491 |
# transport pointing at bzrdir should give a bzrdir with root transport
|
|
492 |
# set to the given transport
|
|
493 |
control = bzrdir.BzrDir.create(self.get_url()) |
|
494 |
transport = get_transport(self.get_url()) |
|
495 |
opened_bzrdir = bzrdir.BzrDir.open_from_transport(transport) |
|
496 |
self.assertEqual(transport.base, opened_bzrdir.root_transport.base) |
|
497 |
self.assertIsInstance(opened_bzrdir, bzrdir.BzrDir) |
|
498 |
||
499 |
def test_open_from_transport_no_bzrdir(self): |
|
500 |
transport = get_transport(self.get_url()) |
|
501 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, |
|
502 |
transport) |
|
503 |
||
504 |
def test_open_from_transport_bzrdir_in_parent(self): |
|
505 |
control = bzrdir.BzrDir.create(self.get_url()) |
|
506 |
transport = get_transport(self.get_url()) |
|
507 |
transport.mkdir('subdir') |
|
508 |
transport = transport.clone('subdir') |
|
509 |
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_from_transport, |
|
510 |
transport) |
|
511 |
||
2100.3.28
by Aaron Bentley
Make sprout recursive |
512 |
def test_sprout_recursive(self): |
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
513 |
tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree') |
2100.3.28
by Aaron Bentley
Make sprout recursive |
514 |
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. |
515 |
format='dirstate-with-subtree') |
2100.3.28
by Aaron Bentley
Make sprout recursive |
516 |
tree.add_reference(sub_tree) |
517 |
self.build_tree(['tree1/subtree/file']) |
|
518 |
sub_tree.add('file') |
|
519 |
tree.commit('Initial commit') |
|
520 |
tree.bzrdir.sprout('tree2') |
|
521 |
self.failUnlessExists('tree2/subtree/file') |
|
522 |
||
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
523 |
def test_cloning_metadir(self): |
524 |
"""Ensure that cloning metadir is suitable"""
|
|
2100.3.34
by Aaron Bentley
Fix BzrDir.cloning_metadir with no format |
525 |
bzrdir = self.make_bzrdir('bzrdir') |
526 |
bzrdir.cloning_metadir() |
|
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
527 |
branch = self.make_branch('branch', format='knit') |
528 |
format = branch.bzrdir.cloning_metadir() |
|
529 |
self.assertIsInstance(format.workingtree_format, |
|
2255.2.174
by Martin Pool
remove AB1 WorkingTree and experimental-knit3 |
530 |
workingtree.WorkingTreeFormat3) |
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
531 |
|
532 |
def test_sprout_recursive_treeless(self): |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
533 |
tree = self.make_branch_and_tree('tree1', |
534 |
format='dirstate-with-subtree') |
|
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
535 |
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. |
536 |
format='dirstate-with-subtree') |
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
537 |
tree.add_reference(sub_tree) |
538 |
self.build_tree(['tree1/subtree/file']) |
|
539 |
sub_tree.add('file') |
|
540 |
tree.commit('Initial commit') |
|
541 |
tree.bzrdir.destroy_workingtree() |
|
542 |
repo = self.make_repository('repo', shared=True, |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
543 |
format='dirstate-with-subtree') |
2100.3.32
by Aaron Bentley
fix tree format, basis_tree call, in sprout |
544 |
repo.set_make_working_trees(False) |
545 |
tree.bzrdir.sprout('repo/tree2') |
|
546 |
self.failUnlessExists('repo/tree2/subtree') |
|
547 |
self.failIfExists('repo/tree2/subtree/file') |
|
548 |
||
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
549 |
|
550 |
class TestMeta1DirFormat(TestCaseWithTransport): |
|
551 |
"""Tests specific to the meta1 dir format."""
|
|
552 |
||
553 |
def test_right_base_dirs(self): |
|
554 |
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url()) |
|
555 |
t = dir.transport |
|
556 |
branch_base = t.clone('branch').base |
|
557 |
self.assertEqual(branch_base, dir.get_branch_transport(None).base) |
|
558 |
self.assertEqual(branch_base, |
|
1508.1.25
by Robert Collins
Update per review comments. |
559 |
dir.get_branch_transport(bzrlib.branch.BzrBranchFormat5()).base) |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
560 |
repository_base = t.clone('repository').base |
561 |
self.assertEqual(repository_base, dir.get_repository_transport(None).base) |
|
562 |
self.assertEqual(repository_base, |
|
2241.1.4
by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo. |
563 |
dir.get_repository_transport(weaverepo.RepositoryFormat7()).base) |
1534.4.47
by Robert Collins
Split out repository into .bzr/repository |
564 |
checkout_base = t.clone('checkout').base |
565 |
self.assertEqual(checkout_base, dir.get_workingtree_transport(None).base) |
|
566 |
self.assertEqual(checkout_base, |
|
567 |
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. |
568 |
|
1553.5.69
by Martin Pool
BzrDirFormat subclasses can now control what kind of overall lock is used. |
569 |
def test_meta1dir_uses_lockdir(self): |
570 |
"""Meta1 format uses a LockDir to guard the whole directory, not a file."""
|
|
571 |
dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url()) |
|
572 |
t = dir.transport |
|
573 |
self.assertIsDirectory('branch-lock', t) |
|
574 |
||
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
575 |
def test_comparison(self): |
576 |
"""Equality and inequality behave properly.
|
|
577 |
||
578 |
Metadirs should compare equal iff they have the same repo, branch and
|
|
579 |
tree formats.
|
|
580 |
"""
|
|
581 |
mydir = bzrdir.format_registry.make_bzrdir('knit') |
|
582 |
self.assertEqual(mydir, mydir) |
|
583 |
self.assertFalse(mydir != mydir) |
|
584 |
otherdir = bzrdir.format_registry.make_bzrdir('knit') |
|
585 |
self.assertEqual(otherdir, mydir) |
|
586 |
self.assertFalse(otherdir != mydir) |
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
587 |
otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree') |
2100.3.35
by Aaron Bentley
equality operations on bzrdir |
588 |
self.assertNotEqual(otherdir2, mydir) |
589 |
self.assertFalse(otherdir2 == mydir) |
|
590 |
||
2255.12.1
by Robert Collins
Implement upgrade for working trees. |
591 |
def test_needs_conversion_different_working_tree(self): |
592 |
# meta1dirs need an conversion if any element is not the default.
|
|
593 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
|
594 |
# test with
|
|
595 |
new_default = bzrdir.format_registry.make_bzrdir('dirstate') |
|
596 |
bzrdir.BzrDirFormat._set_default_format(new_default) |
|
597 |
try: |
|
598 |
tree = self.make_branch_and_tree('tree', format='knit') |
|
599 |
self.assertTrue(tree.bzrdir.needs_format_conversion()) |
|
600 |
finally: |
|
601 |
bzrdir.BzrDirFormat._set_default_format(old_format) |
|
602 |
||
603 |
||
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
604 |
class TestFormat5(TestCaseWithTransport): |
605 |
"""Tests specific to the version 5 bzrdir format."""
|
|
606 |
||
607 |
def test_same_lockfiles_between_tree_repo_branch(self): |
|
608 |
# this checks that only a single lockfiles instance is created
|
|
609 |
# for format 5 objects
|
|
610 |
dir = bzrdir.BzrDirFormat5().initialize(self.get_url()) |
|
611 |
def check_dir_components_use_same_lock(dir): |
|
612 |
ctrl_1 = dir.open_repository().control_files |
|
613 |
ctrl_2 = dir.open_branch().control_files |
|
614 |
ctrl_3 = dir.open_workingtree()._control_files |
|
615 |
self.assertTrue(ctrl_1 is ctrl_2) |
|
616 |
self.assertTrue(ctrl_2 is ctrl_3) |
|
617 |
check_dir_components_use_same_lock(dir) |
|
618 |
# and if we open it normally.
|
|
619 |
dir = bzrdir.BzrDir.open(self.get_url()) |
|
620 |
check_dir_components_use_same_lock(dir) |
|
621 |
||
1534.5.16
by Robert Collins
Review feedback. |
622 |
def test_can_convert(self): |
623 |
# format 5 dirs are convertable
|
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
624 |
dir = bzrdir.BzrDirFormat5().initialize(self.get_url()) |
1534.5.16
by Robert Collins
Review feedback. |
625 |
self.assertTrue(dir.can_convert_format()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
626 |
|
1534.5.16
by Robert Collins
Review feedback. |
627 |
def test_needs_conversion(self): |
628 |
# format 5 dirs need a conversion if they are not the default.
|
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
629 |
# and they start of not the default.
|
630 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
631 |
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirFormat5()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
632 |
try: |
633 |
dir = bzrdir.BzrDirFormat5().initialize(self.get_url()) |
|
1534.5.16
by Robert Collins
Review feedback. |
634 |
self.assertFalse(dir.needs_format_conversion()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
635 |
finally: |
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
636 |
bzrdir.BzrDirFormat._set_default_format(old_format) |
1534.5.16
by Robert Collins
Review feedback. |
637 |
self.assertTrue(dir.needs_format_conversion()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
638 |
|
1534.5.3
by Robert Collins
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository. |
639 |
|
640 |
class TestFormat6(TestCaseWithTransport): |
|
641 |
"""Tests specific to the version 6 bzrdir format."""
|
|
642 |
||
643 |
def test_same_lockfiles_between_tree_repo_branch(self): |
|
644 |
# this checks that only a single lockfiles instance is created
|
|
645 |
# for format 6 objects
|
|
646 |
dir = bzrdir.BzrDirFormat6().initialize(self.get_url()) |
|
647 |
def check_dir_components_use_same_lock(dir): |
|
648 |
ctrl_1 = dir.open_repository().control_files |
|
649 |
ctrl_2 = dir.open_branch().control_files |
|
650 |
ctrl_3 = dir.open_workingtree()._control_files |
|
651 |
self.assertTrue(ctrl_1 is ctrl_2) |
|
652 |
self.assertTrue(ctrl_2 is ctrl_3) |
|
653 |
check_dir_components_use_same_lock(dir) |
|
654 |
# and if we open it normally.
|
|
655 |
dir = bzrdir.BzrDir.open(self.get_url()) |
|
656 |
check_dir_components_use_same_lock(dir) |
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
657 |
|
1534.5.16
by Robert Collins
Review feedback. |
658 |
def test_can_convert(self): |
659 |
# format 6 dirs are convertable
|
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
660 |
dir = bzrdir.BzrDirFormat6().initialize(self.get_url()) |
1534.5.16
by Robert Collins
Review feedback. |
661 |
self.assertTrue(dir.can_convert_format()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
662 |
|
1534.5.16
by Robert Collins
Review feedback. |
663 |
def test_needs_conversion(self): |
664 |
# format 6 dirs need an conversion if they are not the default.
|
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
665 |
old_format = bzrdir.BzrDirFormat.get_default_format() |
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
666 |
bzrdir.BzrDirFormat._set_default_format(bzrdir.BzrDirMetaFormat1()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
667 |
try: |
668 |
dir = bzrdir.BzrDirFormat6().initialize(self.get_url()) |
|
1534.5.16
by Robert Collins
Review feedback. |
669 |
self.assertTrue(dir.needs_format_conversion()) |
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
670 |
finally: |
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
671 |
bzrdir.BzrDirFormat._set_default_format(old_format) |
1563.1.6
by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls. |
672 |
|
673 |
||
1733.1.1
by Robert Collins
Support non '.bzr' control directories in bzrdir. |
674 |
class NotBzrDir(bzrlib.bzrdir.BzrDir): |
675 |
"""A non .bzr based control directory."""
|
|
676 |
||
677 |
def __init__(self, transport, format): |
|
678 |
self._format = format |
|
679 |
self.root_transport = transport |
|
680 |
self.transport = transport.clone('.not') |
|
681 |
||
682 |
||
683 |
class NotBzrDirFormat(bzrlib.bzrdir.BzrDirFormat): |
|
684 |
"""A test class representing any non-.bzr based disk format."""
|
|
685 |
||
686 |
def initialize_on_transport(self, transport): |
|
687 |
"""Initialize a new .not dir in the base directory of a Transport."""
|
|
688 |
transport.mkdir('.not') |
|
689 |
return self.open(transport) |
|
690 |
||
691 |
def open(self, transport): |
|
692 |
"""Open this directory."""
|
|
693 |
return NotBzrDir(transport, self) |
|
694 |
||
695 |
@classmethod
|
|
1733.1.3
by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs. |
696 |
def _known_formats(self): |
697 |
return set([NotBzrDirFormat()]) |
|
698 |
||
699 |
@classmethod
|
|
1733.1.1
by Robert Collins
Support non '.bzr' control directories in bzrdir. |
700 |
def probe_transport(self, transport): |
701 |
"""Our format is present if the transport ends in '.not/'."""
|
|
1733.1.2
by Robert Collins
bugfix test for non .bzrdir support. |
702 |
if transport.has('.not'): |
1733.1.1
by Robert Collins
Support non '.bzr' control directories in bzrdir. |
703 |
return NotBzrDirFormat() |
704 |
||
705 |
||
706 |
class TestNotBzrDir(TestCaseWithTransport): |
|
707 |
"""Tests for using the bzrdir api with a non .bzr based disk format.
|
|
708 |
|
|
709 |
If/when one of these is in the core, we can let the implementation tests
|
|
710 |
verify this works.
|
|
711 |
"""
|
|
712 |
||
713 |
def test_create_and_find_format(self): |
|
714 |
# create a .notbzr dir
|
|
715 |
format = NotBzrDirFormat() |
|
716 |
dir = format.initialize(self.get_url()) |
|
717 |
self.assertIsInstance(dir, NotBzrDir) |
|
718 |
# now probe for it.
|
|
719 |
bzrlib.bzrdir.BzrDirFormat.register_control_format(format) |
|
720 |
try: |
|
721 |
found = bzrlib.bzrdir.BzrDirFormat.find_format( |
|
722 |
get_transport(self.get_url())) |
|
1733.1.2
by Robert Collins
bugfix test for non .bzrdir support. |
723 |
self.assertIsInstance(found, NotBzrDirFormat) |
1733.1.1
by Robert Collins
Support non '.bzr' control directories in bzrdir. |
724 |
finally: |
725 |
bzrlib.bzrdir.BzrDirFormat.unregister_control_format(format) |
|
726 |
||
1733.1.3
by Robert Collins
Extend the test suite to run bzrdir conformance tests on non .bzr based control dirs. |
727 |
def test_included_in_known_formats(self): |
728 |
bzrlib.bzrdir.BzrDirFormat.register_control_format(NotBzrDirFormat) |
|
729 |
try: |
|
730 |
formats = bzrlib.bzrdir.BzrDirFormat.known_formats() |
|
731 |
for format in formats: |
|
732 |
if isinstance(format, NotBzrDirFormat): |
|
733 |
return
|
|
734 |
self.fail("No NotBzrDirFormat in %s" % formats) |
|
735 |
finally: |
|
736 |
bzrlib.bzrdir.BzrDirFormat.unregister_control_format(NotBzrDirFormat) |
|
737 |
||
1733.1.1
by Robert Collins
Support non '.bzr' control directories in bzrdir. |
738 |
|
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. |
739 |
class NonLocalTests(TestCaseWithTransport): |
740 |
"""Tests for bzrdir static behaviour on non local paths."""
|
|
741 |
||
742 |
def setUp(self): |
|
743 |
super(NonLocalTests, self).setUp() |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
744 |
self.vfs_transport_factory = MemoryServer |
1563.1.6
by Robert Collins
Add tests for sftp push, and NonLocalTets for BzrDir.create_branch_convenience, before fixing the failure of it to work on non-local urls. |
745 |
|
746 |
def test_create_branch_convenience(self): |
|
747 |
# 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 |
748 |
format = bzrdir.format_registry.make_bzrdir('knit') |
749 |
branch = bzrdir.BzrDir.create_branch_convenience( |
|
750 |
self.get_url('foo'), format=format) |
|
751 |
self.assertRaises(errors.NoWorkingTree, |
|
752 |
branch.bzrdir.open_workingtree) |
|
753 |
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. |
754 |
|
755 |
def test_create_branch_convenience_force_tree_not_local_fails(self): |
|
756 |
# 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 |
757 |
format = bzrdir.format_registry.make_bzrdir('knit') |
758 |
self.assertRaises(errors.NotLocalUrl, |
|
759 |
bzrdir.BzrDir.create_branch_convenience, |
|
760 |
self.get_url('foo'), |
|
761 |
force_new_tree=True, |
|
762 |
format=format) |
|
763 |
t = get_transport(self.get_url('.')) |
|
764 |
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. |
765 |
|
1563.2.38
by Robert Collins
make push preserve tree formats. |
766 |
def test_clone(self): |
767 |
# clone into a nonlocal path works
|
|
2204.4.13
by Aaron Bentley
Update all test cases to avoid set_default_format |
768 |
format = bzrdir.format_registry.make_bzrdir('knit') |
769 |
branch = bzrdir.BzrDir.create_branch_convenience('local', |
|
770 |
format=format) |
|
1563.2.38
by Robert Collins
make push preserve tree formats. |
771 |
branch.bzrdir.open_workingtree() |
772 |
result = branch.bzrdir.clone(self.get_url('remote')) |
|
773 |
self.assertRaises(errors.NoWorkingTree, |
|
774 |
result.open_workingtree) |
|
775 |
result.open_branch() |
|
776 |
result.open_repository() |
|
777 |
||
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
778 |
def test_checkout_metadir(self): |
779 |
# checkout_metadir has reasonable working tree format even when no
|
|
780 |
# working tree is present
|
|
2255.2.194
by Robert Collins
[BROKEN] Many updates to stop using experimental formats in tests. |
781 |
self.make_branch('branch-knit2', format='dirstate-with-subtree') |
2100.3.21
by Aaron Bentley
Work on checking out by-reference trees |
782 |
my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2')) |
783 |
checkout_format = my_bzrdir.checkout_metadir() |
|
784 |
self.assertIsInstance(checkout_format.workingtree_format, |
|
785 |
workingtree.WorkingTreeFormat3) |
|
2100.3.22
by Aaron Bentley
merge from bzr.dev |
786 |
|
2215.3.5
by Aaron Bentley
Add support for remote ls |
787 |
|
2164.2.16
by Vincent Ladeuil
Add tests. |
788 |
class TestHTTPRedirectionLoop(object): |
789 |
"""Test redirection loop between two http servers.
|
|
790 |
||
791 |
This MUST be used by daughter classes that also inherit from
|
|
792 |
TestCaseWithTwoWebservers.
|
|
793 |
||
794 |
We can't inherit directly from TestCaseWithTwoWebservers or the
|
|
795 |
test framework will try to create an instance which cannot
|
|
796 |
run, its implementation being incomplete.
|
|
797 |
"""
|
|
798 |
||
799 |
# Should be defined by daughter classes to ensure redirection
|
|
2164.2.17
by Vincent Ladeuil
Add comments and fix typos |
800 |
# still use the same transport implementation (not currently
|
801 |
# enforced as it's a bit tricky to get right (see the FIXME
|
|
802 |
# in BzrDir.open_from_transport for the unique use case so
|
|
803 |
# far)
|
|
2164.2.16
by Vincent Ladeuil
Add tests. |
804 |
_qualifier = None |
805 |
||
806 |
def create_transport_readonly_server(self): |
|
807 |
return HTTPServerRedirecting() |
|
808 |
||
809 |
def create_transport_secondary_server(self): |
|
810 |
return HTTPServerRedirecting() |
|
811 |
||
812 |
def setUp(self): |
|
813 |
# Both servers redirect to each server creating a loop
|
|
814 |
super(TestHTTPRedirectionLoop, self).setUp() |
|
815 |
# The redirections will point to the new server
|
|
816 |
self.new_server = self.get_readonly_server() |
|
817 |
# The requests to the old server will be redirected
|
|
818 |
self.old_server = self.get_secondary_server() |
|
819 |
# Configure the redirections
|
|
820 |
self.old_server.redirect_to(self.new_server.host, self.new_server.port) |
|
821 |
self.new_server.redirect_to(self.old_server.host, self.old_server.port) |
|
822 |
||
823 |
def _qualified_url(self, host, port): |
|
824 |
return 'http+%s://%s:%s' % (self._qualifier, host, port) |
|
825 |
||
826 |
def test_loop(self): |
|
827 |
# Starting from either server should loop
|
|
828 |
old_url = self._qualified_url(self.old_server.host, |
|
829 |
self.old_server.port) |
|
830 |
oldt = self._transport(old_url) |
|
831 |
self.assertRaises(errors.NotBranchError, |
|
832 |
bzrdir.BzrDir.open_from_transport, oldt) |
|
833 |
new_url = self._qualified_url(self.new_server.host, |
|
834 |
self.new_server.port) |
|
835 |
newt = self._transport(new_url) |
|
836 |
self.assertRaises(errors.NotBranchError, |
|
837 |
bzrdir.BzrDir.open_from_transport, newt) |
|
838 |
||
839 |
||
840 |
class TestHTTPRedirections_urllib(TestHTTPRedirectionLoop, |
|
841 |
TestCaseWithTwoWebservers): |
|
842 |
"""Tests redirections for urllib implementation"""
|
|
843 |
||
844 |
_qualifier = 'urllib' |
|
845 |
_transport = HttpTransport_urllib |
|
846 |
||
847 |
||
848 |
||
849 |
class TestHTTPRedirections_pycurl(TestWithTransport_pycurl, |
|
850 |
TestHTTPRedirectionLoop, |
|
851 |
TestCaseWithTwoWebservers): |
|
852 |
"""Tests redirections for pycurl implementation"""
|
|
853 |
||
854 |
_qualifier = 'pycurl' |