1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
1 |
# Copyright (C) 2005, 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
905
by Martin Pool
- merge aaron's append_multiple.patch |
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 |
|
1878.1.3
by John Arbash Meinel
some test cleanups |
22 |
from bzrlib import ( |
23 |
branch, |
|
24 |
bzrdir, |
|
25 |
errors, |
|
26 |
gpg, |
|
27 |
urlutils, |
|
28 |
transactions, |
|
2018.5.129
by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts) |
29 |
remote, |
1878.1.3
by John Arbash Meinel
some test cleanups |
30 |
repository, |
31 |
)
|
|
1534.4.2
by Robert Collins
Introduce BranchFormats - factoring out intialisation of Branches. |
32 |
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock |
1770.3.3
by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta(). |
33 |
from bzrlib.delta import TreeDelta |
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
34 |
from bzrlib.errors import (FileExists, |
35 |
NoSuchRevision, |
|
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
36 |
NoSuchFile, |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
37 |
UninitializableFormat, |
38 |
NotBranchError, |
|
39 |
)
|
|
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
40 |
from bzrlib.osutils import getcwd |
1836.3.1
by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION. |
41 |
import bzrlib.revision |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
42 |
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped |
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
43 |
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir |
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 |
1260
by Martin Pool
- some updates for fetch/update function |
45 |
from bzrlib.trace import mutter |
1534.4.4
by Robert Collins
Make BzrBranchFormat.find_format take a transport not a url for efficiency. |
46 |
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. |
47 |
from bzrlib.transport.memory import MemoryServer |
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
48 |
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. |
49 |
from bzrlib.workingtree import WorkingTree |
1092.2.25
by Robert Collins
support ghosts in commits |
50 |
|
1534.5.7
by Robert Collins
Start factoring out the upgrade policy logic. |
51 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
52 |
class TestCaseWithBranch(TestCaseWithBzrDir): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
53 |
|
54 |
def setUp(self): |
|
55 |
super(TestCaseWithBranch, self).setUp() |
|
56 |
self.branch = None |
|
57 |
||
58 |
def get_branch(self): |
|
59 |
if self.branch is None: |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
60 |
self.branch = self.make_branch('') |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
61 |
return self.branch |
62 |
||
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
63 |
def make_branch(self, relpath, format=None): |
64 |
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. |
65 |
# fixme RBC 20060210 this isnt necessarily a fixable thing,
|
66 |
# Skipped is the wrong exception to raise.
|
|
67 |
try: |
|
68 |
return self.branch_format.initialize(repo.bzrdir) |
|
69 |
except errors.UninitializableFormat: |
|
70 |
raise TestSkipped('Uninitializable branch format') |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
71 |
|
1666.1.4
by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in |
72 |
def make_repository(self, relpath, shared=False, format=None): |
73 |
made_control = self.make_bzrdir(relpath, format=format) |
|
74 |
return made_control.create_repository(shared=shared) |
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
75 |
|
76 |
||
77 |
class TestBranch(TestCaseWithBranch): |
|
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
78 |
|
1102
by Martin Pool
- merge test refactoring from robertc |
79 |
def test_append_revisions(self): |
1185.10.1
by Aaron Bentley
Added --basis option to bzr branch |
80 |
"""Test appending more than one revision"""
|
2230.3.2
by Aaron Bentley
Get all branch tests passing |
81 |
wt = self.make_branch_and_tree('tree') |
82 |
wt.commit('f', rev_id='rev1') |
|
83 |
wt.commit('f', rev_id='rev2') |
|
84 |
wt.commit('f', rev_id='rev3') |
|
85 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
86 |
br = self.get_branch() |
2230.3.2
by Aaron Bentley
Get all branch tests passing |
87 |
br.fetch(wt.branch) |
905
by Martin Pool
- merge aaron's append_multiple.patch |
88 |
br.append_revision("rev1") |
89 |
self.assertEquals(br.revision_history(), ["rev1",]) |
|
90 |
br.append_revision("rev2", "rev3") |
|
91 |
self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"]) |
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
92 |
self.assertRaises(errors.ReservedId, br.append_revision, 'current:') |
1110
by Martin Pool
- merge aaron's merge improvements: |
93 |
|
2249.5.6
by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids. |
94 |
def test_revision_ids_are_utf8(self): |
2249.5.17
by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken |
95 |
wt = self.make_branch_and_tree('tree') |
96 |
wt.commit('f', rev_id='rev1') |
|
97 |
wt.commit('f', rev_id='rev2') |
|
98 |
wt.commit('f', rev_id='rev3') |
|
99 |
||
2249.5.6
by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids. |
100 |
br = self.get_branch() |
2249.5.17
by John Arbash Meinel
[merge] bzr.dev 2293 and resolve conflicts, but still broken |
101 |
br.fetch(wt.branch) |
2249.5.6
by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids. |
102 |
br.set_revision_history(['rev1', 'rev2', 'rev3']) |
103 |
rh = br.revision_history() |
|
104 |
self.assertEqual(['rev1', 'rev2', 'rev3'], rh) |
|
105 |
for revision_id in rh: |
|
106 |
self.assertIsInstance(revision_id, str) |
|
107 |
last = br.last_revision() |
|
108 |
self.assertEqual('rev3', last) |
|
109 |
self.assertIsInstance(last, str) |
|
2249.5.19
by John Arbash Meinel
Track through the new Branch6 code, and make sure revision ids are utf8 |
110 |
revno, last = br.last_revision_info() |
111 |
self.assertEqual(3, revno) |
|
112 |
self.assertEqual('rev3', last) |
|
113 |
self.assertIsInstance(last, str) |
|
2249.5.6
by John Arbash Meinel
Make sure Branch.revision_history() also works in utf-8 revision ids. |
114 |
|
1260
by Martin Pool
- some updates for fetch/update function |
115 |
def test_fetch_revisions(self): |
116 |
"""Test fetch-revision operation."""
|
|
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. |
117 |
wt = self.make_branch_and_tree('b1') |
118 |
b1 = wt.branch |
|
2381.1.3
by Robert Collins
Review feedback. |
119 |
self.build_tree_contents([('b1/foo', '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. |
120 |
wt.add(['foo'], ['foo-id']) |
121 |
wt.commit('lala!', rev_id='revision-1', allow_pointless=False) |
|
1260
by Martin Pool
- some updates for fetch/update function |
122 |
|
2381.1.3
by Robert Collins
Review feedback. |
123 |
b2 = self.make_branch('b2') |
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
124 |
self.assertEqual((1, []), b2.fetch(b1)) |
1260
by Martin Pool
- some updates for fetch/update function |
125 |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
126 |
rev = b2.repository.get_revision('revision-1') |
127 |
tree = b2.repository.revision_tree('revision-1') |
|
1534.1.32
by Robert Collins
Deprecate direct use of fetch.Fetcher. |
128 |
self.assertEqual(tree.get_file_text('foo-id'), 'hello') |
1260
by Martin Pool
- some updates for fetch/update function |
129 |
|
1770.3.3
by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta(). |
130 |
def test_get_revision_delta(self): |
131 |
tree_a = self.make_branch_and_tree('a') |
|
2381.1.3
by Robert Collins
Review feedback. |
132 |
self.build_tree(['a/foo']) |
1770.3.3
by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta(). |
133 |
tree_a.add('foo', 'file1') |
134 |
tree_a.commit('rev1', rev_id='rev1') |
|
2381.1.3
by Robert Collins
Review feedback. |
135 |
self.build_tree(['a/vla']) |
1770.3.3
by Jelmer Vernooij
Add tests for Branch.get_revision_delta() and Repository.get_revision_delta(). |
136 |
tree_a.add('vla', 'file2') |
137 |
tree_a.commit('rev2', rev_id='rev2') |
|
138 |
||
139 |
delta = tree_a.branch.get_revision_delta(1) |
|
140 |
self.assertIsInstance(delta, TreeDelta) |
|
141 |
self.assertEqual([('foo', 'file1', 'file')], delta.added) |
|
142 |
delta = tree_a.branch.get_revision_delta(2) |
|
143 |
self.assertIsInstance(delta, TreeDelta) |
|
144 |
self.assertEqual([('vla', 'file2', 'file')], delta.added) |
|
145 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
146 |
def get_unbalanced_tree_pair(self): |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
147 |
"""Return two branches, a and b, with one file in 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. |
148 |
tree_a = self.make_branch_and_tree('a') |
2381.1.3
by Robert Collins
Review feedback. |
149 |
self.build_tree_contents([('a/b', 'b')]) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
150 |
tree_a.add('b') |
151 |
tree_a.commit("silly commit", rev_id='A') |
|
152 |
||
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. |
153 |
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. |
154 |
return tree_a, tree_b |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
155 |
|
156 |
def get_balanced_branch_pair(self): |
|
157 |
"""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. |
158 |
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. |
159 |
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. |
160 |
return tree_a, tree_b |
1442.1.67
by Robert Collins
Factor out the guts of 'pull' from the command into WorkingTree.pull(). |
161 |
|
1185.66.8
by Aaron Bentley
Applied Jelmer's patch to make clone a branch operation |
162 |
def test_clone_partial(self): |
1393.1.23
by Martin Pool
- fix cloning of part of a branch |
163 |
"""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. |
164 |
# TODO: RBC 20060208 test with a revision not on revision-history.
|
165 |
# what should that behaviour be ? Emailed the list.
|
|
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
166 |
# First, make a branch with two commits.
|
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. |
167 |
wt_a = self.make_branch_and_tree('a') |
2381.1.3
by Robert Collins
Review feedback. |
168 |
self.build_tree(['a/one']) |
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. |
169 |
wt_a.add(['one']) |
170 |
wt_a.commit('commit one', rev_id='1') |
|
2381.1.3
by Robert Collins
Review feedback. |
171 |
self.build_tree(['a/two']) |
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. |
172 |
wt_a.add(['two']) |
173 |
wt_a.commit('commit two', rev_id='2') |
|
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
174 |
# Now make a copy of the repository.
|
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. |
175 |
repo_b = self.make_repository('b') |
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
176 |
wt_a.branch.repository.copy_content_into(repo_b) |
177 |
# wt_a might be a lightweight checkout, so get a hold of the actual
|
|
178 |
# branch (because you can't do a partial clone of a lightweight
|
|
179 |
# checkout).
|
|
180 |
branch = wt_a.branch.bzrdir.open_branch() |
|
181 |
# Then make a branch where the new repository is, but specify a revision
|
|
182 |
# ID. The new branch's history will stop at the specified revision.
|
|
183 |
br_b = branch.clone(repo_b.bzrdir, revision_id='1') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
184 |
self.assertEqual('1', br_b.last_revision()) |
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. |
185 |
|
186 |
def test_sprout_partial(self): |
|
187 |
# test sprouting with a prefix of the revision-history.
|
|
188 |
# also needs not-on-revision-history behaviour defined.
|
|
189 |
wt_a = self.make_branch_and_tree('a') |
|
2381.1.3
by Robert Collins
Review feedback. |
190 |
self.build_tree(['a/one']) |
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. |
191 |
wt_a.add(['one']) |
192 |
wt_a.commit('commit one', rev_id='1') |
|
2381.1.3
by Robert Collins
Review feedback. |
193 |
self.build_tree(['a/two']) |
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. |
194 |
wt_a.add(['two']) |
195 |
wt_a.commit('commit two', rev_id='2') |
|
196 |
repo_b = self.make_repository('b') |
|
2018.5.97
by Andrew Bennetts
Fix more tests. |
197 |
repo_a = wt_a.branch.repository |
198 |
repo_a.copy_content_into(repo_b) |
|
199 |
br_b = wt_a.branch.sprout(repo_b.bzrdir, revision_id='1') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
200 |
self.assertEqual('1', br_b.last_revision()) |
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. |
201 |
|
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
202 |
def get_parented_branch(self): |
203 |
wt_a = self.make_branch_and_tree('a') |
|
2381.1.3
by Robert Collins
Review feedback. |
204 |
self.build_tree(['a/one']) |
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
205 |
wt_a.add(['one']) |
206 |
wt_a.commit('commit one', rev_id='1') |
|
207 |
||
208 |
branch_b = wt_a.bzrdir.sprout('b', revision_id='1').open_branch() |
|
209 |
self.assertEqual(wt_a.branch.base, branch_b.get_parent()) |
|
210 |
return branch_b |
|
211 |
||
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. |
212 |
def test_clone_branch_nickname(self): |
213 |
# test the nick name is preserved always
|
|
214 |
raise TestSkipped('XXX branch cloning is not yet tested..') |
|
215 |
||
216 |
def test_clone_branch_parent(self): |
|
217 |
# test the parent is preserved always
|
|
1864.7.2
by John Arbash Meinel
Test that we copy the parent across properly (if it is available) |
218 |
branch_b = self.get_parented_branch() |
219 |
repo_c = self.make_repository('c') |
|
220 |
branch_b.repository.copy_content_into(repo_c) |
|
221 |
branch_c = branch_b.clone(repo_c.bzrdir) |
|
222 |
self.assertNotEqual(None, branch_c.get_parent()) |
|
223 |
self.assertEqual(branch_b.get_parent(), branch_c.get_parent()) |
|
224 |
||
225 |
# We can also set a specific parent, and it should be honored
|
|
226 |
random_parent = 'http://bazaar-vcs.org/path/to/branch' |
|
227 |
branch_b.set_parent(random_parent) |
|
228 |
repo_d = self.make_repository('d') |
|
229 |
branch_b.repository.copy_content_into(repo_d) |
|
230 |
branch_d = branch_b.clone(repo_d.bzrdir) |
|
231 |
self.assertEqual(random_parent, branch_d.get_parent()) |
|
232 |
||
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. |
233 |
def test_sprout_branch_nickname(self): |
234 |
# test the nick name is reset always
|
|
235 |
raise TestSkipped('XXX branch sprouting is not yet tested..') |
|
236 |
||
237 |
def test_sprout_branch_parent(self): |
|
238 |
source = self.make_branch('source') |
|
239 |
target = source.bzrdir.sprout(self.get_url('target')).open_branch() |
|
240 |
self.assertEqual(source.bzrdir.root_transport.base, target.get_parent()) |
|
1804.1.1
by Aaron Bentley
Add support for submit location to bundles |
241 |
|
242 |
def test_submit_branch(self): |
|
243 |
"""Submit location can be queried and set"""
|
|
244 |
branch = self.make_branch('branch') |
|
245 |
self.assertEqual(branch.get_submit_branch(), None) |
|
246 |
branch.set_submit_branch('sftp://example.com') |
|
247 |
self.assertEqual(branch.get_submit_branch(), 'sftp://example.com') |
|
248 |
branch.set_submit_branch('sftp://example.net') |
|
249 |
self.assertEqual(branch.get_submit_branch(), 'sftp://example.net') |
|
1393.1.23
by Martin Pool
- fix cloning of part of a branch |
250 |
|
1551.12.44
by Aaron Bentley
Add (set|get)_public_branch |
251 |
def test_public_branch(self): |
252 |
"""public location can be queried and set"""
|
|
253 |
branch = self.make_branch('branch') |
|
254 |
self.assertEqual(branch.get_public_branch(), None) |
|
255 |
branch.set_public_branch('sftp://example.com') |
|
256 |
self.assertEqual(branch.get_public_branch(), 'sftp://example.com') |
|
257 |
branch.set_public_branch('sftp://example.net') |
|
258 |
self.assertEqual(branch.get_public_branch(), 'sftp://example.net') |
|
259 |
branch.set_public_branch(None) |
|
260 |
self.assertEqual(branch.get_public_branch(), None) |
|
261 |
||
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
262 |
def test_record_initial_ghost(self): |
263 |
"""Branches should support having ghosts."""
|
|
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. |
264 |
wt = self.make_branch_and_tree('.') |
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
265 |
wt.set_parent_ids(['non:existent@rev--ision--0--2'], |
266 |
allow_leftmost_as_ghost=True) |
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
267 |
rev_id = wt.commit('commit against a ghost first parent.') |
268 |
rev = wt.branch.repository.get_revision(rev_id) |
|
269 |
self.assertEqual(rev.parent_ids, ['non:existent@rev--ision--0--2']) |
|
1092.2.25
by Robert Collins
support ghosts in commits |
270 |
# parent_sha1s is not populated now, WTF. rbc 20051003
|
271 |
self.assertEqual(len(rev.parent_sha1s), 0) |
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
272 |
|
273 |
def test_record_two_ghosts(self): |
|
274 |
"""Recording with all ghosts works."""
|
|
275 |
wt = self.make_branch_and_tree('.') |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
276 |
wt.set_parent_ids([ |
277 |
'foo@azkhazan-123123-abcabc', |
|
278 |
'wibble@fofof--20050401--1928390812', |
|
279 |
],
|
|
280 |
allow_leftmost_as_ghost=True) |
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
281 |
rev_id = wt.commit("commit from ghost base with one merge") |
282 |
# the revision should have been committed with two parents
|
|
283 |
rev = wt.branch.repository.get_revision(rev_id) |
|
284 |
self.assertEqual(['foo@azkhazan-123123-abcabc', |
|
285 |
'wibble@fofof--20050401--1928390812'], |
|
286 |
rev.parent_ids) |
|
1092.2.25
by Robert Collins
support ghosts in commits |
287 |
|
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
288 |
def test_bad_revision(self): |
1534.4.28
by Robert Collins
first cut at merge from integration. |
289 |
self.assertRaises(errors.InvalidRevisionId, |
290 |
self.get_branch().repository.get_revision, |
|
291 |
None) |
|
1185.12.90
by Aaron Bentley
Fixed InvalidRevisionID handling in Branch.get_revision_xml |
292 |
|
1092.2.28
by Robert Collins
reenable test of fetching a branch with ghosts |
293 |
# TODO 20051003 RBC:
|
1092.2.25
by Robert Collins
support ghosts in commits |
294 |
# compare the gpg-to-sign info for a commit with a ghost and
|
295 |
# an identical tree without a ghost
|
|
296 |
# fetch missing should rewrite the TOC of weaves to list newly available parents.
|
|
1393.1.9
by Martin Pool
- tidy up test assertion |
297 |
|
1442.1.60
by Robert Collins
gpg sign commits if the policy says we need to |
298 |
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. |
299 |
wt = self.make_branch_and_tree('.') |
300 |
branch = wt.branch |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
301 |
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 |
302 |
from bzrlib.testament import Testament |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
303 |
strategy = gpg.LoopbackGPGStrategy(None) |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
304 |
branch.repository.sign_revision('A', strategy) |
1551.12.36
by Aaron Bentley
Fix failing tests |
305 |
self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' + |
306 |
Testament.from_revision(branch.repository, |
|
307 |
'A').as_short_text() + |
|
1551.12.52
by Aaron Bentley
speling fix |
308 |
'-----END PSEUDO-SIGNED CONTENT-----\n', |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
309 |
branch.repository.get_signature_text('A')) |
1442.1.60
by Robert Collins
gpg sign commits if the policy says we need to |
310 |
|
1442.1.62
by Robert Collins
Allow creation of testaments from uncommitted data, and use that to get signatures before committing revisions. |
311 |
def test_store_signature(self): |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
312 |
wt = self.make_branch_and_tree('.') |
313 |
branch = wt.branch |
|
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
314 |
branch.repository.store_revision_signature( |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
315 |
gpg.LoopbackGPGStrategy(None), 'FOO', 'A') |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
316 |
self.assertRaises(errors.NoSuchRevision, |
317 |
branch.repository.has_signature_for_revision_id, |
|
318 |
'A') |
|
319 |
wt.commit("base", allow_pointless=True, rev_id='A') |
|
1551.12.36
by Aaron Bentley
Fix failing tests |
320 |
self.assertEqual('-----BEGIN PSEUDO-SIGNED CONTENT-----\n' |
1551.12.52
by Aaron Bentley
speling fix |
321 |
'FOO-----END PSEUDO-SIGNED CONTENT-----\n', |
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
322 |
branch.repository.get_signature_text('A')) |
1469
by Robert Collins
Change Transport.* to work with URL's. |
323 |
|
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
324 |
def test_branch_keeps_signatures(self): |
325 |
wt = self.make_branch_and_tree('source') |
|
326 |
wt.commit('A', allow_pointless=True, rev_id='A') |
|
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
327 |
repo = wt.branch.repository |
328 |
repo.sign_revision('A', gpg.LoopbackGPGStrategy(None)) |
|
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
329 |
#FIXME: clone should work to urls,
|
330 |
# wt.clone should work to disks.
|
|
331 |
self.build_tree(['target/']) |
|
2018.5.94
by Andrew Bennetts
Various small changes in aid of making tests pass (including deleting one invalid test). |
332 |
d2 = repo.bzrdir.clone(urlutils.local_path_to_url('target')) |
333 |
self.assertEqual(repo.get_signature_text('A'), |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
334 |
d2.open_repository().get_signature_text('A')) |
1534.4.30
by Robert Collins
Test signature preservation on clone and upgrade. |
335 |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
336 |
def test_nicks(self): |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
337 |
"""Test explicit and implicit branch nicknames.
|
338 |
|
|
339 |
Nicknames are implicitly the name of the branch's directory, unless an
|
|
340 |
explicit nickname is set. That is, an explicit nickname always
|
|
341 |
overrides the implicit one.
|
|
342 |
"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
343 |
t = get_transport(self.get_url()) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
344 |
branch = self.make_branch('bzr.dev') |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
345 |
# The nick will be 'bzr.dev', because there is no explicit nick set.
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
346 |
self.assertEqual(branch.nick, 'bzr.dev') |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
347 |
# Move the branch to a different directory, 'bzr.ab'. Now that branch
|
348 |
# will report its nick as 'bzr.ab'.
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
349 |
t.move('bzr.dev', 'bzr.ab') |
350 |
branch = Branch.open(self.get_url('bzr.ab')) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
351 |
self.assertEqual(branch.nick, 'bzr.ab') |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
352 |
# Set the branch nick explicitly. This will ensure there's a branch
|
353 |
# config file in the branch.
|
|
354 |
branch.nick = "Aaron's branch" |
|
355 |
branch.nick = "Aaron's branch" |
|
2018.5.129
by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts) |
356 |
if not isinstance(branch, remote.RemoteBranch): |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
357 |
controlfilename = branch.control_files.controlfilename |
2018.5.129
by Robert Collins
Branch implementations test test_set_get_parent should not depend on local urls : the test can be valid for any url namespace. Change it to be valid in that manner. (Robert Collins, Andrew Bennetts) |
358 |
self.failUnless(t.has(t.relpath(controlfilename("branch.conf")))) |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
359 |
# Because the nick has been set explicitly, the nick is now always
|
360 |
# "Aaron's branch", regardless of directory name.
|
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
361 |
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. |
362 |
t.move('bzr.ab', 'integration') |
363 |
branch = Branch.open(self.get_url('integration')) |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
364 |
self.assertEqual(branch.nick, "Aaron's branch") |
1185.35.12
by Aaron Bentley
Got writes of existing tree configs working. |
365 |
branch.nick = u"\u1234" |
366 |
self.assertEqual(branch.nick, u"\u1234") |
|
1185.35.11
by Aaron Bentley
Added support for branch nicks |
367 |
|
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
368 |
def test_commit_nicks(self): |
369 |
"""Nicknames are committed to the revision"""
|
|
370 |
wt = self.make_branch_and_tree('bzr.dev') |
|
371 |
branch = wt.branch |
|
372 |
branch.nick = "My happy branch" |
|
373 |
wt.commit('My commit respect da nick.') |
|
374 |
committed = branch.repository.get_revision(branch.last_revision()) |
|
2018.6.1
by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS. |
375 |
self.assertEqual(committed.properties["branch-nick"], |
2381.1.1
by Robert Collins
Split out hpss test fixes which dont depend on new or altered API's. |
376 |
"My happy branch") |
377 |
||
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
378 |
def test_create_open_branch_uses_repository(self): |
379 |
try: |
|
380 |
repo = self.make_repository('.', shared=True) |
|
381 |
except errors.IncompatibleFormat: |
|
382 |
return
|
|
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
383 |
child_transport = repo.bzrdir.root_transport.clone('child') |
384 |
child_transport.mkdir('.') |
|
385 |
child_dir = self.bzrdir_format.initialize_on_transport(child_transport) |
|
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
386 |
try: |
387 |
child_branch = self.branch_format.initialize(child_dir) |
|
388 |
except errors.UninitializableFormat: |
|
389 |
# branch references are not default init'able.
|
|
390 |
return
|
|
391 |
self.assertEqual(repo.bzrdir.root_transport.base, |
|
392 |
child_branch.repository.bzrdir.root_transport.base) |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
393 |
child_branch = branch.Branch.open(self.get_url('child')) |
1534.6.4
by Robert Collins
Creating or opening a branch will use the repository if the format supports that. |
394 |
self.assertEqual(repo.bzrdir.root_transport.base, |
395 |
child_branch.repository.bzrdir.root_transport.base) |
|
396 |
||
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
397 |
def test_format_description(self): |
398 |
tree = self.make_branch_and_tree('tree') |
|
399 |
text = tree.branch._format.get_format_description() |
|
400 |
self.failUnless(len(text)) |
|
401 |
||
1732.2.4
by Martin Pool
Split check into Branch.check and Repository.check |
402 |
def test_check_branch_report_results(self): |
403 |
"""Checking a branch produces results which can be printed"""
|
|
404 |
branch = self.make_branch('.') |
|
405 |
result = branch.check() |
|
406 |
# reports results through logging
|
|
407 |
result.report_results(verbose=True) |
|
408 |
result.report_results(verbose=False) |
|
409 |
||
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
410 |
def test_get_commit_builder(self): |
411 |
self.assertIsInstance(self.make_branch(".").get_commit_builder([]), |
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
412 |
repository.CommitBuilder) |
1740.3.1
by Jelmer Vernooij
Introduce and use CommitBuilder objects. |
413 |
|
1792.1.1
by Robert Collins
Factor out revision-history synthesis to make it reusable as Branch.generate_revision_history. |
414 |
def test_generate_revision_history(self): |
415 |
"""Create a fake revision history easily."""
|
|
416 |
tree = self.make_branch_and_tree('.') |
|
417 |
rev1 = tree.commit('foo') |
|
418 |
orig_history = tree.branch.revision_history() |
|
419 |
rev2 = tree.commit('bar', allow_pointless=True) |
|
420 |
tree.branch.generate_revision_history(rev1) |
|
421 |
self.assertEqual(orig_history, tree.branch.revision_history()) |
|
422 |
||
1836.3.1
by Robert Collins
(robertc) Teach repository.get_revision_graph, and revision.common_ancestor, about NULL_REVISION. |
423 |
def test_generate_revision_history_NULL_REVISION(self): |
424 |
tree = self.make_branch_and_tree('.') |
|
425 |
rev1 = tree.commit('foo') |
|
426 |
tree.branch.generate_revision_history(bzrlib.revision.NULL_REVISION) |
|
427 |
self.assertEqual([], tree.branch.revision_history()) |
|
428 |
||
1551.8.6
by Aaron Bentley
Rename test |
429 |
def test_create_checkout(self): |
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
430 |
tree_a = self.make_branch_and_tree('a') |
431 |
branch_a = tree_a.branch |
|
1551.8.5
by Aaron Bentley
Change name to create_checkout |
432 |
checkout_b = branch_a.create_checkout('b') |
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
433 |
self.assertEqual(None, checkout_b.last_revision()) |
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
434 |
checkout_b.commit('rev1', rev_id='rev1') |
435 |
self.assertEqual('rev1', branch_a.last_revision()) |
|
436 |
self.assertNotEqual(checkout_b.branch.base, branch_a.base) |
|
437 |
||
1551.8.5
by Aaron Bentley
Change name to create_checkout |
438 |
checkout_c = branch_a.create_checkout('c', lightweight=True) |
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
439 |
self.assertEqual('rev1', checkout_c.last_revision()) |
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
440 |
checkout_c.commit('rev2', rev_id='rev2') |
441 |
self.assertEqual('rev2', branch_a.last_revision()) |
|
442 |
self.assertEqual(checkout_c.branch.base, branch_a.base) |
|
443 |
||
444 |
os.mkdir('d') |
|
1551.8.5
by Aaron Bentley
Change name to create_checkout |
445 |
checkout_d = branch_a.create_checkout('d', lightweight=True) |
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
446 |
self.assertEqual('rev2', checkout_d.last_revision()) |
1551.8.3
by Aaron Bentley
Make create_checkout_convenience a Branch method |
447 |
os.mkdir('e') |
1551.8.5
by Aaron Bentley
Change name to create_checkout |
448 |
checkout_e = branch_a.create_checkout('e') |
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
449 |
self.assertEqual('rev2', checkout_e.last_revision()) |
1425
by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar |
450 |
|
1997.1.4
by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well |
451 |
def test_create_anonymous_lightweight_checkout(self): |
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
452 |
"""A lightweight checkout from a readonly branch should succeed."""
|
1997.1.4
by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well |
453 |
tree_a = self.make_branch_and_tree('a') |
454 |
rev_id = tree_a.commit('put some content in the branch') |
|
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
455 |
# open the branch via a readonly transport
|
456 |
source_branch = bzrlib.branch.Branch.open(self.get_readonly_url('a')) |
|
1997.1.4
by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well |
457 |
# sanity check that the test will be valid
|
458 |
self.assertRaises((errors.LockError, errors.TransportNotPossible), |
|
459 |
source_branch.lock_write) |
|
460 |
checkout = source_branch.create_checkout('c', lightweight=True) |
|
461 |
self.assertEqual(rev_id, checkout.last_revision()) |
|
462 |
||
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
463 |
def test_create_anonymous_heavyweight_checkout(self): |
464 |
"""A regular checkout from a readonly branch should succeed."""
|
|
465 |
tree_a = self.make_branch_and_tree('a') |
|
466 |
rev_id = tree_a.commit('put some content in the branch') |
|
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
467 |
# open the branch via a readonly transport
|
468 |
source_branch = bzrlib.branch.Branch.open(self.get_readonly_url('a')) |
|
1997.1.5
by Robert Collins
``Branch.bind(other_branch)`` no longer takes a write lock on the |
469 |
# sanity check that the test will be valid
|
470 |
self.assertRaises((errors.LockError, errors.TransportNotPossible), |
|
471 |
source_branch.lock_write) |
|
472 |
checkout = source_branch.create_checkout('c') |
|
473 |
self.assertEqual(rev_id, checkout.last_revision()) |
|
474 |
||
2018.12.1
by Andrew Bennetts
Add TestBranch.test_set_revision_history |
475 |
def test_set_revision_history(self): |
2018.5.97
by Andrew Bennetts
Fix more tests. |
476 |
tree = self.make_branch_and_tree('a') |
477 |
tree.commit('a commit', rev_id='rev1') |
|
478 |
br = tree.branch |
|
2018.12.1
by Andrew Bennetts
Add TestBranch.test_set_revision_history |
479 |
br.set_revision_history(["rev1"]) |
480 |
self.assertEquals(br.revision_history(), ["rev1"]) |
|
481 |
br.set_revision_history([]) |
|
482 |
self.assertEquals(br.revision_history(), []) |
|
483 |
||
1551.8.4
by Aaron Bentley
Tweak import style |
484 |
|
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
485 |
class ChrootedTests(TestCaseWithBranch): |
486 |
"""A support class that provides readonly urls outside the local namespace.
|
|
487 |
||
488 |
This is done by checking if self.transport_server is a MemoryServer. if it
|
|
489 |
is then we are chrooted already, if it is not then an HttpServer is used
|
|
490 |
for readonly urls.
|
|
491 |
"""
|
|
492 |
||
493 |
def setUp(self): |
|
494 |
super(ChrootedTests, self).setUp() |
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
495 |
if not self.vfs_transport_factory == MemoryServer: |
1534.4.11
by Robert Collins
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test. |
496 |
self.transport_readonly_server = HttpServer |
1425
by Robert Collins
merge from Aaron - unbreaks open_containing and the fetch progress bar |
497 |
|
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
498 |
def test_open_containing(self): |
499 |
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. |
500 |
self.get_readonly_url('')) |
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
501 |
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. |
502 |
self.get_readonly_url('g/p/q')) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
503 |
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. |
504 |
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). |
505 |
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. |
506 |
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). |
507 |
self.assertEqual('g/p/q', relpath) |
1185.12.18
by Aaron Bentley
Fixed error handling when NotBranch on HTTP |
508 |
|
1417.1.6
by Robert Collins
introduce transactions for grouping actions done to and with branches |
509 |
|
510 |
class InstrumentedTransaction(object): |
|
511 |
||
512 |
def finish(self): |
|
513 |
self.calls.append('finish') |
|
514 |
||
515 |
def __init__(self): |
|
516 |
self.calls = [] |
|
517 |
||
518 |
||
1442.1.63
by Robert Collins
Remove self.lock_*...finally: self.unlock() dead chickens from branch.py. |
519 |
class TestDecorator(object): |
520 |
||
521 |
def __init__(self): |
|
522 |
self._calls = [] |
|
523 |
||
524 |
def lock_read(self): |
|
525 |
self._calls.append('lr') |
|
526 |
||
527 |
def lock_write(self): |
|
528 |
self._calls.append('lw') |
|
529 |
||
530 |
def unlock(self): |
|
531 |
self._calls.append('ul') |
|
532 |
||
533 |
@needs_read_lock
|
|
534 |
def do_with_read(self): |
|
535 |
return 1 |
|
536 |
||
537 |
@needs_read_lock
|
|
538 |
def except_with_read(self): |
|
539 |
raise RuntimeError |
|
540 |
||
541 |
@needs_write_lock
|
|
542 |
def do_with_write(self): |
|
543 |
return 2 |
|
544 |
||
545 |
@needs_write_lock
|
|
546 |
def except_with_write(self): |
|
547 |
raise RuntimeError |
|
548 |
||
549 |
||
550 |
class TestDecorators(TestCase): |
|
551 |
||
552 |
def test_needs_read_lock(self): |
|
553 |
branch = TestDecorator() |
|
554 |
self.assertEqual(1, branch.do_with_read()) |
|
555 |
self.assertEqual(['lr', 'ul'], branch._calls) |
|
556 |
||
557 |
def test_excepts_in_read_lock(self): |
|
558 |
branch = TestDecorator() |
|
559 |
self.assertRaises(RuntimeError, branch.except_with_read) |
|
560 |
self.assertEqual(['lr', 'ul'], branch._calls) |
|
561 |
||
562 |
def test_needs_write_lock(self): |
|
563 |
branch = TestDecorator() |
|
564 |
self.assertEqual(2, branch.do_with_write()) |
|
565 |
self.assertEqual(['lw', 'ul'], branch._calls) |
|
566 |
||
567 |
def test_excepts_in_write_lock(self): |
|
568 |
branch = TestDecorator() |
|
569 |
self.assertRaises(RuntimeError, branch.except_with_write) |
|
570 |
self.assertEqual(['lw', 'ul'], branch._calls) |
|
571 |
||
572 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
573 |
class TestBranchPushLocations(TestCaseWithBranch): |
574 |
||
1490
by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1. |
575 |
def test_get_push_location_unset(self): |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
576 |
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. |
577 |
|
578 |
def test_get_push_location_exact(self): |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
579 |
from bzrlib.config import (locations_config_filename, |
1185.31.43
by John Arbash Meinel
Reintroduced ensure_config_dir_exists() for sftp |
580 |
ensure_config_dir_exists) |
581 |
ensure_config_dir_exists() |
|
1770.2.2
by Aaron Bentley
Rename branches.conf to locations.conf |
582 |
fn = locations_config_filename() |
1185.31.39
by John Arbash Meinel
Replacing os.getcwdu() with osutils.getcwd(), |
583 |
print >> open(fn, 'wt'), ("[%s]\n" |
584 |
"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. |
585 |
self.get_branch().base[:-1]) |
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
586 |
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. |
587 |
|
588 |
def test_set_push_location(self): |
|
1878.1.3
by John Arbash Meinel
some test cleanups |
589 |
branch = self.get_branch() |
590 |
branch.set_push_location('foo') |
|
2230.3.3
by Aaron Bentley
Add more config testing |
591 |
self.assertEqual('foo', branch.get_push_location()) |
1534.4.1
by Robert Collins
Allow parameterisation of the branch initialisation for bzrlib. |
592 |
|
593 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
594 |
class TestFormat(TestCaseWithBranch): |
595 |
"""Tests for the format itself."""
|
|
596 |
||
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
597 |
def test_get_reference(self): |
598 |
"""get_reference on all regular branches should return None."""
|
|
599 |
if not self.branch_format.is_supported(): |
|
600 |
# unsupported formats are not loopback testable
|
|
601 |
# because the default open will not open them and
|
|
602 |
# they may not be initializable.
|
|
603 |
return
|
|
604 |
made_branch = self.make_branch('.') |
|
605 |
self.assertEqual(None, |
|
606 |
made_branch._format.get_reference(made_branch.bzrdir)) |
|
607 |
||
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
608 |
def test_format_initialize_find_open(self): |
609 |
# 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. |
610 |
if not self.branch_format.is_supported(): |
611 |
# unsupported formats are not loopback testable
|
|
612 |
# because the default open will not open them and
|
|
613 |
# they may not be initializable.
|
|
614 |
return
|
|
615 |
# 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. |
616 |
t = get_transport(self.get_url()) |
617 |
readonly_t = get_transport(self.get_readonly_url()) |
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
618 |
made_branch = self.make_branch('.') |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
619 |
self.failUnless(isinstance(made_branch, branch.Branch)) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
620 |
|
621 |
# find it via bzrdir opening:
|
|
622 |
opened_control = bzrdir.BzrDir.open(readonly_t.base) |
|
623 |
direct_opened_branch = opened_control.open_branch() |
|
624 |
self.assertEqual(direct_opened_branch.__class__, made_branch.__class__) |
|
625 |
self.assertEqual(opened_control, direct_opened_branch.bzrdir) |
|
626 |
self.failUnless(isinstance(direct_opened_branch._format, |
|
627 |
self.branch_format.__class__)) |
|
628 |
||
629 |
# find it via Branch.open
|
|
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
630 |
opened_branch = branch.Branch.open(readonly_t.base) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
631 |
self.failUnless(isinstance(opened_branch, made_branch.__class__)) |
632 |
self.assertEqual(made_branch._format.__class__, |
|
633 |
opened_branch._format.__class__) |
|
634 |
# if it has a unique id string, can we probe for it ?
|
|
635 |
try: |
|
636 |
self.branch_format.get_format_string() |
|
637 |
except NotImplementedError: |
|
638 |
return
|
|
1534.4.3
by Robert Collins
Implement BranchTestProviderAdapter, so tests now run across all branch formats. |
639 |
self.assertEqual(self.branch_format, |
2414.2.1
by Andrew Bennetts
Some miscellaneous new APIs, tests and other changes from the hpss branch. |
640 |
opened_control.find_branch_format()) |
1711.8.1
by John Arbash Meinel
Branch.lock_read/lock_write/unlock should handle failures |
641 |
|
2230.3.7
by Aaron Bentley
Fix binding return values |
642 |
|
2230.3.6
by Aaron Bentley
work in progress bind stuff |
643 |
class TestBound(TestCaseWithBranch): |
644 |
||
645 |
def test_bind_unbind(self): |
|
646 |
branch = self.make_branch('1') |
|
647 |
branch2 = self.make_branch('2') |
|
648 |
try: |
|
649 |
branch.bind(branch2) |
|
650 |
except errors.UpgradeRequired: |
|
651 |
raise TestSkipped('Format does not support binding') |
|
2230.3.7
by Aaron Bentley
Fix binding return values |
652 |
self.assertTrue(branch.unbind()) |
653 |
self.assertFalse(branch.unbind()) |
|
2230.3.6
by Aaron Bentley
work in progress bind stuff |
654 |
self.assertIs(None, branch.get_bound_location()) |
2230.3.31
by Aaron Bentley
Implement re-binding previously-bound branches |
655 |
|
656 |
def test_old_bound_location(self): |
|
657 |
branch = self.make_branch('branch1') |
|
658 |
try: |
|
659 |
self.assertIs(None, branch.get_old_bound_location()) |
|
660 |
except errors.UpgradeRequired: |
|
661 |
raise TestSkipped('Format does not store old bound locations') |
|
662 |
branch2 = self.make_branch('branch2') |
|
663 |
branch.bind(branch2) |
|
664 |
self.assertIs(None, branch.get_old_bound_location()) |
|
665 |
branch.unbind() |
|
666 |
self.assertContainsRe(branch.get_old_bound_location(), '\/branch2\/$') |
|
2230.3.32
by Aaron Bentley
Implement strict history policy |
667 |
|
668 |
||
669 |
class TestStrict(TestCaseWithBranch): |
|
670 |
||
671 |
def test_strict_history(self): |
|
672 |
tree1 = self.make_branch_and_tree('tree1') |
|
673 |
try: |
|
2230.3.40
by Aaron Bentley
Rename strict_revision_history to append_revisions_only |
674 |
tree1.branch.set_append_revisions_only(True) |
2230.3.32
by Aaron Bentley
Implement strict history policy |
675 |
except errors.UpgradeRequired: |
676 |
raise TestSkipped('Format does not support strict history') |
|
677 |
tree1.commit('empty commit') |
|
678 |
tree2 = tree1.bzrdir.sprout('tree2').open_workingtree() |
|
679 |
tree2.commit('empty commit 2') |
|
680 |
tree1.pull(tree2.branch) |
|
681 |
tree1.commit('empty commit 3') |
|
682 |
tree2.commit('empty commit 4') |
|
683 |
self.assertRaises(errors.DivergedBranches, tree1.pull, tree2.branch) |
|
684 |
tree2.merge_from_branch(tree1.branch) |
|
685 |
tree2.commit('empty commit 5') |
|
2230.3.40
by Aaron Bentley
Rename strict_revision_history to append_revisions_only |
686 |
self.assertRaises(errors.AppendRevisionsOnlyViolation, tree1.pull, |
2230.3.32
by Aaron Bentley
Implement strict history policy |
687 |
tree2.branch) |
688 |
tree3 = tree1.bzrdir.sprout('tree3').open_workingtree() |
|
689 |
tree3.merge_from_branch(tree2.branch) |
|
690 |
tree3.commit('empty commit 6') |
|
691 |
tree2.pull(tree3.branch) |