1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
1 |
# (C) 2005, 2006 Canonical Ltd
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
2 |
|
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.
|
|
7 |
||
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.
|
|
12 |
||
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 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
17 |
"""Tests for branch implementations - tests a branch format."""
|
18 |
||
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
19 |
import os |
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
20 |
import sys |
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
21 |
|
1508.1.25
by Robert Collins
Update per review comments. |
22 |
import bzrlib.branch |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
23 |
import bzrlib.bzrdir as bzrdir |
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
24 |
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
25 |
from bzrlib.commit import commit |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
26 |
import bzrlib.errors as errors |
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
27 |
from bzrlib.errors import (FileExists, |
28 |
NoSuchRevision, |
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
29 |
NoSuchFile, |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
30 |
UninitializableFormat, |
31 |
NotBranchError, |
|
32 |
)
|
|
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
33 |
import bzrlib.gpg |
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
34 |
from bzrlib.osutils import getcwd |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
35 |
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
36 |
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir |
1260
by Martin Pool
- some updates for fetch/update function |
37 |
from bzrlib.trace import mutter |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
38 |
import bzrlib.transactions as transactions |
1534.4.4
by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency. |
39 |
from bzrlib.transport import get_transport |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
40 |
from bzrlib.transport.http import HttpServer |
41 |
from bzrlib.transport.memory import MemoryServer |
|
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
42 |
from bzrlib.upgrade import upgrade |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
43 |
from bzrlib.workingtree import WorkingTree |
1092.2.25
by Robert Collins
support ghosts in commits |
44 |
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
45 |
|
1185.16.56
by Martin Pool
doc |
46 |
# TODO: Make a branch using basis branch, and check that it
|
47 |
# doesn't request any files that could have been avoided, by
|
|
48 |
# hooking into the Transport.
|
|
49 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
50 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
51 |
class TestCaseWithBranch(TestCaseWithBzrDir): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
52 |
|
53 |
def setUp(self): |
|
54 |
super(TestCaseWithBranch, self).setUp() |
|
55 |
self.branch = None |
|
56 |
||
57 |
def get_branch(self): |
|
58 |
if self.branch is None: |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
59 |
self.branch = self.make_branch('') |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
60 |
return self.branch |
61 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
62 |
def make_branch(self, relpath, format=None): |
63 |
repo = self.make_repository(relpath, format=format) |
|
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. |
64 |
# fixme RBC 20060210 this isnt necessarily a fixable thing,
|
65 |
# Skipped is the wrong exception to raise.
|
|
66 |
try: |
|
67 |
return self.branch_format.initialize(repo.bzrdir) |
|
68 |
except errors.UninitializableFormat: |
|
69 |
raise TestSkipped('Uninitializable branch format') |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
70 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
71 |
def make_repository(self, relpath, shared=False, format=None): |
72 |
made_control = self.make_bzrdir(relpath, format=format) |
|
73 |
return made_control.create_repository(shared=shared) |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
74 |
|
75 |
||
76 |
class TestBranch(TestCaseWithBranch): |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
77 |
|
1102
by Martin Pool
- merge test refactoring from robertc |
78 |
def test_append_revisions(self): |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
79 |
"""Test appending more than one revision"""
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
80 |
br = self.get_branch() |
905
by Martin Pool
- merge aaron's append_multiple.patch |
81 |
br.append_revision("rev1") |
82 |
self.assertEquals(br.revision_history(), ["rev1",]) |
|
83 |
br.append_revision("rev2", "rev3") |
|
84 |
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"]) |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
85 |
|
1260
by Martin Pool
- some updates for fetch/update function |
86 |
def test_fetch_revisions(self): |
87 |
"""Test fetch-revision operation."""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
88 |
get_transport(self.get_url()).mkdir('b1') |
89 |
get_transport(self.get_url()).mkdir('b2') |
|
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. |
90 |
wt = self.make_branch_and_tree('b1') |
91 |
b1 = wt.branch |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
92 |
b2 = self.make_branch('b2') |
1185.31.35
by John Arbash Meinel
Couple small fixes, all tests pass on cygwin. |
93 |
file('b1/foo', 'w').write('hello') |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
94 |
wt.add(['foo'], ['foo-id']) |
95 |
wt.commit('lala!', rev_id='revision-1', allow_pointless=False) |
|
1260
by Martin Pool
- some updates for fetch/update function |
96 |
|
97 |
mutter('start fetch') |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
98 |
self.assertEqual((1, []), b2.fetch(b1)) |
1260
by Martin Pool
- some updates for fetch/update function |
99 |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
100 |
rev = b2.repository.get_revision('revision-1') |
101 |
tree = b2.repository.revision_tree('revision-1') |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
102 |
self.assertEqual(tree.get_file_text('foo-id'), 'hello') |
1260
by Martin Pool
- some updates for fetch/update function |
103 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
104 |
def get_unbalanced_tree_pair(self): |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
105 |
"""Return two branches, a and b, with one file in a."""
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
106 |
get_transport(self.get_url()).mkdir('a') |
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. |
107 |
tree_a = self.make_branch_and_tree('a') |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
108 |
file('a/b', 'wb').write('b') |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
109 |
tree_a.add('b') |
110 |
tree_a.commit("silly commit", rev_id='A') |
|
111 |
||
112 |
get_transport(self.get_url()).mkdir('b') |
|
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. |
113 |
tree_b = self.make_branch_and_tree('b') |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
114 |
return tree_a, tree_b |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
115 |
|
116 |
def get_balanced_branch_pair(self): |
|
117 |
"""Returns br_a, br_b as with one commit in a, and b has a's stores."""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
118 |
tree_a, tree_b = self.get_unbalanced_tree_pair() |
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. |
119 |
tree_b.branch.repository.fetch(tree_a.branch.repository) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
120 |
return tree_a, tree_b |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
121 |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
122 |
def test_clone_branch(self): |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
123 |
"""Copy the stores from one branch to another"""
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
124 |
tree_a, tree_b = self.get_balanced_branch_pair() |
125 |
tree_b.commit("silly commit") |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
126 |
os.mkdir('c') |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
127 |
# this fails to test that the history from a was not used.
|
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. |
128 |
dir_c = tree_a.bzrdir.clone('c', basis=tree_b.bzrdir) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
129 |
self.assertEqual(tree_a.branch.revision_history(), |
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. |
130 |
dir_c.open_branch().revision_history()) |
1393.1.23
by Martin Pool
- fix cloning of part of a branch |
131 |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
132 |
def test_clone_partial(self): |
1393.1.23
by Martin Pool
- fix cloning of part of a branch |
133 |
"""Copy only part of the history of a branch."""
|
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. |
134 |
# TODO: RBC 20060208 test with a revision not on revision-history.
|
135 |
# what should that behaviour be ? Emailed the list.
|
|
136 |
wt_a = self.make_branch_and_tree('a') |
|
137 |
self.build_tree(['a/one']) |
|
138 |
wt_a.add(['one']) |
|
139 |
wt_a.commit('commit one', rev_id='1') |
|
140 |
self.build_tree(['a/two']) |
|
141 |
wt_a.add(['two']) |
|
142 |
wt_a.commit('commit two', rev_id='2') |
|
143 |
repo_b = self.make_repository('b') |
|
144 |
wt_a.bzrdir.open_repository().copy_content_into(repo_b) |
|
145 |
br_b = wt_a.bzrdir.open_branch().clone(repo_b.bzrdir, revision_id='1') |
|
146 |
self.assertEqual(br_b.last_revision(), '1') |
|
147 |
||
148 |
def test_sprout_partial(self): |
|
149 |
# test sprouting with a prefix of the revision-history.
|
|
150 |
# also needs not-on-revision-history behaviour defined.
|
|
151 |
wt_a = self.make_branch_and_tree('a') |
|
152 |
self.build_tree(['a/one']) |
|
153 |
wt_a.add(['one']) |
|
154 |
wt_a.commit('commit one', rev_id='1') |
|
155 |
self.build_tree(['a/two']) |
|
156 |
wt_a.add(['two']) |
|
157 |
wt_a.commit('commit two', rev_id='2') |
|
158 |
repo_b = self.make_repository('b') |
|
159 |
wt_a.bzrdir.open_repository().copy_content_into(repo_b) |
|
160 |
br_b = wt_a.bzrdir.open_branch().sprout(repo_b.bzrdir, revision_id='1') |
|
161 |
self.assertEqual(br_b.last_revision(), '1') |
|
162 |
||
163 |
def test_clone_branch_nickname(self): |
|
164 |
# test the nick name is preserved always
|
|
165 |
raise TestSkipped('XXX branch cloning is not yet tested..') |
|
166 |
||
167 |
def test_clone_branch_parent(self): |
|
168 |
# test the parent is preserved always
|
|
169 |
raise TestSkipped('XXX branch cloning is not yet tested..') |
|
170 |
||
171 |
def test_sprout_branch_nickname(self): |
|
172 |
# test the nick name is reset always
|
|
173 |
raise TestSkipped('XXX branch sprouting is not yet tested..') |
|
174 |
||
175 |
def test_sprout_branch_parent(self): |
|
176 |
source = self.make_branch('source') |
|
177 |
target = source.bzrdir.sprout(self.get_url('target')).open_branch() |
|
178 |
self.assertEqual(source.bzrdir.root_transport.base, target.get_parent()) |
|
1393.1.23
by Martin Pool
- fix cloning of part of a branch |
179 |
|
1092.2.25
by Robert Collins
support ghosts in commits |
180 |
def test_record_initial_ghost_merge(self): |
181 |
"""A pending merge with no revision present is still a merge."""
|
|
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. |
182 |
wt = self.make_branch_and_tree('.') |
183 |
branch = wt.branch |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
184 |
wt.add_pending_merge('non:existent@rev--ision--0--2') |
185 |
wt.commit('pretend to merge nonexistent-revision', rev_id='first') |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
186 |
rev = branch.repository.get_revision(branch.last_revision()) |
1092.2.25
by Robert Collins
support ghosts in commits |
187 |
self.assertEqual(len(rev.parent_ids), 1) |
188 |
# parent_sha1s is not populated now, WTF. rbc 20051003
|
|
189 |
self.assertEqual(len(rev.parent_sha1s), 0) |
|
190 |
self.assertEqual(rev.parent_ids[0], 'non:existent@rev--ision--0--2') |
|
191 |
||
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
192 |
def test_bad_revision(self): |
1534.4.28
by Robert Collins
first cut at merge from integration. |
193 |
self.assertRaises(errors.InvalidRevisionId, |
194 |
self.get_branch().repository.get_revision, |
|
195 |
None) |
|
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
196 |
|
1092.2.28
by Robert Collins
reenable test of fetching a branch with ghosts |
197 |
# TODO 20051003 RBC:
|
1092.2.25
by Robert Collins
support ghosts in commits |
198 |
# compare the gpg-to-sign info for a commit with a ghost and
|
199 |
# an identical tree without a ghost
|
|
200 |
# fetch missing should rewrite the TOC of weaves to list newly available parents.
|
|
1393.1.9
by Martin Pool
- tidy up test assertion |
201 |
|
1092.2.27
by Robert Collins
reenable pending merge tests in testbranch.py |
202 |
def test_pending_merges(self): |
203 |
"""Tracking pending-merged revisions."""
|
|
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. |
204 |
wt = self.make_branch_and_tree('.') |
205 |
b = wt.branch |
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
206 |
self.assertEquals(wt.pending_merges(), []) |
1457.1.15
by Robert Collins
Move add_pending_merge to WorkingTree. |
207 |
wt.add_pending_merge('foo@azkhazan-123123-abcabc') |
208 |
self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc']) |
|
209 |
wt.add_pending_merge('foo@azkhazan-123123-abcabc') |
|
210 |
self.assertEquals(wt.pending_merges(), ['foo@azkhazan-123123-abcabc']) |
|
211 |
wt.add_pending_merge('wibble@fofof--20050401--1928390812') |
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
212 |
self.assertEquals(wt.pending_merges(), |
1092.2.27
by Robert Collins
reenable pending merge tests in testbranch.py |
213 |
['foo@azkhazan-123123-abcabc', |
214 |
'wibble@fofof--20050401--1928390812']) |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
215 |
wt.commit("commit from base with two merges") |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
216 |
rev = b.repository.get_revision(b.revision_history()[0]) |
1092.2.27
by Robert Collins
reenable pending merge tests in testbranch.py |
217 |
self.assertEquals(len(rev.parent_ids), 2) |
218 |
self.assertEquals(rev.parent_ids[0], |
|
219 |
'foo@azkhazan-123123-abcabc') |
|
220 |
self.assertEquals(rev.parent_ids[1], |
|
221 |
'wibble@fofof--20050401--1928390812') |
|
222 |
# list should be cleared when we do a commit
|
|
1457.1.14
by Robert Collins
Move pending_merges() to WorkingTree. |
223 |
self.assertEquals(wt.pending_merges(), []) |
1425
by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar |
224 |
|
1442.1.60
by Robert Collins
gpg sign commits if the policy says we need to |
225 |
def test_sign_existing_revision(self): |
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. |
226 |
wt = self.make_branch_and_tree('.') |
227 |
branch = wt.branch |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
228 |
wt.commit("base", allow_pointless=True, rev_id='A') |
1442.1.60
by Robert Collins
gpg sign commits if the policy says we need to |
229 |
from bzrlib.testament import Testament |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
230 |
strategy = bzrlib.gpg.LoopbackGPGStrategy(None) |
231 |
branch.repository.sign_revision('A', strategy) |
|
232 |
self.assertEqual(Testament.from_revision(branch.repository, |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
233 |
'A').as_short_text(), |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
234 |
branch.repository.get_signature_text('A')) |
1442.1.60
by Robert Collins
gpg sign commits if the policy says we need to |
235 |
|
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
236 |
def test_store_signature(self): |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
237 |
wt = self.make_branch_and_tree('.') |
238 |
branch = wt.branch |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
239 |
branch.repository.store_revision_signature( |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
240 |
bzrlib.gpg.LoopbackGPGStrategy(None), 'FOO', 'A') |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
241 |
self.assertRaises(errors.NoSuchRevision, |
242 |
branch.repository.has_signature_for_revision_id, |
|
243 |
'A') |
|
244 |
wt.commit("base", allow_pointless=True, rev_id='A') |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
245 |
self.assertEqual('FOO', |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
246 |
branch.repository.get_signature_text('A')) |
1469
by Robert Collins
Change Transport.* to work with URL's. |
247 |
|
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
248 |
def test_branch_keeps_signatures(self): |
249 |
wt = self.make_branch_and_tree('source') |
|
250 |
wt.commit('A', allow_pointless=True, rev_id='A') |
|
251 |
wt.branch.repository.sign_revision('A', |
|
252 |
bzrlib.gpg.LoopbackGPGStrategy(None)) |
|
253 |
#FIXME: clone should work to urls,
|
|
254 |
# wt.clone should work to disks.
|
|
255 |
self.build_tree(['target/']) |
|
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. |
256 |
d2 = wt.bzrdir.clone('target') |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
257 |
self.assertEqual(wt.branch.repository.get_signature_text('A'), |
258 |
d2.open_repository().get_signature_text('A')) |
|
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
259 |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
260 |
def test_nicks(self): |
261 |
"""Branch nicknames"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
262 |
t = get_transport(self.get_url()) |
263 |
t.mkdir('bzr.dev') |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
264 |
branch = self.make_branch('bzr.dev') |
1185.35.11
by Aaron Bentley
Added support for branch nicks |
265 |
self.assertEqual(branch.nick, 'bzr.dev') |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
266 |
t.move('bzr.dev', 'bzr.ab') |
267 |
branch = Branch.open(self.get_url('bzr.ab')) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
268 |
self.assertEqual(branch.nick, 'bzr.ab') |
269 |
branch.nick = "Aaron's branch" |
|
1185.35.12
by Aaron Bentley
Got writes of existing tree configs working. |
270 |
branch.nick = "Aaron's branch" |
1534.4.28
by Robert Collins
first cut at merge from integration. |
271 |
self.failUnless( |
272 |
t.has( |
|
273 |
t.relpath( |
|
274 |
branch.control_files.controlfilename("branch.conf") |
|
275 |
)
|
|
276 |
)
|
|
277 |
)
|
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
278 |
self.assertEqual(branch.nick, "Aaron's branch") |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
279 |
t.move('bzr.ab', 'integration') |
280 |
branch = Branch.open(self.get_url('integration')) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
281 |
self.assertEqual(branch.nick, "Aaron's branch") |
1185.35.12
by Aaron Bentley
Got writes of existing tree configs working. |
282 |
branch.nick = u"\u1234" |
283 |
self.assertEqual(branch.nick, u"\u1234") |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
284 |
|
1185.35.15
by Aaron Bentley
Added branch nicks to revisions |
285 |
def test_commit_nicks(self): |
286 |
"""Nicknames are committed to the revision"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
287 |
get_transport(self.get_url()).mkdir('bzr.dev') |
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. |
288 |
wt = self.make_branch_and_tree('bzr.dev') |
289 |
branch = wt.branch |
|
1185.35.15
by Aaron Bentley
Added branch nicks to revisions |
290 |
branch.nick = "My happy branch" |
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. |
291 |
wt.commit('My commit respect da nick.') |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
292 |
committed = branch.repository.get_revision(branch.last_revision()) |
1185.35.15
by Aaron Bentley
Added branch nicks to revisions |
293 |
self.assertEqual(committed.properties["branch-nick"], |
294 |
"My happy branch") |
|
295 |
||
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
296 |
def test_create_open_branch_uses_repository(self): |
297 |
try: |
|
298 |
repo = self.make_repository('.', shared=True) |
|
299 |
except errors.IncompatibleFormat: |
|
300 |
return
|
|
301 |
repo.bzrdir.root_transport.mkdir('child') |
|
302 |
child_dir = self.bzrdir_format.initialize('child') |
|
303 |
try: |
|
304 |
child_branch = self.branch_format.initialize(child_dir) |
|
305 |
except errors.UninitializableFormat: |
|
306 |
# branch references are not default init'able.
|
|
307 |
return
|
|
308 |
self.assertEqual(repo.bzrdir.root_transport.base, |
|
309 |
child_branch.repository.bzrdir.root_transport.base) |
|
310 |
child_branch = bzrlib.branch.Branch.open(self.get_url('child')) |
|
311 |
self.assertEqual(repo.bzrdir.root_transport.base, |
|
312 |
child_branch.repository.bzrdir.root_transport.base) |
|
313 |
||
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
314 |
def test_format_description(self): |
315 |
tree = self.make_branch_and_tree('tree') |
|
316 |
text = tree.branch._format.get_format_description() |
|
317 |
self.failUnless(len(text)) |
|
318 |
||
1425
by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar |
319 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
320 |
class ChrootedTests(TestCaseWithBranch): |
321 |
"""A support class that provides readonly urls outside the local namespace.
|
|
322 |
||
323 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
324 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
325 |
for readonly urls.
|
|
326 |
"""
|
|
327 |
||
328 |
def setUp(self): |
|
329 |
super(ChrootedTests, self).setUp() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
330 |
if not self.transport_server == MemoryServer: |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
331 |
self.transport_readonly_server = HttpServer |
1425
by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar |
332 |
|
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
333 |
def test_open_containing(self): |
334 |
self.assertRaises(NotBranchError, Branch.open_containing, |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
335 |
self.get_readonly_url('')) |
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
336 |
self.assertRaises(NotBranchError, Branch.open_containing, |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
337 |
self.get_readonly_url('g/p/q')) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
338 |
branch = self.make_branch('.') |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
339 |
branch, relpath = Branch.open_containing(self.get_readonly_url('')) |
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
340 |
self.assertEqual('', relpath) |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
341 |
branch, relpath = Branch.open_containing(self.get_readonly_url('g/p/q')) |
1442.1.64
by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path). |
342 |
self.assertEqual('g/p/q', relpath) |
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
343 |
|
1110
by Martin Pool
- merge aaron's merge improvements: |
344 |
# TODO: rewrite this as a regular unittest, without relying on the displayed output
|
345 |
# >>> from bzrlib.commit import commit
|
|
346 |
# >>> bzrlib.trace.silent = True
|
|
347 |
# >>> br1 = ScratchBranch(files=['foo', 'bar'])
|
|
1508.1.5
by Robert Collins
Move add from Branch to WorkingTree. |
348 |
# >>> br1.working_tree().add('foo')
|
349 |
# >>> br1.working_tree().add('bar')
|
|
1110
by Martin Pool
- merge aaron's merge improvements: |
350 |
# >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
|
351 |
# >>> br2 = ScratchBranch()
|
|
352 |
# >>> br2.update_revisions(br1)
|
|
353 |
# Added 2 texts.
|
|
354 |
# Added 1 inventories.
|
|
355 |
# Added 1 revisions.
|
|
356 |
# >>> br2.revision_history()
|
|
357 |
# [u'REVISION-ID-1']
|
|
358 |
# >>> br2.update_revisions(br1)
|
|
359 |
# Added 0 revisions.
|
|
360 |
# >>> br1.text_store.total_size() == br2.text_store.total_size()
|
|
361 |
# True
|
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
362 |
|
363 |
class InstrumentedTransaction(object): |
|
364 |
||
365 |
def finish(self): |
|
366 |
self.calls.append('finish') |
|
367 |
||
368 |
def __init__(self): |
|
369 |
self.calls = [] |
|
370 |
||
371 |
||
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
372 |
class TestDecorator(object): |
373 |
||
374 |
def __init__(self): |
|
375 |
self._calls = [] |
|
376 |
||
377 |
def lock_read(self): |
|
378 |
self._calls.append('lr') |
|
379 |
||
380 |
def lock_write(self): |
|
381 |
self._calls.append('lw') |
|
382 |
||
383 |
def unlock(self): |
|
384 |
self._calls.append('ul') |
|
385 |
||
386 |
@needs_read_lock
|
|
387 |
def do_with_read(self): |
|
388 |
return 1 |
|
389 |
||
390 |
@needs_read_lock
|
|
391 |
def except_with_read(self): |
|
392 |
raise RuntimeError |
|
393 |
||
394 |
@needs_write_lock
|
|
395 |
def do_with_write(self): |
|
396 |
return 2 |
|
397 |
||
398 |
@needs_write_lock
|
|
399 |
def except_with_write(self): |
|
400 |
raise RuntimeError |
|
401 |
||
402 |
||
403 |
class TestDecorators(TestCase): |
|
404 |
||
405 |
def test_needs_read_lock(self): |
|
406 |
branch = TestDecorator() |
|
407 |
self.assertEqual(1, branch.do_with_read()) |
|
408 |
self.assertEqual(['lr', 'ul'], branch._calls) |
|
409 |
||
410 |
def test_excepts_in_read_lock(self): |
|
411 |
branch = TestDecorator() |
|
412 |
self.assertRaises(RuntimeError, branch.except_with_read) |
|
413 |
self.assertEqual(['lr', 'ul'], branch._calls) |
|
414 |
||
415 |
def test_needs_write_lock(self): |
|
416 |
branch = TestDecorator() |
|
417 |
self.assertEqual(2, branch.do_with_write()) |
|
418 |
self.assertEqual(['lw', 'ul'], branch._calls) |
|
419 |
||
420 |
def test_excepts_in_write_lock(self): |
|
421 |
branch = TestDecorator() |
|
422 |
self.assertRaises(RuntimeError, branch.except_with_write) |
|
423 |
self.assertEqual(['lw', 'ul'], branch._calls) |
|
424 |
||
425 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
426 |
class TestBranchTransaction(TestCaseWithBranch): |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
427 |
|
428 |
def setUp(self): |
|
429 |
super(TestBranchTransaction, self).setUp() |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
430 |
self.branch = None |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
431 |
|
432 |
def test_default_get_transaction(self): |
|
433 |
"""branch.get_transaction on a new branch should give a PassThrough."""
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
434 |
self.failUnless(isinstance(self.get_branch().get_transaction(), |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
435 |
transactions.PassThroughTransaction)) |
436 |
||
437 |
def test__set_new_transaction(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
438 |
self.get_branch()._set_transaction(transactions.ReadOnlyTransaction()) |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
439 |
|
440 |
def test__set_over_existing_transaction_raises(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
441 |
self.get_branch()._set_transaction(transactions.ReadOnlyTransaction()) |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
442 |
self.assertRaises(errors.LockError, |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
443 |
self.get_branch()._set_transaction, |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
444 |
transactions.ReadOnlyTransaction()) |
445 |
||
446 |
def test_finish_no_transaction_raises(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
447 |
self.assertRaises(errors.LockError, self.get_branch()._finish_transaction) |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
448 |
|
449 |
def test_finish_readonly_transaction_works(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
450 |
self.get_branch()._set_transaction(transactions.ReadOnlyTransaction()) |
451 |
self.get_branch()._finish_transaction() |
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
452 |
self.assertEqual(None, self.get_branch().control_files._transaction) |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
453 |
|
454 |
def test_unlock_calls_finish(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
455 |
self.get_branch().lock_read() |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
456 |
transaction = InstrumentedTransaction() |
1534.4.28
by Robert Collins
first cut at merge from integration. |
457 |
self.get_branch().control_files._transaction = transaction |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
458 |
self.get_branch().unlock() |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
459 |
self.assertEqual(['finish'], transaction.calls) |
460 |
||
461 |
def test_lock_read_acquires_ro_transaction(self): |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
462 |
self.get_branch().lock_read() |
463 |
self.failUnless(isinstance(self.get_branch().get_transaction(), |
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
464 |
transactions.ReadOnlyTransaction)) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
465 |
self.get_branch().unlock() |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
466 |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
467 |
def test_lock_write_acquires_write_transaction(self): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
468 |
self.get_branch().lock_write() |
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
469 |
# cannot use get_transaction as its magic
|
1534.4.28
by Robert Collins
first cut at merge from integration. |
470 |
self.failUnless(isinstance(self.get_branch().control_files._transaction, |
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
471 |
transactions.WriteTransaction)) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
472 |
self.get_branch().unlock() |
473 |
||
474 |
||
475 |
class TestBranchPushLocations(TestCaseWithBranch): |
|
476 |
||
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
477 |
def test_get_push_location_unset(self): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
478 |
self.assertEqual(None, self.get_branch().get_push_location()) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
479 |
|
480 |
def test_get_push_location_exact(self): |
|
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
481 |
from bzrlib.config import (branches_config_filename, |
482 |
ensure_config_dir_exists) |
|
483 |
ensure_config_dir_exists() |
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
484 |
fn = branches_config_filename() |
485 |
print >> open(fn, 'wt'), ("[%s]\n" |
|
486 |
"push_location=foo" % |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
487 |
self.get_branch().base[:-1]) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
488 |
self.assertEqual("foo", self.get_branch().get_push_location()) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
489 |
|
490 |
def test_set_push_location(self): |
|
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
491 |
from bzrlib.config import (branches_config_filename, |
492 |
ensure_config_dir_exists) |
|
493 |
ensure_config_dir_exists() |
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
494 |
fn = branches_config_filename() |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
495 |
self.get_branch().set_push_location('foo') |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
496 |
self.assertFileEqual("[%s]\n" |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
497 |
"push_location = foo" % self.get_branch().base[:-1], |
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
498 |
fn) |
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
499 |
|
500 |
# TODO RBC 20051029 test getting a push location from a branch in a
|
|
501 |
# recursive section - that is, it appends the branch name.
|
|
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
502 |
|
503 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
504 |
class TestFormat(TestCaseWithBranch): |
505 |
"""Tests for the format itself."""
|
|
506 |
||
507 |
def test_format_initialize_find_open(self): |
|
508 |
# loopback test to check the current format initializes to itself.
|
|
1534.4.7
by Robert Collins
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same. |
509 |
if not self.branch_format.is_supported(): |
510 |
# unsupported formats are not loopback testable
|
|
511 |
# because the default open will not open them and
|
|
512 |
# they may not be initializable.
|
|
513 |
return
|
|
514 |
# supported formats must be able to init and open
|
|
1534.4.12
by Robert Collins
Tweak formats implementation test to exercise readonly and readwrite transports. |
515 |
t = get_transport(self.get_url()) |
516 |
readonly_t = get_transport(self.get_readonly_url()) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
517 |
made_branch = self.make_branch('.') |
1508.1.25
by Robert Collins
Update per review comments. |
518 |
self.failUnless(isinstance(made_branch, bzrlib.branch.Branch)) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
519 |
|
520 |
# find it via bzrdir opening:
|
|
521 |
opened_control = bzrdir.BzrDir.open(readonly_t.base) |
|
522 |
direct_opened_branch = opened_control.open_branch() |
|
523 |
self.assertEqual(direct_opened_branch.__class__, made_branch.__class__) |
|
524 |
self.assertEqual(opened_control, direct_opened_branch.bzrdir) |
|
525 |
self.failUnless(isinstance(direct_opened_branch._format, |
|
526 |
self.branch_format.__class__)) |
|
527 |
||
528 |
# find it via Branch.open
|
|
1508.1.25
by Robert Collins
Update per review comments. |
529 |
opened_branch = bzrlib.branch.Branch.open(readonly_t.base) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
530 |
self.failUnless(isinstance(opened_branch, made_branch.__class__)) |
531 |
self.assertEqual(made_branch._format.__class__, |
|
532 |
opened_branch._format.__class__) |
|
533 |
# if it has a unique id string, can we probe for it ?
|
|
534 |
try: |
|
535 |
self.branch_format.get_format_string() |
|
536 |
except NotImplementedError: |
|
537 |
return
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
538 |
self.assertEqual(self.branch_format, |
1508.1.25
by Robert Collins
Update per review comments. |
539 |
bzrlib.branch.BranchFormat.find_format(opened_control)) |