1115
by Martin Pool
- split fetch tests into a separate file |
1 |
# Copyright (C) 2005 by Canonical Ltd
|
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
|
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
16 |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
17 |
import os |
1238
by Martin Pool
- remove a lot of dead code from fetch |
18 |
import sys |
19 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
20 |
from bzrlib.branch import Branch |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
21 |
from bzrlib.bzrdir import BzrDir |
1534.1.16
by Robert Collins
Merge from jam-integration. |
22 |
from bzrlib.builtins import merge |
1115
by Martin Pool
- split fetch tests into a separate file |
23 |
import bzrlib.errors |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
24 |
from bzrlib.tests import TestCaseWithTransport |
1185.31.25
by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py |
25 |
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
26 |
from bzrlib.tests.test_revision import make_branches |
27 |
from bzrlib.trace import mutter |
|
28 |
from bzrlib.workingtree import WorkingTree |
|
1185.1.41
by Robert Collins
massive patch from Alexander Belchenko - many PEP8 fixes, removes unused function uuid |
29 |
|
1115
by Martin Pool
- split fetch tests into a separate file |
30 |
|
1238
by Martin Pool
- remove a lot of dead code from fetch |
31 |
def has_revision(branch, revision_id): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
32 |
return branch.repository.has_revision(revision_id) |
1534.4.5
by Robert Collins
Turn branch format.open into a factory. |
33 |
|
1393
by Robert Collins
reenable remotebranch tests |
34 |
def fetch_steps(self, br_a, br_b, writable_a): |
35 |
"""A foreign test method for testing fetch locally and remotely."""
|
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
36 |
|
37 |
# TODO RBC 20060201 make this a repository test.
|
|
38 |
repo_b = br_b.repository |
|
39 |
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3])) |
|
40 |
self.assertTrue(repo_b.has_revision(br_a.revision_history()[2])) |
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
41 |
self.assertEquals(len(br_b.revision_history()), 7) |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
42 |
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[2])[0], 0) |
43 |
# branch.fetch is not supposed to alter the revision history
|
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
44 |
self.assertEquals(len(br_b.revision_history()), 7) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
45 |
self.assertFalse(repo_b.has_revision(br_a.revision_history()[3])) |
1393
by Robert Collins
reenable remotebranch tests |
46 |
|
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. |
47 |
# fetching the next revision up in sample data copies one revision
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
48 |
self.assertEquals(br_b.fetch(br_a, br_a.revision_history()[3])[0], 1) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
49 |
self.assertTrue(repo_b.has_revision(br_a.revision_history()[3])) |
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
50 |
self.assertFalse(has_revision(br_a, br_b.revision_history()[6])) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
51 |
self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5])) |
1393
by Robert Collins
reenable remotebranch tests |
52 |
|
1092.2.28
by Robert Collins
reenable test of fetching a branch with ghosts |
53 |
# When a non-branch ancestor is missing, it should be unlisted...
|
1415
by Robert Collins
remove the ancestry weave file |
54 |
# as its not reference from the inventory weave.
|
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. |
55 |
br_b4 = self.make_branch('br_4') |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
56 |
count, failures = br_b4.fetch(br_b) |
1092.2.28
by Robert Collins
reenable test of fetching a branch with ghosts |
57 |
self.assertEqual(count, 7) |
58 |
self.assertEqual(failures, []) |
|
1393
by Robert Collins
reenable remotebranch tests |
59 |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
60 |
self.assertEqual(writable_a.fetch(br_b)[0], 1) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
61 |
self.assertTrue(has_revision(br_a, br_b.revision_history()[3])) |
62 |
self.assertTrue(has_revision(br_a, br_b.revision_history()[4])) |
|
1393
by Robert Collins
reenable remotebranch tests |
63 |
|
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 |
br_b2 = self.make_branch('br_b2') |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
65 |
self.assertEquals(br_b2.fetch(br_b)[0], 7) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
66 |
self.assertTrue(has_revision(br_b2, br_b.revision_history()[4])) |
67 |
self.assertTrue(has_revision(br_b2, br_a.revision_history()[2])) |
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
68 |
self.assertFalse(has_revision(br_b2, br_a.revision_history()[3])) |
1393
by Robert Collins
reenable remotebranch tests |
69 |
|
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. |
70 |
br_a2 = self.make_branch('br_a2') |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
71 |
self.assertEquals(br_a2.fetch(br_a)[0], 9) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
72 |
self.assertTrue(has_revision(br_a2, br_b.revision_history()[4])) |
73 |
self.assertTrue(has_revision(br_a2, br_a.revision_history()[3])) |
|
74 |
self.assertTrue(has_revision(br_a2, br_a.revision_history()[2])) |
|
1393
by Robert Collins
reenable remotebranch tests |
75 |
|
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. |
76 |
br_a3 = self.make_branch('br_a3') |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
77 |
# pulling a branch with no revisions grabs nothing, regardless of
|
78 |
# whats in the inventory.
|
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
79 |
self.assertEquals(br_a3.fetch(br_a2)[0], 0) |
1393
by Robert Collins
reenable remotebranch tests |
80 |
for revno in range(4): |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
81 |
self.assertFalse( |
82 |
br_a3.repository.has_revision(br_a.revision_history()[revno])) |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
83 |
self.assertEqual(br_a3.fetch(br_a2, br_a.revision_history()[2])[0], 3) |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
84 |
# pull the 3 revisions introduced by a@u-0-3
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
85 |
fetched = br_a3.fetch(br_a2, br_a.revision_history()[3])[0] |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
86 |
self.assertEquals(fetched, 3, "fetched %d instead of 3" % fetched) |
1393
by Robert Collins
reenable remotebranch tests |
87 |
# InstallFailed should be raised if the branch is missing the revision
|
88 |
# that was requested.
|
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
89 |
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2, 'pizza') |
1393
by Robert Collins
reenable remotebranch tests |
90 |
# InstallFailed should be raised if the branch is missing a revision
|
91 |
# from its own revision history
|
|
92 |
br_a2.append_revision('a-b-c') |
|
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
93 |
self.assertRaises(bzrlib.errors.InstallFailed, br_a3.fetch, br_a2) |
1185.13.4
by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch |
94 |
#TODO: test that fetch correctly does reweaving when needed. RBC 20051008
|
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
95 |
# Note that this means - updating the weave when ghosts are filled in to
|
96 |
# add the right parents.
|
|
97 |
||
1185.13.4
by Robert Collins
make reweave visible as a weave method, and quickly integrate into fetch |
98 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
99 |
class TestFetch(TestCaseWithTransport): |
1392
by Robert Collins
reinstate testfetch test case |
100 |
|
101 |
def test_fetch(self): |
|
1115
by Martin Pool
- split fetch tests into a separate file |
102 |
#highest indices a: 5, b: 7
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
103 |
br_a, br_b = make_branches(self) |
1393
by Robert Collins
reenable remotebranch tests |
104 |
fetch_steps(self, br_a, br_b, br_a) |
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
105 |
|
1558.4.11
by Aaron Bentley
Allow merge against self, make fetching self a noop |
106 |
def test_fetch_self(self): |
107 |
wt = self.make_branch_and_tree('br') |
|
108 |
self.assertEqual(wt.branch.fetch(wt.branch), (0, [])) |
|
109 |
||
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
110 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
111 |
class TestMergeFetch(TestCaseWithTransport): |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
112 |
|
113 |
def test_merge_fetches_unrelated(self): |
|
114 |
"""Merge brings across history from unrelated source"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
115 |
wt1 = self.make_branch_and_tree('br1') |
116 |
br1 = wt1.branch |
|
117 |
wt1.commit(message='rev 1-1', rev_id='1-1') |
|
118 |
wt1.commit(message='rev 1-2', rev_id='1-2') |
|
119 |
wt2 = self.make_branch_and_tree('br2') |
|
120 |
br2 = wt2.branch |
|
121 |
wt2.commit(message='rev 2-1', rev_id='2-1') |
|
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
122 |
merge(other_revision=['br1', -1], base_revision=['br1', 0], |
123 |
this_dir='br2') |
|
124 |
self._check_revs_present(br2) |
|
125 |
||
1185.16.94
by mbp at sourcefrog
New test that merge fetches revisions from source |
126 |
def test_merge_fetches(self): |
127 |
"""Merge brings across history from source"""
|
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
128 |
wt1 = self.make_branch_and_tree('br1') |
129 |
br1 = wt1.branch |
|
130 |
wt1.commit(message='rev 1-1', rev_id='1-1') |
|
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. |
131 |
dir_2 = br1.bzrdir.sprout('br2') |
132 |
br2 = dir_2.open_branch() |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
133 |
wt1.commit(message='rev 1-2', rev_id='1-2') |
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 |
dir_2.open_workingtree().commit(message='rev 2-1', rev_id='2-1') |
1185.16.94
by mbp at sourcefrog
New test that merge fetches revisions from source |
135 |
merge(other_revision=['br1', -1], base_revision=[None, None], |
136 |
this_dir='br2') |
|
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
137 |
self._check_revs_present(br2) |
138 |
||
139 |
def _check_revs_present(self, br2): |
|
1185.16.94
by mbp at sourcefrog
New test that merge fetches revisions from source |
140 |
for rev_id in '1-1', '1-2', '2-1': |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
141 |
self.assertTrue(br2.repository.has_revision(rev_id)) |
142 |
rev = br2.repository.get_revision(rev_id) |
|
1185.16.94
by mbp at sourcefrog
New test that merge fetches revisions from source |
143 |
self.assertEqual(rev.revision_id, rev_id) |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
144 |
self.assertTrue(br2.repository.get_inventory(rev_id)) |
1185.16.94
by mbp at sourcefrog
New test that merge fetches revisions from source |
145 |
|
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
146 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
147 |
class TestMergeFileHistory(TestCaseWithTransport): |
148 |
||
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
149 |
def setUp(self): |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
150 |
super(TestMergeFileHistory, self).setUp() |
151 |
wt1 = self.make_branch_and_tree('br1') |
|
152 |
br1 = wt1.branch |
|
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
153 |
self.build_tree_contents([('br1/file', 'original contents\n')]) |
1534.4.28
by Robert Collins
first cut at merge from integration. |
154 |
wt1.add('file', 'this-file-id') |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
155 |
wt1.commit(message='rev 1-1', rev_id='1-1') |
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. |
156 |
dir_2 = br1.bzrdir.sprout('br2') |
157 |
br2 = dir_2.open_branch() |
|
158 |
wt2 = dir_2.open_workingtree() |
|
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
159 |
self.build_tree_contents([('br1/file', 'original from 1\n')]) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
160 |
wt1.commit(message='rev 1-2', rev_id='1-2') |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
161 |
self.build_tree_contents([('br1/file', 'agreement\n')]) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
162 |
wt1.commit(message='rev 1-3', rev_id='1-3') |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
163 |
self.build_tree_contents([('br2/file', 'contents in 2\n')]) |
1534.4.28
by Robert Collins
first cut at merge from integration. |
164 |
wt2.commit(message='rev 2-1', rev_id='2-1') |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
165 |
self.build_tree_contents([('br2/file', 'agreement\n')]) |
1534.4.28
by Robert Collins
first cut at merge from integration. |
166 |
wt2.commit(message='rev 2-2', rev_id='2-2') |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
167 |
|
168 |
def test_merge_fetches_file_history(self): |
|
169 |
"""Merge brings across file histories"""
|
|
170 |
br2 = Branch.open('br2') |
|
171 |
merge(other_revision=['br1', -1], base_revision=[None, None], |
|
172 |
this_dir='br2') |
|
173 |
for rev_id, text in [('1-2', 'original from 1\n'), |
|
174 |
('1-3', 'agreement\n'), |
|
175 |
('2-1', 'contents in 2\n'), |
|
176 |
('2-2', 'agreement\n')]: |
|
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
177 |
self.assertEqualDiff( |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
178 |
br2.repository.revision_tree( |
1185.65.1
by Aaron Bentley
Refactored out ControlFiles and RevisionStore from _Branch |
179 |
rev_id).get_file_text('this-file-id'), text) |
1185.16.96
by mbp at sourcefrog
More merge/fetch tests |
180 |
|
181 |
||
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
182 |
class TestHttpFetch(TestCaseWithWebserver): |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
183 |
# FIXME RBC 20060124 this really isn't web specific, perhaps an
|
184 |
# instrumented readonly transport? Can we do an instrumented
|
|
185 |
# adapter and use self.get_readonly_url ?
|
|
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
186 |
|
187 |
def test_fetch(self): |
|
188 |
#highest indices a: 5, b: 7
|
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
189 |
br_a, br_b = make_branches(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. |
190 |
br_rem_a = Branch.open(self.get_readonly_url('branch1')) |
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
191 |
fetch_steps(self, br_rem_a, br_b, br_a) |
192 |
||
1540.3.15
by Martin Pool
[merge] large merge to sync with bzr.dev |
193 |
def _count_log_matches(self, target, logs): |
194 |
"""Count the number of times the target file pattern was fetched in an http log"""
|
|
195 |
log_pattern = '%s HTTP/1.1" 200 - "-" "bzr/%s' % \ |
|
196 |
(target, bzrlib.__version__) |
|
197 |
c = 0 |
|
198 |
for line in logs: |
|
199 |
# TODO: perhaps use a regexp instead so we can match more
|
|
200 |
# precisely?
|
|
201 |
if line.find(log_pattern) > -1: |
|
202 |
c += 1 |
|
203 |
return c |
|
204 |
||
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
205 |
def test_weaves_are_retrieved_once(self): |
206 |
self.build_tree(("source/", "source/file", "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. |
207 |
wt = self.make_branch_and_tree('source') |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
208 |
branch = wt.branch |
209 |
wt.add(["file"], ["id"]) |
|
210 |
wt.commit("added file") |
|
1404
by Robert Collins
only pull remote text weaves once per fetch operation |
211 |
print >>open("source/file", 'w'), "blah" |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
212 |
wt.commit("changed file") |
1534.4.41
by Robert Collins
Branch now uses BzrDir reasonably sanely. |
213 |
target = BzrDir.create_branch_and_repo("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. |
214 |
source = Branch.open(self.get_readonly_url("source/")) |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
215 |
self.assertEqual(target.fetch(source), (2, [])) |
1540.3.15
by Martin Pool
[merge] large merge to sync with bzr.dev |
216 |
log_pattern = '%%s HTTP/1.1" 200 - "-" "bzr/%s' % bzrlib.__version__ |
1430
by Robert Collins
touchup the prefixed-store patch |
217 |
# this is the path to the literal file. As format changes
|
218 |
# occur it needs to be updated. FIXME: ask the store for the
|
|
219 |
# path.
|
|
1540.3.15
by Martin Pool
[merge] large merge to sync with bzr.dev |
220 |
self.log("web server logs are:") |
221 |
http_logs = self.get_readonly_server().logs |
|
222 |
self.log('\n'.join(http_logs)) |
|
223 |
self.assertEqual(1, self._count_log_matches('weaves/ce/id.weave', http_logs)) |
|
224 |
self.assertEqual(1, self._count_log_matches('inventory.weave', http_logs)) |
|
1417.1.12
by Robert Collins
cache revision history during read transactions |
225 |
# this r-h check test will prevent regressions, but it currently already
|
226 |
# passes, before the patch to cache-rh is applied :[
|
|
1540.3.15
by Martin Pool
[merge] large merge to sync with bzr.dev |
227 |
self.assertEqual(1, self._count_log_matches('revision-history', http_logs)) |
1530.1.18
by Robert Collins
unbreak test_fetch |
228 |
# FIXME naughty poking in there.
|
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. |
229 |
self.get_readonly_server().logs = [] |
1417.1.13
by Robert Collins
do not download remote ancestry.weave if the target revision we are stopping at is in our local store |
230 |
# check there is nothing more to fetch
|
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. |
231 |
source = Branch.open(self.get_readonly_url("source/")) |
1534.1.31
by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo. |
232 |
self.assertEqual(target.fetch(source), (0, [])) |
1540.3.15
by Martin Pool
[merge] large merge to sync with bzr.dev |
233 |
# should make just two requests
|
234 |
http_logs = self.get_readonly_server().logs |
|
235 |
self.log("web server logs are:") |
|
236 |
self.log('\n'.join(http_logs)) |
|
237 |
self.assertEqual(1, self._count_log_matches('branch-format', http_logs[0:1])) |
|
238 |
self.assertEqual(1, self._count_log_matches('revision-history', http_logs[1:2])) |
|
239 |
self.assertEqual(2, len(http_logs)) |