bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2220.2.17
by Martin Pool
merge up from bzr.dev to get metadir changes |
1 |
# Copyright (C) 2006, 2007 Canonical Ltd
|
|
1534.4.24
by Robert Collins
update (C) on branch_implementations/__init__.py |
2 |
# Authors: Robert Collins <robert.collins@canonical.com>
|
|
2220.2.17
by Martin Pool
merge up from bzr.dev to get metadir changes |
3 |
# and others
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
4 |
#
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
5 |
# This program is free software; you can redistribute it and/or modify
|
6 |
# it under the terms of the GNU General Public License as published by
|
|
7 |
# the Free Software Foundation; either version 2 of the License, or
|
|
8 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
9 |
#
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
10 |
# This program is distributed in the hope that it will be useful,
|
11 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
14 |
#
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
15 |
# You should have received a copy of the GNU General Public License
|
16 |
# along with this program; if not, write to the Free Software
|
|
17 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
18 |
||
19 |
||
20 |
"""Branch implementation tests for bzr.
|
|
21 |
||
22 |
These test the conformance of all the branch variations to the expected API.
|
|
23 |
Specific tests for individual formats are in the tests/test_branch file
|
|
24 |
rather than in tests/branch_implementations/*.py.
|
|
25 |
"""
|
|
26 |
||
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
27 |
from bzrlib import ( |
28 |
errors, |
|
29 |
tests, |
|
30 |
)
|
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
31 |
from bzrlib.branch import (BranchFormat, |
32 |
_legacy_formats, |
|
33 |
)
|
|
|
2418.5.11
by John Arbash Meinel
[merge] bzr.dev 2447 |
34 |
from bzrlib.remote import RemoteBranchFormat, RemoteBzrDirFormat |
|
2018.5.167
by Andrew Bennetts
Various changes in response to John's review. |
35 |
from bzrlib.smart.server import ( |
36 |
SmartTCPServer_for_testing, |
|
37 |
ReadonlySmartTCPServer_for_testing, |
|
38 |
)
|
|
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
39 |
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir |
|
2018.5.167
by Andrew Bennetts
Various changes in response to John's review. |
40 |
from bzrlib.transport.memory import MemoryServer |
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
41 |
|
42 |
||
|
2553.2.6
by Robert Collins
And overhaul BranchTestProviderAdapter too. |
43 |
class BranchTestProviderAdapter(tests.TestScenarioApplier): |
44 |
"""A tool to generate a suite testing multiple branch formats at once. |
|
45 |
||
46 |
This is done by copying the test once for each transport and injecting
|
|
47 |
the transport_server, transport_readonly_server, and branch_format
|
|
48 |
classes into each copy. Each copy is also given a new id() to make it
|
|
49 |
easy to identify.
|
|
50 |
"""
|
|
51 |
||
52 |
def __init__(self, transport_server, transport_readonly_server, formats, |
|
53 |
vfs_transport_factory=None): |
|
54 |
self._transport_server = transport_server |
|
55 |
self._transport_readonly_server = transport_readonly_server |
|
56 |
self.scenarios = self.formats_to_scenarios(formats) |
|
57 |
||
58 |
def formats_to_scenarios(self, formats): |
|
59 |
"""Transform the input formats to a list of scenarios. |
|
60 |
||
61 |
:param formats: A list of (branch_format, bzrdir_format).
|
|
62 |
"""
|
|
63 |
result = [] |
|
64 |
for branch_format, bzrdir_format in formats: |
|
65 |
# some branches don't have separate format objects.
|
|
66 |
# so we have a conditional here to handle them.
|
|
67 |
scenario_name = getattr(branch_format, '__name__', |
|
68 |
branch_format.__class__.__name__) |
|
69 |
scenario = (scenario_name, { |
|
70 |
"transport_server":self._transport_server, |
|
71 |
"transport_readonly_server":self._transport_readonly_server, |
|
72 |
"bzrdir_format":bzrdir_format, |
|
73 |
"branch_format":branch_format, |
|
74 |
})
|
|
75 |
result.append(scenario) |
|
76 |
return result |
|
77 |
||
78 |
||
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
79 |
class TestCaseWithBranch(TestCaseWithBzrDir): |
80 |
"""This helper will be adapted for each branch_implementation test.""" |
|
81 |
||
82 |
def setUp(self): |
|
83 |
super(TestCaseWithBranch, self).setUp() |
|
84 |
self.branch = None |
|
85 |
||
86 |
def get_branch(self): |
|
87 |
if self.branch is None: |
|
88 |
self.branch = self.make_branch('') |
|
89 |
return self.branch |
|
90 |
||
91 |
def make_branch(self, relpath, format=None): |
|
92 |
repo = self.make_repository(relpath, format=format) |
|
93 |
# fixme RBC 20060210 this isnt necessarily a fixable thing,
|
|
94 |
# Skipped is the wrong exception to raise.
|
|
95 |
try: |
|
96 |
return self.branch_format.initialize(repo.bzrdir) |
|
97 |
except errors.UninitializableFormat: |
|
98 |
raise tests.TestSkipped('Uninitializable branch format') |
|
99 |
||
100 |
def make_repository(self, relpath, shared=False, format=None): |
|
101 |
made_control = self.make_bzrdir(relpath, format=format) |
|
102 |
return made_control.create_repository(shared=shared) |
|
103 |
||
104 |
def create_tree_with_merge(self): |
|
105 |
"""Create a branch with a simple ancestry. |
|
106 |
||
107 |
The graph should look like:
|
|
108 |
digraph H {
|
|
109 |
"rev-1" -> "rev-2" -> "rev-3";
|
|
110 |
"rev-1" -> "rev-1.1.1" -> "rev-3";
|
|
111 |
}
|
|
112 |
||
113 |
Or in ASCII:
|
|
|
2418.5.14
by John Arbash Meinel
clean up ASCII revision graph art. |
114 |
1
|
115 |
|\
|
|
116 |
2 1.1.1
|
|
117 |
|/
|
|
118 |
3
|
|
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
119 |
"""
|
120 |
tree = self.make_branch_and_memory_tree('tree') |
|
121 |
tree.lock_write() |
|
122 |
try: |
|
123 |
tree.add('') |
|
124 |
tree.commit('first', rev_id='rev-1') |
|
|
2418.5.3
by John Arbash Meinel
Use a more straightforward implementation of generating 'tree_with_merge' |
125 |
tree.commit('second', rev_id='rev-1.1.1') |
|
2418.5.10
by John Arbash Meinel
fix typo |
126 |
# Uncommit that last commit and switch to the other line
|
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
127 |
tree.branch.set_last_revision_info(1, 'rev-1') |
128 |
tree.set_parent_ids(['rev-1']) |
|
|
2418.5.3
by John Arbash Meinel
Use a more straightforward implementation of generating 'tree_with_merge' |
129 |
tree.commit('alt-second', rev_id='rev-2') |
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
130 |
tree.set_parent_ids(['rev-2', 'rev-1.1.1']) |
131 |
tree.commit('third', rev_id='rev-3') |
|
132 |
finally: |
|
133 |
tree.unlock() |
|
134 |
||
135 |
return tree |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
136 |
|
|
1534.4.24
by Robert Collins
update (C) on branch_implementations/__init__.py |
137 |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
138 |
def test_suite(): |
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
139 |
result = tests.TestSuite() |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
140 |
test_branch_implementations = [ |
|
1587.1.6
by Robert Collins
Update bound branch implementation to 0.8. |
141 |
'bzrlib.tests.branch_implementations.test_bound_sftp', |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
142 |
'bzrlib.tests.branch_implementations.test_branch', |
|
1687.1.8
by Robert Collins
Teach Branch about break_lock. |
143 |
'bzrlib.tests.branch_implementations.test_break_lock', |
|
2370.3.1
by John Arbash Meinel
(John Arbash Meinel) Fix bug #93854, make 'bzr checkout' create branches in the same format as the source. |
144 |
'bzrlib.tests.branch_implementations.test_create_checkout', |
|
2246.1.3
by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These |
145 |
'bzrlib.tests.branch_implementations.test_commit', |
|
2418.5.7
by John Arbash Meinel
Move the revision_id=>map generation to be a public function. |
146 |
'bzrlib.tests.branch_implementations.test_get_revision_id_to_revno_map', |
|
2245.1.1
by Robert Collins
New Branch hooks facility, with one initial hook 'set_rh' which triggers |
147 |
'bzrlib.tests.branch_implementations.test_hooks', |
|
1864.7.3
by John Arbash Meinel
Test that the right thing happens when clone/sprout is done with an invalid parent |
148 |
'bzrlib.tests.branch_implementations.test_http', |
|
2249.4.1
by Wouter van Heyst
New Branch.last_revision_info method, this is being done to allow |
149 |
'bzrlib.tests.branch_implementations.test_last_revision_info', |
|
1711.8.5
by John Arbash Meinel
Move the new locking tests into their own files, and move the helper functions into a test helper. |
150 |
'bzrlib.tests.branch_implementations.test_locking', |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
151 |
'bzrlib.tests.branch_implementations.test_parent', |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
152 |
'bzrlib.tests.branch_implementations.test_permissions', |
|
1649.1.1
by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two |
153 |
'bzrlib.tests.branch_implementations.test_pull', |
|
2375.1.5
by Andrew Bennetts
Deal with review comments from Robert: |
154 |
'bzrlib.tests.branch_implementations.test_push', |
155 |
'bzrlib.tests.branch_implementations.test_revision_history', |
|
|
2418.5.1
by John Arbash Meinel
Make a Branch helper which can create a very basic MemoryTree with history. |
156 |
'bzrlib.tests.branch_implementations.test_revision_id_to_revno', |
|
2524.1.1
by Aaron Bentley
Revert broken changes |
157 |
'bzrlib.tests.branch_implementations.test_sprout', |
|
2220.2.13
by mbp at sourcefrog
reconnect and fix up lower-level tests for tags |
158 |
'bzrlib.tests.branch_implementations.test_tags', |
|
2246.1.3
by Robert Collins
New branch hooks: post_push, post_pull, post_commit, post_uncommit. These |
159 |
'bzrlib.tests.branch_implementations.test_uncommit', |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
160 |
'bzrlib.tests.branch_implementations.test_update', |
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
161 |
]
|
|
2018.11.2
by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests. |
162 |
# Generate a list of branch formats and their associated bzrdir formats to
|
163 |
# use.
|
|
|
1752.2.31
by Martin Pool
[broken] some support for write operations over hpss |
164 |
combinations = [(format, format._matchingbzrdir) for format in |
165 |
BranchFormat._formats.values() + _legacy_formats] |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
166 |
adapter = BranchTestProviderAdapter( |
|
2018.5.114
by Robert Collins
Commit current test pass improvements. |
167 |
# None here will cause the default vfs transport server to be used.
|
168 |
None, |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
169 |
# None here will cause a readonly decorator to be created
|
170 |
# by the TestCaseWithTransport.get_readonly_transport method.
|
|
171 |
None, |
|
|
1752.2.31
by Martin Pool
[broken] some support for write operations over hpss |
172 |
combinations) |
|
2418.5.2
by John Arbash Meinel
Move TestCaseWithBranch into branch_implementations from test_branch.py |
173 |
loader = tests.TestLoader() |
174 |
tests.adapt_modules(test_branch_implementations, adapter, loader, result) |
|
|
2018.11.2
by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests. |
175 |
|
176 |
adapt_to_smart_server = BranchTestProviderAdapter( |
|
177 |
SmartTCPServer_for_testing, |
|
178 |
ReadonlySmartTCPServer_for_testing, |
|
179 |
[(RemoteBranchFormat(), RemoteBzrDirFormat())], |
|
180 |
MemoryServer
|
|
181 |
)
|
|
|
2418.5.11
by John Arbash Meinel
[merge] bzr.dev 2447 |
182 |
tests.adapt_modules(test_branch_implementations, |
183 |
adapt_to_smart_server, |
|
184 |
loader, |
|
185 |
result) |
|
|
2018.11.2
by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests. |
186 |
|
|
1534.4.23
by Robert Collins
Move branch implementations tests into a package. |
187 |
return result |