bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
6614.1.3
by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual. |
1 |
# Copyright (C) 2006-2012, 2016 Canonical Ltd
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
2 |
#
|
3 |
# Authors:
|
|
4 |
# Johan Rydberg <jrydberg@gnu.org>
|
|
5 |
#
|
|
6 |
# This program is free software; you can redistribute it and/or modify
|
|
7 |
# it under the terms of the GNU General Public License as published by
|
|
8 |
# the Free Software Foundation; either version 2 of the License, or
|
|
9 |
# (at your option) any later version.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
10 |
#
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
11 |
# This program is distributed in the hope that it will be useful,
|
12 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
13 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
14 |
# GNU General Public License for more details.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
15 |
#
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
16 |
# You should have received a copy of the GNU General Public License
|
17 |
# along with this program; if not, write to the Free Software
|
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
18 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
19 |
|
20 |
||
|
1704.2.15
by Martin Pool
Remove TODO about knit testing printed from test suite |
21 |
# TODO: might be nice to create a versionedfile with some type of corruption
|
22 |
# considered typical and check that it can be detected/corrected.
|
|
23 |
||
|
5590.1.1
by John Arbash Meinel
Stop using tuned_gzip, it seems to give incorrect results on python 2.7 |
24 |
from gzip import GzipFile |
|
6631.2.3
by Martin
Fix per_versionedfile test failures and rethink future_builtins |
25 |
import itertools |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
26 |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
27 |
from .. import ( |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
28 |
errors, |
|
4593.5.35
by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry. |
29 |
graph as _mod_graph, |
|
2309.4.7
by John Arbash Meinel
Update VersionedFile tests to ensure that they can take Unicode, |
30 |
osutils, |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
31 |
progress, |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
32 |
transport, |
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
33 |
ui, |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
34 |
)
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
35 |
from ..bzr import ( |
36 |
groupcompress, |
|
37 |
knit as _mod_knit, |
|
38 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
39 |
from ..errors import ( |
|
6670.4.1
by Jelmer Vernooij
Update imports. |
40 |
RevisionNotPresent, |
41 |
RevisionAlreadyPresent, |
|
42 |
)
|
|
43 |
from ..bzr.knit import ( |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
44 |
cleanup_pack_knit, |
45 |
make_file_factory, |
|
46 |
make_pack_factory, |
|
|
2770.1.1
by Aaron Bentley
Initial implmentation of plain knit annotation |
47 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
48 |
from ..sixish import ( |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
49 |
BytesIO, |
|
6631.2.3
by Martin
Fix per_versionedfile test failures and rethink future_builtins |
50 |
zip, |
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
51 |
)
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
52 |
from . import ( |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
53 |
TestCase, |
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
54 |
TestCaseWithMemoryTransport, |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
55 |
TestNotApplicable, |
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
56 |
TestSkipped, |
57 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
58 |
from .http_utils import TestCaseWithWebserver |
59 |
from ..transport.memory import MemoryTransport |
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
60 |
from ..bzr import versionedfile as versionedfile |
61 |
from ..bzr.versionedfile import ( |
|
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
62 |
ConstantMapper, |
63 |
HashEscapedPrefixMapper, |
|
64 |
PrefixMapper, |
|
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
65 |
VirtualVersionedFiles, |
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
66 |
make_versioned_files_factory, |
67 |
)
|
|
|
6731
by Jelmer Vernooij
Move weave errors to breezy.bzr.weave. |
68 |
from ..bzr.weave import ( |
69 |
WeaveFile, |
|
70 |
WeaveInvalidChecksum, |
|
71 |
)
|
|
|
6670.4.1
by Jelmer Vernooij
Update imports. |
72 |
from ..bzr.weavefile import write_weave |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
73 |
from .scenarios import load_tests_apply_scenarios |
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
74 |
|
75 |
||
76 |
load_tests = load_tests_apply_scenarios |
|
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
77 |
|
78 |
||
|
3350.3.11
by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error. |
79 |
def get_diamond_vf(f, trailing_eol=True, left_only=False): |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
80 |
"""Get a diamond graph to exercise deltas and merges. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
81 |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
82 |
:param trailing_eol: If True end the last line with \n.
|
83 |
"""
|
|
84 |
parents = { |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
85 |
b'origin': (), |
86 |
b'base': ((b'origin',),), |
|
87 |
b'left': ((b'base',),), |
|
88 |
b'right': ((b'base',),), |
|
89 |
b'merged': ((b'left',), (b'right',)), |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
90 |
}
|
91 |
# insert a diamond graph to exercise deltas and merges.
|
|
92 |
if trailing_eol: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
93 |
last_char = b'\n' |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
94 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
95 |
last_char = b'' |
96 |
f.add_lines(b'origin', [], [b'origin' + last_char]) |
|
97 |
f.add_lines(b'base', [b'origin'], [b'base' + last_char]) |
|
98 |
f.add_lines(b'left', [b'base'], [b'base\n', b'left' + last_char]) |
|
|
3350.3.11
by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error. |
99 |
if not left_only: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
100 |
f.add_lines(b'right', [b'base'], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
101 |
[b'base\n', b'right' + last_char]) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
102 |
f.add_lines(b'merged', [b'left', b'right'], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
103 |
[b'base\n', b'left\n', b'right\n', b'merged' + last_char]) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
104 |
return f, parents |
105 |
||
106 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
107 |
def get_diamond_files(files, key_length, trailing_eol=True, left_only=False, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
108 |
nograph=False, nokeys=False): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
109 |
"""Get a diamond graph to exercise deltas and merges. |
110 |
||
111 |
This creates a 5-node graph in files. If files supports 2-length keys two
|
|
112 |
graphs are made to exercise the support for multiple ids.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
113 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
114 |
:param trailing_eol: If True end the last line with \n.
|
115 |
:param key_length: The length of keys in files. Currently supports length 1
|
|
116 |
and 2 keys.
|
|
117 |
:param left_only: If True do not add the right and merged nodes.
|
|
118 |
:param nograph: If True, do not provide parents to the add_lines calls;
|
|
119 |
this is useful for tests that need inserted data but have graphless
|
|
120 |
stores.
|
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
121 |
:param nokeys: If True, pass None is as the key for all insertions.
|
122 |
Currently implies nograph.
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
123 |
:return: The results of the add_lines calls.
|
124 |
"""
|
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
125 |
if nokeys: |
126 |
nograph = True |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
127 |
if key_length == 1: |
128 |
prefixes = [()] |
|
129 |
else: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
130 |
prefixes = [(b'FileA',), (b'FileB',)] |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
131 |
# insert a diamond graph to exercise deltas and merges.
|
132 |
if trailing_eol: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
133 |
last_char = b'\n' |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
134 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
135 |
last_char = b'' |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
136 |
result = [] |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
137 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
138 |
def get_parents(suffix_list): |
139 |
if nograph: |
|
140 |
return () |
|
141 |
else: |
|
142 |
result = [prefix + suffix for suffix in suffix_list] |
|
143 |
return result |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
144 |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
145 |
def get_key(suffix): |
146 |
if nokeys: |
|
147 |
return (None, ) |
|
148 |
else: |
|
149 |
return (suffix,) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
150 |
# we loop over each key because that spreads the inserts across prefixes,
|
151 |
# which is how commit operates.
|
|
152 |
for prefix in prefixes: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
153 |
result.append(files.add_lines(prefix + get_key(b'origin'), (), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
154 |
[b'origin' + last_char])) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
155 |
for prefix in prefixes: |
156 |
result.append(files.add_lines(prefix + get_key(b'base'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
157 |
get_parents([(b'origin',)]), [b'base' + last_char])) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
158 |
for prefix in prefixes: |
159 |
result.append(files.add_lines(prefix + get_key(b'left'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
160 |
get_parents([(b'base',)]), |
161 |
[b'base\n', b'left' + last_char])) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
162 |
if not left_only: |
163 |
for prefix in prefixes: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
164 |
result.append(files.add_lines(prefix + get_key(b'right'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
165 |
get_parents([(b'base',)]), |
166 |
[b'base\n', b'right' + last_char])) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
167 |
for prefix in prefixes: |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
168 |
result.append(files.add_lines(prefix + get_key(b'merged'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
169 |
get_parents( |
170 |
[(b'left',), (b'right',)]), |
|
171 |
[b'base\n', b'left\n', b'right\n', b'merged' + last_char])) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
172 |
return result |
173 |
||
174 |
||
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
175 |
class VersionedFileTestMixIn(object): |
176 |
"""A mixin test class for testing VersionedFiles. |
|
177 |
||
178 |
This is not an adaptor-style test at this point because
|
|
179 |
theres no dynamic substitution of versioned file implementations,
|
|
180 |
they are strictly controlled by their owning repositories.
|
|
181 |
"""
|
|
182 |
||
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
183 |
def get_transaction(self): |
184 |
if not hasattr(self, '_transaction'): |
|
185 |
self._transaction = None |
|
186 |
return self._transaction |
|
187 |
||
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
188 |
def test_add(self): |
189 |
f = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
190 |
f.add_lines(b'r0', [], [b'a\n', b'b\n']) |
191 |
f.add_lines(b'r1', [b'r0'], [b'b\n', b'c\n']) |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
192 |
|
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
193 |
def verify_file(f): |
194 |
versions = f.versions() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
195 |
self.assertTrue(b'r0' in versions) |
196 |
self.assertTrue(b'r1' in versions) |
|
197 |
self.assertEqual(f.get_lines(b'r0'), [b'a\n', b'b\n']) |
|
198 |
self.assertEqual(f.get_text(b'r0'), b'a\nb\n') |
|
199 |
self.assertEqual(f.get_lines(b'r1'), [b'b\n', b'c\n']) |
|
|
1563.2.18
by Robert Collins
get knit repositories really using knits for text storage. |
200 |
self.assertEqual(2, len(f)) |
201 |
self.assertEqual(2, f.num_versions()) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
202 |
|
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
203 |
self.assertRaises(RevisionNotPresent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
204 |
f.add_lines, b'r2', [b'foo'], []) |
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
205 |
self.assertRaises(RevisionAlreadyPresent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
206 |
f.add_lines, b'r1', [], []) |
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
207 |
verify_file(f) |
|
1666.1.6
by Robert Collins
Make knit the default format. |
208 |
# this checks that reopen with create=True does not break anything.
|
209 |
f = self.reopen_file(create=True) |
|
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
210 |
verify_file(f) |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
211 |
|
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
212 |
def test_adds_with_parent_texts(self): |
213 |
f = self.get_file() |
|
214 |
parent_texts = {} |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
215 |
_, _, parent_texts[b'r0'] = f.add_lines(b'r0', [], [b'a\n', b'b\n']) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
216 |
try: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
217 |
_, _, parent_texts[b'r1'] = f.add_lines_with_ghosts(b'r1', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
218 |
[b'r0', b'ghost'], [b'b\n', b'c\n'], parent_texts=parent_texts) |
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
219 |
except NotImplementedError: |
220 |
# if the format doesn't support ghosts, just add normally.
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
221 |
_, _, parent_texts[b'r1'] = f.add_lines(b'r1', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
222 |
[b'r0'], [b'b\n', b'c\n'], parent_texts=parent_texts) |
223 |
f.add_lines(b'r2', [b'r1'], [b'c\n', b'd\n'], |
|
224 |
parent_texts=parent_texts) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
225 |
self.assertNotEqual(None, parent_texts[b'r0']) |
226 |
self.assertNotEqual(None, parent_texts[b'r1']) |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
227 |
|
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
228 |
def verify_file(f): |
229 |
versions = f.versions() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
230 |
self.assertTrue(b'r0' in versions) |
231 |
self.assertTrue(b'r1' in versions) |
|
232 |
self.assertTrue(b'r2' in versions) |
|
233 |
self.assertEqual(f.get_lines(b'r0'), [b'a\n', b'b\n']) |
|
234 |
self.assertEqual(f.get_lines(b'r1'), [b'b\n', b'c\n']) |
|
235 |
self.assertEqual(f.get_lines(b'r2'), [b'c\n', b'd\n']) |
|
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
236 |
self.assertEqual(3, f.num_versions()) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
237 |
origins = f.annotate(b'r1') |
238 |
self.assertEqual(origins[0][0], b'r0') |
|
239 |
self.assertEqual(origins[1][0], b'r1') |
|
240 |
origins = f.annotate(b'r2') |
|
241 |
self.assertEqual(origins[0][0], b'r1') |
|
242 |
self.assertEqual(origins[1][0], b'r2') |
|
|
1596.2.32
by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility. |
243 |
|
244 |
verify_file(f) |
|
245 |
f = self.reopen_file() |
|
246 |
verify_file(f) |
|
247 |
||
|
2805.6.7
by Robert Collins
Review feedback. |
248 |
def test_add_unicode_content(self): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
249 |
# unicode content is not permitted in versioned files.
|
|
2805.6.7
by Robert Collins
Review feedback. |
250 |
# versioned files version sequences of bytes only.
|
251 |
vf = self.get_file() |
|
252 |
self.assertRaises(errors.BzrBadParameterUnicode, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
253 |
vf.add_lines, b'a', [], [b'a\n', u'b\n', b'c\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
254 |
self.assertRaises( |
255 |
(errors.BzrBadParameterUnicode, NotImplementedError), |
|
|
6973.14.4
by Jelmer Vernooij
Fix checking for options. |
256 |
vf.add_lines_with_ghosts, b'a', [], [b'a\n', u'b\n', b'c\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
257 |
|
|
2520.4.150
by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines |
258 |
def test_add_follows_left_matching_blocks(self): |
259 |
"""If we change left_matching_blocks, delta changes |
|
260 |
||
261 |
Note: There are multiple correct deltas in this case, because
|
|
262 |
we start with 1 "a" and we get 3.
|
|
263 |
"""
|
|
264 |
vf = self.get_file() |
|
265 |
if isinstance(vf, WeaveFile): |
|
266 |
raise TestSkipped("WeaveFile ignores left_matching_blocks") |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
267 |
vf.add_lines(b'1', [], [b'a\n']) |
268 |
vf.add_lines(b'2', [b'1'], [b'a\n', b'a\n', b'a\n'], |
|
|
2520.4.150
by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines |
269 |
left_matching_blocks=[(0, 0, 1), (1, 3, 0)]) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
270 |
self.assertEqual([b'a\n', b'a\n', b'a\n'], vf.get_lines(b'2')) |
271 |
vf.add_lines(b'3', [b'1'], [b'a\n', b'a\n', b'a\n'], |
|
|
2520.4.150
by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines |
272 |
left_matching_blocks=[(0, 2, 1), (1, 3, 0)]) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
273 |
self.assertEqual([b'a\n', b'a\n', b'a\n'], vf.get_lines(b'3')) |
|
2520.4.150
by Aaron Bentley
Test that non-Weave uses left_matching_blocks for add_lines |
274 |
|
|
2805.6.7
by Robert Collins
Review feedback. |
275 |
def test_inline_newline_throws(self): |
276 |
# \r characters are not permitted in lines being added
|
|
277 |
vf = self.get_file() |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
278 |
self.assertRaises(errors.BzrBadParameterContainsNewline, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
279 |
vf.add_lines, b'a', [], [b'a\n\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
280 |
self.assertRaises( |
281 |
(errors.BzrBadParameterContainsNewline, NotImplementedError), |
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
282 |
vf.add_lines_with_ghosts, b'a', [], [b'a\n\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
283 |
# but inline CR's are allowed
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
284 |
vf.add_lines(b'a', [], [b'a\r\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
285 |
try: |
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
286 |
vf.add_lines_with_ghosts(b'b', [], [b'a\r\n']) |
|
2805.6.7
by Robert Collins
Review feedback. |
287 |
except NotImplementedError: |
288 |
pass
|
|
289 |
||
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
290 |
def test_add_reserved(self): |
291 |
vf = self.get_file() |
|
292 |
self.assertRaises(errors.ReservedId, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
293 |
vf.add_lines, b'a:', [], [b'a\n', b'b\n', b'c\n']) |
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
294 |
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
295 |
def test_add_lines_nostoresha(self): |
296 |
"""When nostore_sha is supplied using old content raises.""" |
|
297 |
vf = self.get_file() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
298 |
empty_text = (b'a', []) |
299 |
sample_text_nl = (b'b', [b"foo\n", b"bar\n"]) |
|
300 |
sample_text_no_nl = (b'c', [b"foo\n", b"bar"]) |
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
301 |
shas = [] |
302 |
for version, lines in (empty_text, sample_text_nl, sample_text_no_nl): |
|
303 |
sha, _, _ = vf.add_lines(version, [], lines) |
|
304 |
shas.append(sha) |
|
305 |
# we now have a copy of all the lines in the vf.
|
|
306 |
for sha, (version, lines) in zip( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
307 |
shas, (empty_text, sample_text_nl, sample_text_no_nl)): |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
308 |
self.assertRaises(errors.ExistingContent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
309 |
vf.add_lines, version + b"2", [], lines, |
310 |
nostore_sha=sha) |
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
311 |
# and no new version should have been added.
|
312 |
self.assertRaises(errors.RevisionNotPresent, vf.get_lines, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
313 |
version + b"2") |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
314 |
|
|
2803.1.1
by Robert Collins
Fix typo in ghosts version of test_add_lines_nostoresha. |
315 |
def test_add_lines_with_ghosts_nostoresha(self): |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
316 |
"""When nostore_sha is supplied using old content raises.""" |
317 |
vf = self.get_file() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
318 |
empty_text = (b'a', []) |
319 |
sample_text_nl = (b'b', [b"foo\n", b"bar\n"]) |
|
320 |
sample_text_no_nl = (b'c', [b"foo\n", b"bar"]) |
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
321 |
shas = [] |
322 |
for version, lines in (empty_text, sample_text_nl, sample_text_no_nl): |
|
323 |
sha, _, _ = vf.add_lines(version, [], lines) |
|
324 |
shas.append(sha) |
|
325 |
# we now have a copy of all the lines in the vf.
|
|
326 |
# is the test applicable to this vf implementation?
|
|
327 |
try: |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
328 |
vf.add_lines_with_ghosts(b'd', [], []) |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
329 |
except NotImplementedError: |
330 |
raise TestSkipped("add_lines_with_ghosts is optional") |
|
331 |
for sha, (version, lines) in zip( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
332 |
shas, (empty_text, sample_text_nl, sample_text_no_nl)): |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
333 |
self.assertRaises(errors.ExistingContent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
334 |
vf.add_lines_with_ghosts, version + b"2", [], lines, |
335 |
nostore_sha=sha) |
|
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
336 |
# and no new version should have been added.
|
337 |
self.assertRaises(errors.RevisionNotPresent, vf.get_lines, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
338 |
version + b"2") |
|
2794.1.1
by Robert Collins
Allow knits to be instructed not to add a text based on a sha, for commit. |
339 |
|
|
2776.1.1
by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed |
340 |
def test_add_lines_return_value(self): |
341 |
# add_lines should return the sha1 and the text size.
|
|
342 |
vf = self.get_file() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
343 |
empty_text = (b'a', []) |
344 |
sample_text_nl = (b'b', [b"foo\n", b"bar\n"]) |
|
345 |
sample_text_no_nl = (b'c', [b"foo\n", b"bar"]) |
|
|
2776.1.1
by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed |
346 |
# check results for the three cases:
|
347 |
for version, lines in (empty_text, sample_text_nl, sample_text_no_nl): |
|
348 |
# the first two elements are the same for all versioned files:
|
|
349 |
# - the digest and the size of the text. For some versioned files
|
|
350 |
# additional data is returned in additional tuple elements.
|
|
351 |
result = vf.add_lines(version, [], lines) |
|
352 |
self.assertEqual(3, len(result)) |
|
353 |
self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
354 |
result[0:2]) |
|
2776.1.1
by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed |
355 |
# parents should not affect the result:
|
356 |
lines = sample_text_nl[1] |
|
357 |
self.assertEqual((osutils.sha_strings(lines), sum(map(len, lines))), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
358 |
vf.add_lines(b'd', [b'b', b'c'], lines)[0:2]) |
|
2776.1.1
by Robert Collins
* The ``add_lines`` methods on ``VersionedFile`` implementations has changed |
359 |
|
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
360 |
def test_get_reserved(self): |
361 |
vf = self.get_file() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
362 |
self.assertRaises(errors.ReservedId, vf.get_texts, [b'b:']) |
363 |
self.assertRaises(errors.ReservedId, vf.get_lines, b'b:') |
|
364 |
self.assertRaises(errors.ReservedId, vf.get_text, b'b:') |
|
|
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
365 |
|
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
366 |
def test_add_unchanged_last_line_noeol_snapshot(self): |
367 |
"""Add a text with an unchanged last line with no eol should work.""" |
|
368 |
# Test adding this in a number of chain lengths; because the interface
|
|
369 |
# for VersionedFile does not allow forcing a specific chain length, we
|
|
370 |
# just use a small base to get the first snapshot, then a much longer
|
|
371 |
# first line for the next add (which will make the third add snapshot)
|
|
372 |
# and so on. 20 has been chosen as an aribtrary figure - knits use 200
|
|
373 |
# as a capped delta length, but ideally we would have some way of
|
|
374 |
# tuning the test to the store (e.g. keep going until a snapshot
|
|
375 |
# happens).
|
|
376 |
for length in range(20): |
|
377 |
version_lines = {} |
|
378 |
vf = self.get_file('case-%d' % length) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
379 |
prefix = b'step-%d' |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
380 |
parents = [] |
381 |
for step in range(length): |
|
382 |
version = prefix % step |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
383 |
lines = ([b'prelude \n'] * step) + [b'line'] |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
384 |
vf.add_lines(version, parents, lines) |
385 |
version_lines[version] = lines |
|
386 |
parents = [version] |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
387 |
vf.add_lines(b'no-eol', parents, [b'line']) |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
388 |
vf.get_texts(version_lines.keys()) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
389 |
self.assertEqualDiff(b'line', vf.get_text(b'no-eol')) |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
390 |
|
391 |
def test_get_texts_eol_variation(self): |
|
392 |
# similar to the failure in <http://bugs.launchpad.net/234748>
|
|
393 |
vf = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
394 |
sample_text_nl = [b"line\n"] |
395 |
sample_text_no_nl = [b"line"] |
|
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
396 |
versions = [] |
397 |
version_lines = {} |
|
398 |
parents = [] |
|
399 |
for i in range(4): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
400 |
version = b'v%d' % i |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
401 |
if i % 2: |
402 |
lines = sample_text_nl |
|
403 |
else: |
|
404 |
lines = sample_text_no_nl |
|
405 |
# left_matching blocks is an internal api; it operates on the
|
|
406 |
# *internal* representation for a knit, which is with *all* lines
|
|
407 |
# being normalised to end with \n - even the final line in a no_nl
|
|
408 |
# file. Using it here ensures that a broken internal implementation
|
|
409 |
# (which is what this test tests) will generate a correct line
|
|
410 |
# delta (which is to say, an empty delta).
|
|
411 |
vf.add_lines(version, parents, lines, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
412 |
left_matching_blocks=[(0, 0, 1)]) |
|
3468.2.4
by Martin Pool
Test and fix #234748 problems in trailing newline diffs |
413 |
parents = [version] |
414 |
versions.append(version) |
|
415 |
version_lines[version] = lines |
|
416 |
vf.check() |
|
417 |
vf.get_texts(versions) |
|
418 |
vf.get_texts(reversed(versions)) |
|
419 |
||
|
3460.2.1
by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing |
420 |
def test_add_lines_with_matching_blocks_noeol_last_line(self): |
421 |
"""Add a text with an unchanged last line with no eol should work.""" |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
422 |
from breezy import multiparent |
|
3460.2.1
by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing |
423 |
# Hand verified sha1 of the text we're adding.
|
424 |
sha1 = '6a1d115ec7b60afb664dc14890b5af5ce3c827a4' |
|
425 |
# Create a mpdiff which adds a new line before the trailing line, and
|
|
426 |
# reuse the last line unaltered (which can cause annotation reuse).
|
|
427 |
# Test adding this in two situations:
|
|
428 |
# On top of a new insertion
|
|
429 |
vf = self.get_file('fulltext') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
430 |
vf.add_lines(b'noeol', [], [b'line']) |
431 |
vf.add_lines(b'noeol2', [b'noeol'], [b'newline\n', b'line'], |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
432 |
left_matching_blocks=[(0, 1, 1)]) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
433 |
self.assertEqualDiff(b'newline\nline', vf.get_text(b'noeol2')) |
|
3460.2.1
by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing |
434 |
# On top of a delta
|
435 |
vf = self.get_file('delta') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
436 |
vf.add_lines(b'base', [], [b'line']) |
437 |
vf.add_lines(b'noeol', [b'base'], [b'prelude\n', b'line']) |
|
438 |
vf.add_lines(b'noeol2', [b'noeol'], [b'newline\n', b'line'], |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
439 |
left_matching_blocks=[(1, 1, 1)]) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
440 |
self.assertEqualDiff(b'newline\nline', vf.get_text(b'noeol2')) |
|
3460.2.1
by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing |
441 |
|
|
2520.4.85
by Aaron Bentley
Get all test passing (which just proves there aren't enough tests!) |
442 |
def test_make_mpdiffs(self): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
443 |
from breezy import multiparent |
|
2520.4.3
by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs |
444 |
vf = self.get_file('foo') |
445 |
sha1s = self._setup_for_deltas(vf) |
|
446 |
new_vf = self.get_file('bar') |
|
447 |
for version in multiparent.topo_iter(vf): |
|
|
2520.4.85
by Aaron Bentley
Get all test passing (which just proves there aren't enough tests!) |
448 |
mpdiff = vf.make_mpdiffs([version])[0] |
|
3287.5.2
by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code. |
449 |
new_vf.add_mpdiffs([(version, vf.get_parent_map([version])[version], |
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
450 |
vf.get_sha1s([version])[version], mpdiff)]) |
|
2520.4.3
by Aaron Bentley
Implement plain strategy for extracting and installing multiparent diffs |
451 |
self.assertEqualDiff(vf.get_text(version), |
452 |
new_vf.get_text(version)) |
|
453 |
||
|
3453.3.2
by John Arbash Meinel
Add a test case for the first loop, unable to find a way to trigger the second loop |
454 |
def test_make_mpdiffs_with_ghosts(self): |
455 |
vf = self.get_file('foo') |
|
|
3453.3.4
by John Arbash Meinel
Skip the new test for old weave formats that don't support ghosts |
456 |
try: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
457 |
vf.add_lines_with_ghosts(b'text', [b'ghost'], [b'line\n']) |
|
3453.3.4
by John Arbash Meinel
Skip the new test for old weave formats that don't support ghosts |
458 |
except NotImplementedError: |
459 |
# old Weave formats do not allow ghosts
|
|
460 |
return
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
461 |
self.assertRaises(errors.RevisionNotPresent, |
462 |
vf.make_mpdiffs, [b'ghost']) |
|
|
3453.3.2
by John Arbash Meinel
Add a test case for the first loop, unable to find a way to trigger the second loop |
463 |
|
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
464 |
def _setup_for_deltas(self, f): |
|
2794.1.2
by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts. |
465 |
self.assertFalse(f.has_version('base')) |
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
466 |
# add texts that should trip the knit maximum delta chain threshold
|
467 |
# as well as doing parallel chains of data in knits.
|
|
468 |
# this is done by two chains of 25 insertions
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
469 |
f.add_lines(b'base', [], [b'line\n']) |
470 |
f.add_lines(b'noeol', [b'base'], [b'line']) |
|
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
471 |
# detailed eol tests:
|
472 |
# shared last line with parent no-eol
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
473 |
f.add_lines(b'noeolsecond', [b'noeol'], [b'line\n', b'line']) |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
474 |
# differing last line with parent, both no-eol
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
475 |
f.add_lines(b'noeolnotshared', [b'noeolsecond'], [b'line\n', b'phone']) |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
476 |
# add eol following a noneol parent, change content
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
477 |
f.add_lines(b'eol', [b'noeol'], [b'phone\n']) |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
478 |
# add eol following a noneol parent, no change content
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
479 |
f.add_lines(b'eolline', [b'noeol'], [b'line\n']) |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
480 |
# noeol with no parents:
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
481 |
f.add_lines(b'noeolbase', [], [b'line']) |
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
482 |
# noeol preceeding its leftmost parent in the output:
|
483 |
# this is done by making it a merge of two parents with no common
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
484 |
# anestry: noeolbase and noeol with the
|
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
485 |
# later-inserted parent the leftmost.
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
486 |
f.add_lines(b'eolbeforefirstparent', [ |
487 |
b'noeolbase', b'noeol'], [b'line']) |
|
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
488 |
# two identical eol texts
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
489 |
f.add_lines(b'noeoldup', [b'noeol'], [b'line']) |
490 |
next_parent = b'base' |
|
491 |
text_name = b'chain1-' |
|
492 |
text = [b'line\n'] |
|
493 |
sha1s = {0: b'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079', |
|
494 |
1: b'45e21ea146a81ea44a821737acdb4f9791c8abe7', |
|
495 |
2: b'e1f11570edf3e2a070052366c582837a4fe4e9fa', |
|
496 |
3: b'26b4b8626da827088c514b8f9bbe4ebf181edda1', |
|
497 |
4: b'e28a5510be25ba84d31121cff00956f9970ae6f6', |
|
498 |
5: b'd63ec0ce22e11dcf65a931b69255d3ac747a318d', |
|
499 |
6: b'2c2888d288cb5e1d98009d822fedfe6019c6a4ea', |
|
500 |
7: b'95c14da9cafbf828e3e74a6f016d87926ba234ab', |
|
501 |
8: b'779e9a0b28f9f832528d4b21e17e168c67697272', |
|
502 |
9: b'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f', |
|
503 |
10: b'131a2ae712cf51ed62f143e3fbac3d4206c25a05', |
|
504 |
11: b'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199', |
|
505 |
12: b'31a2286267f24d8bedaa43355f8ad7129509ea85', |
|
506 |
13: b'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a', |
|
507 |
14: b'2c4b1736566b8ca6051e668de68650686a3922f2', |
|
508 |
15: b'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde', |
|
509 |
16: b'b0d2e18d3559a00580f6b49804c23fea500feab3', |
|
510 |
17: b'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7', |
|
511 |
18: b'5cf64a3459ae28efa60239e44b20312d25b253f3', |
|
512 |
19: b'1ebed371807ba5935958ad0884595126e8c4e823', |
|
513 |
20: b'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3', |
|
514 |
21: b'01edc447978004f6e4e962b417a4ae1955b6fe5d', |
|
515 |
22: b'd8d8dc49c4bf0bab401e0298bb5ad827768618bb', |
|
516 |
23: b'c21f62b1c482862983a8ffb2b0c64b3451876e3f', |
|
517 |
24: b'c0593fe795e00dff6b3c0fe857a074364d5f04fc', |
|
|
6986.1.1
by Jelmer Vernooij
Address review comments. |
518 |
25: b'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855', |
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
519 |
}
|
520 |
for depth in range(26): |
|
|
6963.2.12
by Jelmer Vernooij
Fix some more tests. |
521 |
new_version = text_name + b'%d' % depth |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
522 |
text = text + [b'line\n'] |
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
523 |
f.add_lines(new_version, [next_parent], text) |
524 |
next_parent = new_version |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
525 |
next_parent = b'base' |
526 |
text_name = b'chain2-' |
|
527 |
text = [b'line\n'] |
|
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
528 |
for depth in range(26): |
|
6963.2.12
by Jelmer Vernooij
Fix some more tests. |
529 |
new_version = text_name + b'%d' % depth |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
530 |
text = text + [b'line\n'] |
|
1596.2.36
by Robert Collins
add a get_delta api to versioned_file. |
531 |
f.add_lines(new_version, [next_parent], text) |
532 |
next_parent = new_version |
|
|
1596.2.38
by Robert Collins
rollback from using deltas to using fulltexts - deltas need more work to be ready. |
533 |
return sha1s |
|
1596.2.37
by Robert Collins
Switch to delta based content copying in the generic versioned file copier. |
534 |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
535 |
def test_ancestry(self): |
536 |
f = self.get_file() |
|
|
1563.2.29
by Robert Collins
Remove all but fetch references to repository.revision_store. |
537 |
self.assertEqual([], f.get_ancestry([])) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
538 |
f.add_lines(b'r0', [], [b'a\n', b'b\n']) |
539 |
f.add_lines(b'r1', [b'r0'], [b'b\n', b'c\n']) |
|
540 |
f.add_lines(b'r2', [b'r0'], [b'b\n', b'c\n']) |
|
541 |
f.add_lines(b'r3', [b'r2'], [b'b\n', b'c\n']) |
|
542 |
f.add_lines(b'rM', [b'r1', b'r2'], [b'b\n', b'c\n']) |
|
|
1563.2.29
by Robert Collins
Remove all but fetch references to repository.revision_store. |
543 |
self.assertEqual([], f.get_ancestry([])) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
544 |
versions = f.get_ancestry([b'rM']) |
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
545 |
# there are some possibilities:
|
546 |
# r0 r1 r2 rM r3
|
|
547 |
# r0 r1 r2 r3 rM
|
|
548 |
# etc
|
|
549 |
# so we check indexes
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
550 |
r0 = versions.index(b'r0') |
551 |
r1 = versions.index(b'r1') |
|
552 |
r2 = versions.index(b'r2') |
|
553 |
self.assertFalse(b'r3' in versions) |
|
554 |
rM = versions.index(b'rM') |
|
|
1563.2.35
by Robert Collins
cleanup deprecation warnings and finish conversion so the inventory is knit based too. |
555 |
self.assertTrue(r0 < r1) |
556 |
self.assertTrue(r0 < r2) |
|
557 |
self.assertTrue(r1 < rM) |
|
558 |
self.assertTrue(r2 < rM) |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
559 |
|
560 |
self.assertRaises(RevisionNotPresent, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
561 |
f.get_ancestry, [b'rM', b'rX']) |
|
1594.2.21
by Robert Collins
Teach versioned files to prevent mutation after finishing. |
562 |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
563 |
self.assertEqual(set(f.get_ancestry(b'rM')), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
564 |
set(f.get_ancestry(b'rM', topo_sorted=False))) |
|
2530.1.1
by Aaron Bentley
Make topological sorting optional for get_ancestry |
565 |
|
|
1594.2.21
by Robert Collins
Teach versioned files to prevent mutation after finishing. |
566 |
def test_mutate_after_finish(self): |
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
567 |
self._transaction = 'before' |
|
1594.2.21
by Robert Collins
Teach versioned files to prevent mutation after finishing. |
568 |
f = self.get_file() |
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
569 |
self._transaction = 'after' |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
570 |
self.assertRaises(errors.OutSideTransaction, f.add_lines, b'', [], []) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
571 |
self.assertRaises(errors.OutSideTransaction, |
572 |
f.add_lines_with_ghosts, b'', [], []) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
573 |
|
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
574 |
def test_copy_to(self): |
575 |
f = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
576 |
f.add_lines(b'0', [], [b'a\n']) |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
577 |
t = MemoryTransport() |
578 |
f.copy_to('foo', t) |
|
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
579 |
for suffix in self.get_factory().get_suffixes(): |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
580 |
self.assertTrue(t.has('foo' + suffix)) |
581 |
||
582 |
def test_get_suffixes(self): |
|
583 |
f = self.get_file() |
|
584 |
# and should be a list
|
|
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
585 |
self.assertTrue(isinstance(self.get_factory().get_suffixes(), list)) |
|
1563.2.15
by Robert Collins
remove the weavestore assumptions about the number and nature of files it manages. |
586 |
|
|
3287.5.1
by Robert Collins
Add VersionedFile.get_parent_map. |
587 |
def test_get_parent_map(self): |
588 |
f = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
589 |
f.add_lines(b'r0', [], [b'a\n', b'b\n']) |
590 |
self.assertEqual( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
591 |
{b'r0': ()}, f.get_parent_map([b'r0'])) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
592 |
f.add_lines(b'r1', [b'r0'], [b'a\n', b'b\n']) |
593 |
self.assertEqual( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
594 |
{b'r1': (b'r0',)}, f.get_parent_map([b'r1'])) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
595 |
self.assertEqual( |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
596 |
{b'r0': (), |
597 |
b'r1': (b'r0',)}, |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
598 |
f.get_parent_map([b'r0', b'r1'])) |
599 |
f.add_lines(b'r2', [], [b'a\n', b'b\n']) |
|
600 |
f.add_lines(b'r3', [], [b'a\n', b'b\n']) |
|
601 |
f.add_lines(b'm', [b'r0', b'r1', b'r2', b'r3'], [b'a\n', b'b\n']) |
|
602 |
self.assertEqual( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
603 |
{b'm': (b'r0', b'r1', b'r2', b'r3')}, f.get_parent_map([b'm'])) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
604 |
self.assertEqual({}, f.get_parent_map(b'y')) |
605 |
self.assertEqual( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
606 |
{b'r0': (), |
607 |
b'r1': (b'r0',)}, |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
608 |
f.get_parent_map([b'r0', b'y', b'r1'])) |
|
3287.5.1
by Robert Collins
Add VersionedFile.get_parent_map. |
609 |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
610 |
def test_annotate(self): |
611 |
f = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
612 |
f.add_lines(b'r0', [], [b'a\n', b'b\n']) |
613 |
f.add_lines(b'r1', [b'r0'], [b'c\n', b'b\n']) |
|
614 |
origins = f.annotate(b'r1') |
|
615 |
self.assertEqual(origins[0][0], b'r1') |
|
616 |
self.assertEqual(origins[1][0], b'r0') |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
617 |
|
618 |
self.assertRaises(RevisionNotPresent, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
619 |
f.annotate, b'foo') |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
620 |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
621 |
def test_detection(self): |
622 |
# Test weaves detect corruption.
|
|
623 |
#
|
|
624 |
# Weaves contain a checksum of their texts.
|
|
625 |
# When a text is extracted, this checksum should be
|
|
626 |
# verified.
|
|
627 |
||
628 |
w = self.get_file_corrupted_text() |
|
629 |
||
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
630 |
self.assertEqual(b'hello\n', w.get_text(b'v1')) |
631 |
self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2') |
|
632 |
self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2') |
|
|
6731
by Jelmer Vernooij
Move weave errors to breezy.bzr.weave. |
633 |
self.assertRaises(WeaveInvalidChecksum, w.check) |
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
634 |
|
635 |
w = self.get_file_corrupted_checksum() |
|
636 |
||
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
637 |
self.assertEqual(b'hello\n', w.get_text(b'v1')) |
638 |
self.assertRaises(WeaveInvalidChecksum, w.get_text, b'v2') |
|
639 |
self.assertRaises(WeaveInvalidChecksum, w.get_lines, b'v2') |
|
|
6731
by Jelmer Vernooij
Move weave errors to breezy.bzr.weave. |
640 |
self.assertRaises(WeaveInvalidChecksum, w.check) |
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
641 |
|
642 |
def get_file_corrupted_text(self): |
|
643 |
"""Return a versioned file with corrupt text but valid metadata.""" |
|
644 |
raise NotImplementedError(self.get_file_corrupted_text) |
|
645 |
||
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
646 |
def reopen_file(self, name='foo'): |
647 |
"""Open the versioned file from disk again.""" |
|
648 |
raise NotImplementedError(self.reopen_file) |
|
649 |
||
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
650 |
def test_iter_lines_added_or_present_in_versions(self): |
651 |
# test that we get at least an equalset of the lines added by
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
652 |
# versions in the weave
|
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
653 |
# the ordering here is to make a tree so that dumb searches have
|
654 |
# more changes to muck up.
|
|
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
655 |
|
|
4961.2.9
by Martin Pool
Rip out most remaining uses of DummyProgressBar |
656 |
class InstrumentedProgress(progress.ProgressTask): |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
657 |
|
658 |
def __init__(self): |
|
|
4961.2.9
by Martin Pool
Rip out most remaining uses of DummyProgressBar |
659 |
progress.ProgressTask.__init__(self) |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
660 |
self.updates = [] |
661 |
||
662 |
def update(self, msg=None, current=None, total=None): |
|
663 |
self.updates.append((msg, current, total)) |
|
664 |
||
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
665 |
vf = self.get_file() |
666 |
# add a base to get included
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
667 |
vf.add_lines(b'base', [], [b'base\n']) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
668 |
# add a ancestor to be included on one side
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
669 |
vf.add_lines(b'lancestor', [], [b'lancestor\n']) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
670 |
# add a ancestor to be included on the other side
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
671 |
vf.add_lines(b'rancestor', [b'base'], [b'rancestor\n']) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
672 |
# add a child of rancestor with no eofile-nl
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
673 |
vf.add_lines(b'child', [b'rancestor'], [b'base\n', b'child\n']) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
674 |
# add a child of lancestor and base to join the two roots
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
675 |
vf.add_lines(b'otherchild', |
676 |
[b'lancestor', b'base'], |
|
677 |
[b'base\n', b'lancestor\n', b'otherchild\n']) |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
678 |
|
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
679 |
def iter_with_versions(versions, expected): |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
680 |
# now we need to see what lines are returned, and how often.
|
|
2975.3.1
by Robert Collins
Change (without backwards compatibility) the |
681 |
lines = {} |
|
2039.1.1
by Aaron Bentley
Clean up progress properly when interrupted during fetch (#54000) |
682 |
progress = InstrumentedProgress() |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
683 |
# iterate over the lines
|
|
2975.3.1
by Robert Collins
Change (without backwards compatibility) the |
684 |
for line in vf.iter_lines_added_or_present_in_versions(versions, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
685 |
pb=progress): |
|
2975.3.1
by Robert Collins
Change (without backwards compatibility) the |
686 |
lines.setdefault(line, 0) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
687 |
lines[line] += 1 |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
688 |
if [] != progress.updates: |
|
2039.1.2
by Aaron Bentley
Tweak test to avoid catching assert |
689 |
self.assertEqual(expected, progress.updates) |
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
690 |
return lines |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
691 |
lines = iter_with_versions([b'child', b'otherchild'], |
|
4103.3.4
by Martin Pool
Update test that depends on progress bar strings |
692 |
[('Walking content', 0, 2), |
693 |
('Walking content', 1, 2), |
|
694 |
('Walking content', 2, 2)]) |
|
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
695 |
# we must see child and otherchild
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
696 |
self.assertTrue(lines[(b'child\n', b'child')] > 0) |
697 |
self.assertTrue(lines[(b'otherchild\n', b'otherchild')] > 0) |
|
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
698 |
# we dont care if we got more than that.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
699 |
|
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
700 |
# test all lines
|
|
4103.3.4
by Martin Pool
Update test that depends on progress bar strings |
701 |
lines = iter_with_versions(None, [('Walking content', 0, 5), |
702 |
('Walking content', 1, 5), |
|
703 |
('Walking content', 2, 5), |
|
704 |
('Walking content', 3, 5), |
|
705 |
('Walking content', 4, 5), |
|
706 |
('Walking content', 5, 5)]) |
|
|
1594.2.6
by Robert Collins
Introduce a api specifically for looking at lines in some versions of the inventory, for fileid_involved. |
707 |
# all lines must be seen at least once
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
708 |
self.assertTrue(lines[(b'base\n', b'base')] > 0) |
709 |
self.assertTrue(lines[(b'lancestor\n', b'lancestor')] > 0) |
|
710 |
self.assertTrue(lines[(b'rancestor\n', b'rancestor')] > 0) |
|
711 |
self.assertTrue(lines[(b'child\n', b'child')] > 0) |
|
712 |
self.assertTrue(lines[(b'otherchild\n', b'otherchild')] > 0) |
|
|
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
713 |
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
714 |
def test_add_lines_with_ghosts(self): |
715 |
# some versioned file formats allow lines to be added with parent
|
|
716 |
# information that is > than that in the format. Formats that do
|
|
717 |
# not support this need to raise NotImplementedError on the
|
|
718 |
# add_lines_with_ghosts api.
|
|
719 |
vf = self.get_file() |
|
720 |
# add a revision with ghost parents
|
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
721 |
# The preferred form is utf8, but we should translate when needed
|
722 |
parent_id_unicode = u'b\xbfse' |
|
723 |
parent_id_utf8 = parent_id_unicode.encode('utf8') |
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
724 |
try: |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
725 |
vf.add_lines_with_ghosts(b'notbxbfse', [parent_id_utf8], []) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
726 |
except NotImplementedError: |
727 |
# check the other ghost apis are also not implemented
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
728 |
self.assertRaises(NotImplementedError, |
729 |
vf.get_ancestry_with_ghosts, [b'foo']) |
|
730 |
self.assertRaises(NotImplementedError, |
|
731 |
vf.get_parents_with_ghosts, b'foo') |
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
732 |
return
|
|
2150.2.1
by Robert Collins
Correctly decode utf8 revision ids from knits when parsing, fixes a regression where a unicode revision id is stored correctly, but then indexed by the utf8 value on the next invocation of bzr, rather than the unicode value. |
733 |
vf = self.reopen_file() |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
734 |
# test key graph related apis: getncestry, _graph, get_parents
|
735 |
# has_version
|
|
736 |
# - these are ghost unaware and must not be reflect ghosts
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
737 |
self.assertEqual([b'notbxbfse'], vf.get_ancestry(b'notbxbfse')) |
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
738 |
self.assertFalse(vf.has_version(parent_id_utf8)) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
739 |
# we have _with_ghost apis to give us ghost information.
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
740 |
self.assertEqual([parent_id_utf8, b'notbxbfse'], |
741 |
vf.get_ancestry_with_ghosts([b'notbxbfse'])) |
|
742 |
self.assertEqual([parent_id_utf8], |
|
743 |
vf.get_parents_with_ghosts(b'notbxbfse')) |
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
744 |
# if we add something that is a ghost of another, it should correct the
|
745 |
# results of the prior apis
|
|
|
2858.2.1
by Martin Pool
Remove most calls to safe_file_id and safe_revision_id. |
746 |
vf.add_lines(parent_id_utf8, [], []) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
747 |
self.assertEqual([parent_id_utf8, b'notbxbfse'], |
748 |
vf.get_ancestry([b'notbxbfse'])) |
|
749 |
self.assertEqual({b'notbxbfse': (parent_id_utf8,)}, |
|
750 |
vf.get_parent_map([b'notbxbfse'])) |
|
|
2249.5.12
by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8 |
751 |
self.assertTrue(vf.has_version(parent_id_utf8)) |
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
752 |
# we have _with_ghost apis to give us ghost information.
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
753 |
self.assertEqual([parent_id_utf8, b'notbxbfse'], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
754 |
vf.get_ancestry_with_ghosts([b'notbxbfse'])) |
755 |
self.assertEqual([parent_id_utf8], |
|
756 |
vf.get_parents_with_ghosts(b'notbxbfse')) |
|
|
1594.2.8
by Robert Collins
add ghost aware apis to knits. |
757 |
|
|
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
758 |
def test_add_lines_with_ghosts_after_normal_revs(self): |
759 |
# some versioned file formats allow lines to be added with parent
|
|
760 |
# information that is > than that in the format. Formats that do
|
|
761 |
# not support this need to raise NotImplementedError on the
|
|
762 |
# add_lines_with_ghosts api.
|
|
763 |
vf = self.get_file() |
|
764 |
# probe for ghost support
|
|
765 |
try: |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
766 |
vf.add_lines_with_ghosts(b'base', [], [b'line\n', b'line_b\n']) |
|
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
767 |
except NotImplementedError: |
768 |
return
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
769 |
vf.add_lines_with_ghosts(b'references_ghost', |
770 |
[b'base', b'a_ghost'], |
|
771 |
[b'line\n', b'line_b\n', b'line_c\n']) |
|
772 |
origins = vf.annotate(b'references_ghost') |
|
773 |
self.assertEqual((b'base', b'line\n'), origins[0]) |
|
774 |
self.assertEqual((b'base', b'line_b\n'), origins[1]) |
|
775 |
self.assertEqual((b'references_ghost', b'line_c\n'), origins[2]) |
|
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
776 |
|
777 |
def test_readonly_mode(self): |
|
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
778 |
t = self.get_transport() |
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
779 |
factory = self.get_factory() |
|
6619.3.14
by Jelmer Vernooij
Convert some octal numbers to new notations. |
780 |
vf = factory('id', t, 0o777, create=True, access_mode='w') |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
781 |
vf = factory('id', t, access_mode='r') |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
782 |
self.assertRaises(errors.ReadOnlyError, vf.add_lines, b'base', [], []) |
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
783 |
self.assertRaises(errors.ReadOnlyError, |
784 |
vf.add_lines_with_ghosts, |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
785 |
b'base', |
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
786 |
[],
|
787 |
[])
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
788 |
|
|
3316.2.9
by Robert Collins
* ``VersionedFile.get_sha1`` is deprecated, please use |
789 |
def test_get_sha1s(self): |
|
1666.1.6
by Robert Collins
Make knit the default format. |
790 |
# check the sha1 data is available
|
791 |
vf = self.get_file() |
|
792 |
# a simple file
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
793 |
vf.add_lines(b'a', [], [b'a\n']) |
|
1666.1.6
by Robert Collins
Make knit the default format. |
794 |
# the same file, different metadata
|
|
6973.14.4
by Jelmer Vernooij
Fix checking for options. |
795 |
vf.add_lines(b'b', [b'a'], [b'a\n']) |
|
1666.1.6
by Robert Collins
Make knit the default format. |
796 |
# a file differing only in last newline.
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
797 |
vf.add_lines(b'c', [], [b'a']) |
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
798 |
self.assertEqual({ |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
799 |
b'a': b'3f786850e387550fdab836ed7e6dc881de23001b', |
800 |
b'c': b'86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', |
|
801 |
b'b': b'3f786850e387550fdab836ed7e6dc881de23001b', |
|
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
802 |
},
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
803 |
vf.get_sha1s([b'a', b'c', b'b'])) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
804 |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
805 |
|
|
2535.3.1
by Andrew Bennetts
Add get_format_signature to VersionedFile |
806 |
class TestWeave(TestCaseWithMemoryTransport, VersionedFileTestMixIn): |
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
807 |
|
808 |
def get_file(self, name='foo'): |
|
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
809 |
return WeaveFile(name, self.get_transport(), |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
810 |
create=True, |
811 |
get_scope=self.get_transaction) |
|
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
812 |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
813 |
def get_file_corrupted_text(self): |
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
814 |
w = WeaveFile('foo', self.get_transport(), |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
815 |
create=True, |
816 |
get_scope=self.get_transaction) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
817 |
w.add_lines(b'v1', [], [b'hello\n']) |
818 |
w.add_lines(b'v2', [b'v1'], [b'hello\n', b'there\n']) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
819 |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
820 |
# We are going to invasively corrupt the text
|
821 |
# Make sure the internals of weave are the same
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
822 |
self.assertEqual([(b'{', 0), b'hello\n', (b'}', None), (b'{', 1), b'there\n', (b'}', None) |
823 |
], w._weave) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
824 |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
825 |
self.assertEqual([b'f572d396fae9206628714fb2ce00f72e94f2258f', b'90f265c6e75f1c8f9ab76dcf85528352c5f215ef' |
826 |
], w._sha1s) |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
827 |
w.check() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
828 |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
829 |
# Corrupted
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
830 |
w._weave[4] = b'There\n' |
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
831 |
return w |
832 |
||
833 |
def get_file_corrupted_checksum(self): |
|
834 |
w = self.get_file_corrupted_text() |
|
835 |
# Corrected
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
836 |
w._weave[4] = b'there\n' |
837 |
self.assertEqual(b'hello\nthere\n', w.get_text(b'v2')) |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
838 |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
839 |
# Invalid checksum, first digit changed
|
840 |
w._sha1s[1] = b'f0f265c6e75f1c8f9ab76dcf85528352c5f215ef' |
|
|
1563.2.6
by Robert Collins
Start check tests for knits (pending), and remove dead code. |
841 |
return w |
842 |
||
|
1666.1.6
by Robert Collins
Make knit the default format. |
843 |
def reopen_file(self, name='foo', create=False): |
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
844 |
return WeaveFile(name, self.get_transport(), |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
845 |
create=create, |
846 |
get_scope=self.get_transaction) |
|
|
1563.2.9
by Robert Collins
Update versionedfile api tests to ensure that data is available after every operation. |
847 |
|
|
1563.2.25
by Robert Collins
Merge in upstream. |
848 |
def test_no_implicit_create(self): |
849 |
self.assertRaises(errors.NoSuchFile, |
|
850 |
WeaveFile, |
|
851 |
'foo', |
|
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
852 |
self.get_transport(), |
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
853 |
get_scope=self.get_transaction) |
|
1563.2.25
by Robert Collins
Merge in upstream. |
854 |
|
|
1594.2.23
by Robert Collins
Test versioned file storage handling of clean/dirty status for accessed versioned files. |
855 |
def get_factory(self): |
856 |
return WeaveFile |
|
857 |
||
|
1563.2.1
by Robert Collins
Merge in a variation of the versionedfile api from versioned-file. |
858 |
|
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
859 |
class TestPlanMergeVersionedFile(TestCaseWithMemoryTransport): |
860 |
||
861 |
def setUp(self): |
|
|
6552.1.4
by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super(). |
862 |
super(TestPlanMergeVersionedFile, self).setUp() |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
863 |
mapper = PrefixMapper() |
864 |
factory = make_file_factory(True, mapper) |
|
865 |
self.vf1 = factory(self.get_transport('root-1')) |
|
866 |
self.vf2 = factory(self.get_transport('root-2')) |
|
867 |
self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root') |
|
868 |
self.plan_merge_vf.fallback_versionedfiles.extend([self.vf1, self.vf2]) |
|
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
869 |
|
870 |
def test_add_lines(self): |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
871 |
self.plan_merge_vf.add_lines((b'root', b'a:'), [], []) |
872 |
self.assertRaises(ValueError, self.plan_merge_vf.add_lines, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
873 |
(b'root', b'a'), [], []) |
874 |
self.assertRaises(ValueError, self.plan_merge_vf.add_lines, |
|
875 |
(b'root', b'a:'), None, []) |
|
876 |
self.assertRaises(ValueError, self.plan_merge_vf.add_lines, |
|
877 |
(b'root', b'a:'), [], None) |
|
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
878 |
|
879 |
def setup_abcde(self): |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
880 |
self.vf1.add_lines((b'root', b'A'), [], [b'a']) |
881 |
self.vf1.add_lines((b'root', b'B'), [(b'root', b'A')], [b'b']) |
|
882 |
self.vf2.add_lines((b'root', b'C'), [], [b'c']) |
|
883 |
self.vf2.add_lines((b'root', b'D'), [(b'root', b'C')], [b'd']) |
|
884 |
self.plan_merge_vf.add_lines((b'root', b'E:'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
885 |
[(b'root', b'B'), (b'root', b'D')], [b'e']) |
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
886 |
|
887 |
def test_get_parents(self): |
|
888 |
self.setup_abcde() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
889 |
self.assertEqual({(b'root', b'B'): ((b'root', b'A'),)}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
890 |
self.plan_merge_vf.get_parent_map([(b'root', b'B')])) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
891 |
self.assertEqual({(b'root', b'D'): ((b'root', b'C'),)}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
892 |
self.plan_merge_vf.get_parent_map([(b'root', b'D')])) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
893 |
self.assertEqual({(b'root', b'E:'): ((b'root', b'B'), (b'root', b'D'))}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
894 |
self.plan_merge_vf.get_parent_map([(b'root', b'E:')])) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
895 |
self.assertEqual({}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
896 |
self.plan_merge_vf.get_parent_map([(b'root', b'F')])) |
|
3287.5.2
by Robert Collins
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code. |
897 |
self.assertEqual({ |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
898 |
(b'root', b'B'): ((b'root', b'A'),), |
899 |
(b'root', b'D'): ((b'root', b'C'),), |
|
900 |
(b'root', b'E:'): ((b'root', b'B'), (b'root', b'D')), |
|
901 |
},
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
902 |
self.plan_merge_vf.get_parent_map( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
903 |
[(b'root', b'B'), (b'root', b'D'), (b'root', b'E:'), (b'root', b'F')])) |
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
904 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
905 |
def test_get_record_stream(self): |
|
3062.1.9
by Aaron Bentley
Move PlanMerge into merge and _PlanMergeVersionedFile into versionedfile |
906 |
self.setup_abcde() |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
907 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
908 |
def get_record(suffix): |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
909 |
return next(self.plan_merge_vf.get_record_stream( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
910 |
[(b'root', suffix)], 'unordered', True)) |
|
6963.2.13
by Jelmer Vernooij
Fix more tests. |
911 |
self.assertEqual(b'a', get_record(b'A').get_bytes_as('fulltext')) |
912 |
self.assertEqual(b'c', get_record(b'C').get_bytes_as('fulltext')) |
|
913 |
self.assertEqual(b'e', get_record(b'E:').get_bytes_as('fulltext')) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
914 |
self.assertEqual('absent', get_record('F').storage_kind) |
|
1666.1.1
by Robert Collins
Add trivial http-using test for versioned files. |
915 |
|
916 |
||
917 |
class TestReadonlyHttpMixin(object): |
|
918 |
||
|
3316.2.3
by Robert Collins
Remove manual notification of transaction finishing on versioned files. |
919 |
def get_transaction(self): |
920 |
return 1 |
|
921 |
||
|
1666.1.1
by Robert Collins
Add trivial http-using test for versioned files. |
922 |
def test_readonly_http_works(self): |
923 |
# we should be able to read from http with a versioned file.
|
|
924 |
vf = self.get_file() |
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
925 |
# try an empty file access
|
|
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
926 |
readonly_vf = self.get_factory()('foo', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
927 |
transport.get_transport_from_url(self.get_readonly_url('.'))) |
|
1666.1.6
by Robert Collins
Make knit the default format. |
928 |
self.assertEqual([], readonly_vf.versions()) |
|
5229.1.13
by Vincent Ladeuil
Eager tests are bad, we really want two tests here. |
929 |
|
930 |
def test_readonly_http_works_with_feeling(self): |
|
931 |
# we should be able to read from http with a versioned file.
|
|
932 |
vf = self.get_file() |
|
|
1666.1.6
by Robert Collins
Make knit the default format. |
933 |
# now with feeling.
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
934 |
vf.add_lines(b'1', [], [b'a\n']) |
935 |
vf.add_lines(b'2', [b'1'], [b'b\n', b'a\n']) |
|
|
6083.1.1
by Jelmer Vernooij
Use get_transport_from_{url,path} in more places. |
936 |
readonly_vf = self.get_factory()('foo', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
937 |
transport.get_transport_from_url(self.get_readonly_url('.'))) |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
938 |
self.assertEqual([b'1', b'2'], vf.versions()) |
939 |
self.assertEqual([b'1', b'2'], readonly_vf.versions()) |
|
|
1666.1.1
by Robert Collins
Add trivial http-using test for versioned files. |
940 |
for version in readonly_vf.versions(): |
941 |
readonly_vf.get_lines(version) |
|
942 |
||
943 |
||
944 |
class TestWeaveHTTP(TestCaseWithWebserver, TestReadonlyHttpMixin): |
|
945 |
||
946 |
def get_file(self): |
|
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
947 |
return WeaveFile('foo', self.get_transport(), |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
948 |
create=True, |
949 |
get_scope=self.get_transaction) |
|
|
1666.1.1
by Robert Collins
Add trivial http-using test for versioned files. |
950 |
|
951 |
def get_factory(self): |
|
952 |
return WeaveFile |
|
953 |
||
954 |
||
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
955 |
class MergeCasesMixin(object): |
956 |
||
957 |
def doMerge(self, base, a, b, mp): |
|
958 |
from textwrap import dedent |
|
959 |
||
960 |
def addcrlf(x): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
961 |
return x + b'\n' |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
962 |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
963 |
w = self.get_file() |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
964 |
w.add_lines(b'text0', [], list(map(addcrlf, base))) |
965 |
w.add_lines(b'text1', [b'text0'], list(map(addcrlf, a))) |
|
966 |
w.add_lines(b'text2', [b'text0'], list(map(addcrlf, b))) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
967 |
|
968 |
self.log_contents(w) |
|
969 |
||
970 |
self.log('merge plan:') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
971 |
p = list(w.plan_merge(b'text1', b'text2')) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
972 |
for state, line in p: |
973 |
if line: |
|
974 |
self.log('%12s | %s' % (state, line[:-1])) |
|
975 |
||
976 |
self.log('merge:') |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
977 |
mt = BytesIO() |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
978 |
mt.writelines(w.weave_merge(p)) |
979 |
mt.seek(0) |
|
980 |
self.log(mt.getvalue()) |
|
981 |
||
|
6631.3.1
by Martin
Run 2to3 map fixer and refactor after |
982 |
mp = list(map(addcrlf, mp)) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
983 |
self.assertEqual(mt.readlines(), mp) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
984 |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
985 |
def testOneInsert(self): |
986 |
self.doMerge([], |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
987 |
[b'aa'], |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
988 |
[],
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
989 |
[b'aa']) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
990 |
|
991 |
def testSeparateInserts(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
992 |
self.doMerge([b'aaa', b'bbb', b'ccc'], |
993 |
[b'aaa', b'xxx', b'bbb', b'ccc'], |
|
994 |
[b'aaa', b'bbb', b'yyy', b'ccc'], |
|
995 |
[b'aaa', b'xxx', b'bbb', b'yyy', b'ccc']) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
996 |
|
997 |
def testSameInsert(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
998 |
self.doMerge([b'aaa', b'bbb', b'ccc'], |
999 |
[b'aaa', b'xxx', b'bbb', b'ccc'], |
|
1000 |
[b'aaa', b'xxx', b'bbb', b'yyy', b'ccc'], |
|
1001 |
[b'aaa', b'xxx', b'bbb', b'yyy', b'ccc']) |
|
1002 |
overlappedInsertExpected = [b'aaa', b'xxx', b'yyy', b'bbb'] |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1003 |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1004 |
def testOverlappedInsert(self): |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1005 |
self.doMerge([b'aaa', b'bbb'], |
1006 |
[b'aaa', b'xxx', b'yyy', b'bbb'], |
|
1007 |
[b'aaa', b'xxx', b'bbb'], self.overlappedInsertExpected) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1008 |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1009 |
# really it ought to reduce this to
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1010 |
# [b'aaa', b'xxx', b'yyy', b'bbb']
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1011 |
|
1012 |
def testClashReplace(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1013 |
self.doMerge([b'aaa'], |
1014 |
[b'xxx'], |
|
1015 |
[b'yyy', b'zzz'], |
|
1016 |
[b'<<<<<<< ', b'xxx', b'=======', b'yyy', b'zzz', |
|
1017 |
b'>>>>>>> ']) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1018 |
|
1019 |
def testNonClashInsert1(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1020 |
self.doMerge([b'aaa'], |
1021 |
[b'xxx', b'aaa'], |
|
1022 |
[b'yyy', b'zzz'], |
|
1023 |
[b'<<<<<<< ', b'xxx', b'aaa', b'=======', b'yyy', b'zzz', |
|
1024 |
b'>>>>>>> ']) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1025 |
|
1026 |
def testNonClashInsert2(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1027 |
self.doMerge([b'aaa'], |
1028 |
[b'aaa'], |
|
1029 |
[b'yyy', b'zzz'], |
|
1030 |
[b'yyy', b'zzz']) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1031 |
|
1032 |
def testDeleteAndModify(self): |
|
1033 |
"""Clashing delete and modification. |
|
1034 |
||
1035 |
If one side modifies a region and the other deletes it then
|
|
1036 |
there should be a conflict with one side blank.
|
|
1037 |
"""
|
|
1038 |
||
1039 |
#######################################
|
|
1040 |
# skippd, not working yet
|
|
1041 |
return
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1042 |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1043 |
self.doMerge([b'aaa', b'bbb', b'ccc'], |
1044 |
[b'aaa', b'ddd', b'ccc'], |
|
1045 |
[b'aaa', b'ccc'], |
|
1046 |
[b'<<<<<<<< ', b'aaa', b'=======', b'>>>>>>> ', b'ccc']) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1047 |
|
1048 |
def _test_merge_from_strings(self, base, a, b, expected): |
|
1049 |
w = self.get_file() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1050 |
w.add_lines(b'text0', [], base.splitlines(True)) |
1051 |
w.add_lines(b'text1', [b'text0'], a.splitlines(True)) |
|
1052 |
w.add_lines(b'text2', [b'text0'], b.splitlines(True)) |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1053 |
self.log('merge plan:') |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1054 |
p = list(w.plan_merge(b'text1', b'text2')) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1055 |
for state, line in p: |
1056 |
if line: |
|
1057 |
self.log('%12s | %s' % (state, line[:-1])) |
|
1058 |
self.log('merge result:') |
|
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
1059 |
result_text = b''.join(w.weave_merge(p)) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1060 |
self.log(result_text) |
1061 |
self.assertEqualDiff(result_text, expected) |
|
1062 |
||
1063 |
def test_weave_merge_conflicts(self): |
|
1064 |
# does weave merge properly handle plans that end with unchanged?
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1065 |
result = b''.join(self.get_file().weave_merge([('new-a', b'hello\n')])) |
1066 |
self.assertEqual(result, b'hello\n') |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1067 |
|
1068 |
def test_deletion_extended(self): |
|
1069 |
"""One side deletes, the other deletes more. |
|
1070 |
"""
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1071 |
base = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1072 |
line 1
|
1073 |
line 2
|
|
1074 |
line 3
|
|
1075 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1076 |
a = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1077 |
line 1
|
1078 |
line 2
|
|
1079 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1080 |
b = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1081 |
line 1
|
1082 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1083 |
result = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1084 |
line 1
|
|
4312.1.3
by John Arbash Meinel
Different sides deleting different amounts is now a conflict. |
1085 |
<<<<<<<\x20 |
1086 |
line 2
|
|
1087 |
=======
|
|
1088 |
>>>>>>>\x20 |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1089 |
"""
|
1090 |
self._test_merge_from_strings(base, a, b, result) |
|
1091 |
||
1092 |
def test_deletion_overlap(self): |
|
1093 |
"""Delete overlapping regions with no other conflict. |
|
1094 |
||
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1095 |
Arguably it'd be better to treat these as agreement, rather than
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1096 |
conflict, but for now conflict is safer.
|
1097 |
"""
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1098 |
base = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1099 |
start context
|
1100 |
int a() {} |
|
1101 |
int b() {} |
|
1102 |
int c() {} |
|
1103 |
end context
|
|
1104 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1105 |
a = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1106 |
start context
|
1107 |
int a() {} |
|
1108 |
end context
|
|
1109 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1110 |
b = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1111 |
start context
|
1112 |
int c() {} |
|
1113 |
end context
|
|
1114 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1115 |
result = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1116 |
start context
|
|
3943.8.2
by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20. |
1117 |
<<<<<<<\x20 |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1118 |
int a() {} |
1119 |
=======
|
|
1120 |
int c() {} |
|
|
3943.8.2
by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20. |
1121 |
>>>>>>>\x20 |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1122 |
end context
|
1123 |
"""
|
|
1124 |
self._test_merge_from_strings(base, a, b, result) |
|
1125 |
||
1126 |
def test_agreement_deletion(self): |
|
1127 |
"""Agree to delete some lines, without conflicts.""" |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1128 |
base = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1129 |
start context
|
1130 |
base line 1
|
|
1131 |
base line 2
|
|
1132 |
end context
|
|
1133 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1134 |
a = b"""\ |
1135 |
start context
|
|
1136 |
base line 1
|
|
1137 |
end context
|
|
1138 |
"""
|
|
1139 |
b = b"""\ |
|
1140 |
start context
|
|
1141 |
base line 1
|
|
1142 |
end context
|
|
1143 |
"""
|
|
1144 |
result = b"""\ |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1145 |
start context
|
1146 |
base line 1
|
|
1147 |
end context
|
|
1148 |
"""
|
|
1149 |
self._test_merge_from_strings(base, a, b, result) |
|
1150 |
||
1151 |
def test_sync_on_deletion(self): |
|
1152 |
"""Specific case of merge where we can synchronize incorrectly. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1153 |
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1154 |
A previous version of the weave merge concluded that the two versions
|
1155 |
agreed on deleting line 2, and this could be a synchronization point.
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1156 |
Line 1 was then considered in isolation, and thought to be deleted on
|
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1157 |
both sides.
|
1158 |
||
1159 |
It's better to consider the whole thing as a disagreement region.
|
|
1160 |
"""
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1161 |
base = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1162 |
start context
|
1163 |
base line 1
|
|
1164 |
base line 2
|
|
1165 |
end context
|
|
1166 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1167 |
a = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1168 |
start context
|
1169 |
base line 1
|
|
1170 |
a's replacement line 2
|
|
1171 |
end context
|
|
1172 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1173 |
b = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1174 |
start context
|
1175 |
b replaces
|
|
1176 |
both lines
|
|
1177 |
end context
|
|
1178 |
"""
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1179 |
result = b"""\ |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1180 |
start context
|
|
3943.8.2
by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20. |
1181 |
<<<<<<<\x20 |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1182 |
base line 1
|
1183 |
a's replacement line 2
|
|
1184 |
=======
|
|
1185 |
b replaces
|
|
1186 |
both lines
|
|
|
3943.8.2
by Marius Kruger
fix tests relying on trailing whitespace by replacing it with \x20. |
1187 |
>>>>>>>\x20 |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1188 |
end context
|
1189 |
"""
|
|
1190 |
self._test_merge_from_strings(base, a, b, result) |
|
1191 |
||
1192 |
||
|
2535.3.1
by Andrew Bennetts
Add get_format_signature to VersionedFile |
1193 |
class TestWeaveMerge(TestCaseWithMemoryTransport, MergeCasesMixin): |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1194 |
|
1195 |
def get_file(self, name='foo'): |
|
|
5609.9.4
by Vincent Ladeuil
Use self.get_transport instead of transport.get_transport where possible. |
1196 |
return WeaveFile(name, self.get_transport(), |
|
5273.1.7
by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through |
1197 |
create=True) |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1198 |
|
1199 |
def log_contents(self, w): |
|
1200 |
self.log('weave is:') |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
1201 |
tmpf = BytesIO() |
|
1664.2.9
by Aaron Bentley
Ported weave merge test to versionedfile |
1202 |
write_weave(w, tmpf) |
1203 |
self.log(tmpf.getvalue()) |
|
1204 |
||
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1205 |
overlappedInsertExpected = [b'aaa', b'<<<<<<< ', b'xxx', b'yyy', b'=======', |
1206 |
b'xxx', b'>>>>>>> ', b'bbb'] |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1207 |
|
1208 |
||
1209 |
class TestContentFactoryAdaption(TestCaseWithMemoryTransport): |
|
1210 |
||
1211 |
def test_select_adaptor(self): |
|
|
3350.3.7
by Robert Collins
Create a registry of versioned file record adapters. |
1212 |
"""Test expected adapters exist.""" |
1213 |
# One scenario for each lookup combination we expect to use.
|
|
1214 |
# Each is source_kind, requested_kind, adapter class
|
|
1215 |
scenarios = [ |
|
1216 |
('knit-delta-gz', 'fulltext', _mod_knit.DeltaPlainToFullText), |
|
1217 |
('knit-ft-gz', 'fulltext', _mod_knit.FTPlainToFullText), |
|
1218 |
('knit-annotated-delta-gz', 'knit-delta-gz', |
|
1219 |
_mod_knit.DeltaAnnotatedToUnannotated), |
|
1220 |
('knit-annotated-delta-gz', 'fulltext', |
|
1221 |
_mod_knit.DeltaAnnotatedToFullText), |
|
1222 |
('knit-annotated-ft-gz', 'knit-ft-gz', |
|
1223 |
_mod_knit.FTAnnotatedToUnannotated), |
|
1224 |
('knit-annotated-ft-gz', 'fulltext', |
|
1225 |
_mod_knit.FTAnnotatedToFullText), |
|
1226 |
]
|
|
1227 |
for source, requested, klass in scenarios: |
|
1228 |
adapter_factory = versionedfile.adapter_registry.get( |
|
1229 |
(source, requested)) |
|
1230 |
adapter = adapter_factory(None) |
|
1231 |
self.assertIsInstance(adapter, klass) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1232 |
|
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1233 |
def get_knit(self, annotated=True): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1234 |
mapper = ConstantMapper('knit') |
1235 |
transport = self.get_transport() |
|
1236 |
return make_file_factory(annotated, mapper)(transport) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1237 |
|
1238 |
def helpGetBytes(self, f, ft_adapter, delta_adapter): |
|
|
3350.3.22
by Robert Collins
Review feedback. |
1239 |
"""Grab the interested adapted texts for tests.""" |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1240 |
# origin is a fulltext
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1241 |
entries = f.get_record_stream([(b'origin',)], 'unordered', False) |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1242 |
base = next(entries) |
|
4005.3.1
by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters. |
1243 |
ft_data = ft_adapter.get_bytes(base) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1244 |
# merged is both a delta and multiple parents.
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1245 |
entries = f.get_record_stream([(b'merged',)], 'unordered', False) |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1246 |
merged = next(entries) |
|
4005.3.1
by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters. |
1247 |
delta_data = delta_adapter.get_bytes(merged) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1248 |
return ft_data, delta_data |
1249 |
||
1250 |
def test_deannotation_noeol(self): |
|
1251 |
"""Test converting annotated knits to unannotated knits.""" |
|
1252 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1253 |
f = self.get_knit() |
1254 |
get_diamond_files(f, 1, trailing_eol=False) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1255 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1256 |
_mod_knit.FTAnnotatedToUnannotated( |
1257 |
None), |
|
1258 |
_mod_knit.DeltaAnnotatedToUnannotated(None)) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1259 |
self.assertEqual( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1260 |
b'version origin 1 b284f94827db1fa2970d9e2014f080413b547a7e\n' |
1261 |
b'origin\n' |
|
1262 |
b'end origin\n', |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
1263 |
GzipFile(mode='rb', fileobj=BytesIO(ft_data)).read()) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1264 |
self.assertEqual( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1265 |
b'version merged 4 32c2e79763b3f90e8ccde37f9710b6629c25a796\n' |
1266 |
b'1,2,3\nleft\nright\nmerged\nend merged\n', |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
1267 |
GzipFile(mode='rb', fileobj=BytesIO(delta_data)).read()) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1268 |
|
1269 |
def test_deannotation(self): |
|
1270 |
"""Test converting annotated knits to unannotated knits.""" |
|
1271 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1272 |
f = self.get_knit() |
1273 |
get_diamond_files(f, 1) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1274 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1275 |
_mod_knit.FTAnnotatedToUnannotated( |
1276 |
None), |
|
1277 |
_mod_knit.DeltaAnnotatedToUnannotated(None)) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1278 |
self.assertEqual( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1279 |
b'version origin 1 00e364d235126be43292ab09cb4686cf703ddc17\n' |
1280 |
b'origin\n' |
|
1281 |
b'end origin\n', |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
1282 |
GzipFile(mode='rb', fileobj=BytesIO(ft_data)).read()) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1283 |
self.assertEqual( |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1284 |
b'version merged 3 ed8bce375198ea62444dc71952b22cfc2b09226d\n' |
1285 |
b'2,2,2\nright\nmerged\nend merged\n', |
|
|
6621.22.2
by Martin
Use BytesIO or StringIO from bzrlib.sixish |
1286 |
GzipFile(mode='rb', fileobj=BytesIO(delta_data)).read()) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1287 |
|
1288 |
def test_annotated_to_fulltext_no_eol(self): |
|
1289 |
"""Test adapting annotated knits to full texts (for -> weaves).""" |
|
1290 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1291 |
f = self.get_knit() |
1292 |
get_diamond_files(f, 1, trailing_eol=False) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1293 |
# Reconstructing a full text requires a backing versioned file, and it
|
1294 |
# must have the base lines requested from it.
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1295 |
logged_vf = versionedfile.RecordingVersionedFilesDecorator(f) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1296 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1297 |
_mod_knit.FTAnnotatedToFullText( |
1298 |
None), |
|
1299 |
_mod_knit.DeltaAnnotatedToFullText(logged_vf)) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1300 |
self.assertEqual(b'origin', ft_data) |
1301 |
self.assertEqual(b'base\nleft\nright\nmerged', delta_data) |
|
1302 |
self.assertEqual([('get_record_stream', [(b'left',)], 'unordered', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1303 |
True)], logged_vf.calls) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1304 |
|
1305 |
def test_annotated_to_fulltext(self): |
|
1306 |
"""Test adapting annotated knits to full texts (for -> weaves).""" |
|
1307 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1308 |
f = self.get_knit() |
1309 |
get_diamond_files(f, 1) |
|
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1310 |
# Reconstructing a full text requires a backing versioned file, and it
|
1311 |
# must have the base lines requested from it.
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1312 |
logged_vf = versionedfile.RecordingVersionedFilesDecorator(f) |
|
3350.3.4
by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts. |
1313 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1314 |
_mod_knit.FTAnnotatedToFullText( |
1315 |
None), |
|
1316 |
_mod_knit.DeltaAnnotatedToFullText(logged_vf)) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1317 |
self.assertEqual(b'origin\n', ft_data) |
1318 |
self.assertEqual(b'base\nleft\nright\nmerged\n', delta_data) |
|
1319 |
self.assertEqual([('get_record_stream', [(b'left',)], 'unordered', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1320 |
True)], logged_vf.calls) |
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1321 |
|
1322 |
def test_unannotated_to_fulltext(self): |
|
1323 |
"""Test adapting unannotated knits to full texts. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1324 |
|
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1325 |
This is used for -> weaves, and for -> annotated knits.
|
1326 |
"""
|
|
1327 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1328 |
f = self.get_knit(annotated=False) |
1329 |
get_diamond_files(f, 1) |
|
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1330 |
# Reconstructing a full text requires a backing versioned file, and it
|
1331 |
# must have the base lines requested from it.
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1332 |
logged_vf = versionedfile.RecordingVersionedFilesDecorator(f) |
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1333 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1334 |
_mod_knit.FTPlainToFullText( |
1335 |
None), |
|
1336 |
_mod_knit.DeltaPlainToFullText(logged_vf)) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1337 |
self.assertEqual(b'origin\n', ft_data) |
1338 |
self.assertEqual(b'base\nleft\nright\nmerged\n', delta_data) |
|
1339 |
self.assertEqual([('get_record_stream', [(b'left',)], 'unordered', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1340 |
True)], logged_vf.calls) |
|
3350.3.5
by Robert Collins
Create adapters from plain compressed knit content. |
1341 |
|
|
3350.3.6
by Robert Collins
Test EOL behaviour of plain knit record adapters. |
1342 |
def test_unannotated_to_fulltext_no_eol(self): |
1343 |
"""Test adapting unannotated knits to full texts. |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
1344 |
|
|
3350.3.6
by Robert Collins
Test EOL behaviour of plain knit record adapters. |
1345 |
This is used for -> weaves, and for -> annotated knits.
|
1346 |
"""
|
|
1347 |
# we need a full text, and a delta
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1348 |
f = self.get_knit(annotated=False) |
1349 |
get_diamond_files(f, 1, trailing_eol=False) |
|
|
3350.3.6
by Robert Collins
Test EOL behaviour of plain knit record adapters. |
1350 |
# Reconstructing a full text requires a backing versioned file, and it
|
1351 |
# must have the base lines requested from it.
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1352 |
logged_vf = versionedfile.RecordingVersionedFilesDecorator(f) |
|
3350.3.6
by Robert Collins
Test EOL behaviour of plain knit record adapters. |
1353 |
ft_data, delta_data = self.helpGetBytes(f, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1354 |
_mod_knit.FTPlainToFullText( |
1355 |
None), |
|
1356 |
_mod_knit.DeltaPlainToFullText(logged_vf)) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1357 |
self.assertEqual(b'origin', ft_data) |
1358 |
self.assertEqual(b'base\nleft\nright\nmerged', delta_data) |
|
1359 |
self.assertEqual([('get_record_stream', [(b'left',)], 'unordered', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1360 |
True)], logged_vf.calls) |
|
3350.3.6
by Robert Collins
Test EOL behaviour of plain knit record adapters. |
1361 |
|
|
3350.6.1
by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to |
1362 |
|
1363 |
class TestKeyMapper(TestCaseWithMemoryTransport): |
|
1364 |
"""Tests for various key mapping logic.""" |
|
1365 |
||
1366 |
def test_identity_mapper(self): |
|
1367 |
mapper = versionedfile.ConstantMapper("inventory") |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1368 |
self.assertEqual("inventory", mapper.map((b'foo@ar',))) |
1369 |
self.assertEqual("inventory", mapper.map((b'quux',))) |
|
|
3350.6.1
by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to |
1370 |
|
1371 |
def test_prefix_mapper(self): |
|
1372 |
#format5: plain
|
|
1373 |
mapper = versionedfile.PrefixMapper() |
|
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
1374 |
self.assertEqual("file-id", mapper.map((b"file-id", b"revision-id"))) |
1375 |
self.assertEqual("new-id", mapper.map((b"new-id", b"revision-id"))) |
|
1376 |
self.assertEqual((b'file-id',), mapper.unmap("file-id")) |
|
1377 |
self.assertEqual((b'new-id',), mapper.unmap("new-id")) |
|
|
3350.6.1
by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to |
1378 |
|
1379 |
def test_hash_prefix_mapper(self): |
|
1380 |
#format6: hash + plain
|
|
1381 |
mapper = versionedfile.HashPrefixMapper() |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1382 |
self.assertEqual( |
1383 |
"9b/file-id", mapper.map((b"file-id", b"revision-id"))) |
|
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
1384 |
self.assertEqual("45/new-id", mapper.map((b"new-id", b"revision-id"))) |
|
6963.2.12
by Jelmer Vernooij
Fix some more tests. |
1385 |
self.assertEqual((b'file-id',), mapper.unmap("9b/file-id")) |
1386 |
self.assertEqual((b'new-id',), mapper.unmap("45/new-id")) |
|
|
3350.6.1
by Robert Collins
* New ``versionedfile.KeyMapper`` interface to abstract out the access to |
1387 |
|
1388 |
def test_hash_escaped_mapper(self): |
|
1389 |
#knit1: hash + escaped
|
|
1390 |
mapper = versionedfile.HashEscapedPrefixMapper() |
|
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
1391 |
self.assertEqual("88/%2520", mapper.map((b" ", b"revision-id"))) |
1392 |
self.assertEqual("ed/fil%2545-%2549d", mapper.map((b"filE-Id", |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1393 |
b"revision-id"))) |
|
6963.2.13
by Jelmer Vernooij
Fix more tests. |
1394 |
self.assertEqual("88/ne%2557-%2549d", mapper.map((b"neW-Id", |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1395 |
b"revision-id"))) |
|
6963.2.12
by Jelmer Vernooij
Fix some more tests. |
1396 |
self.assertEqual((b'filE-Id',), mapper.unmap("ed/fil%2545-%2549d")) |
1397 |
self.assertEqual((b'neW-Id',), mapper.unmap("88/ne%2557-%2549d")) |
|
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
1398 |
|
1399 |
||
1400 |
class TestVersionedFiles(TestCaseWithMemoryTransport): |
|
1401 |
"""Tests for the multiple-file variant of VersionedFile.""" |
|
1402 |
||
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1403 |
# We want to be sure of behaviour for:
|
1404 |
# weaves prefix layout (weave texts)
|
|
1405 |
# individually named weaves (weave inventories)
|
|
1406 |
# annotated knits - prefix|hash|hash-escape layout, we test the third only
|
|
1407 |
# as it is the most complex mapper.
|
|
1408 |
# individually named knits
|
|
1409 |
# individual no-graph knits in packs (signatures)
|
|
1410 |
# individual graph knits in packs (inventories)
|
|
1411 |
# individual graph nocompression knits in packs (revisions)
|
|
1412 |
# plain text knits in packs (texts)
|
|
1413 |
len_one_scenarios = [ |
|
1414 |
('weave-named', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1415 |
'cleanup': None, |
1416 |
'factory': make_versioned_files_factory(WeaveFile, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1417 |
ConstantMapper('inventory')), |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1418 |
'graph': True, |
1419 |
'key_length': 1, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1420 |
'support_partial_insertion': False, |
1421 |
}),
|
|
1422 |
('named-knit', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1423 |
'cleanup': None, |
1424 |
'factory': make_file_factory(False, ConstantMapper('revisions')), |
|
1425 |
'graph': True, |
|
1426 |
'key_length': 1, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1427 |
'support_partial_insertion': False, |
1428 |
}),
|
|
1429 |
('named-nograph-nodelta-knit-pack', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1430 |
'cleanup': cleanup_pack_knit, |
1431 |
'factory': make_pack_factory(False, False, 1), |
|
1432 |
'graph': False, |
|
1433 |
'key_length': 1, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1434 |
'support_partial_insertion': False, |
1435 |
}),
|
|
1436 |
('named-graph-knit-pack', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1437 |
'cleanup': cleanup_pack_knit, |
1438 |
'factory': make_pack_factory(True, True, 1), |
|
1439 |
'graph': True, |
|
1440 |
'key_length': 1, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1441 |
'support_partial_insertion': True, |
1442 |
}),
|
|
1443 |
('named-graph-nodelta-knit-pack', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1444 |
'cleanup': cleanup_pack_knit, |
1445 |
'factory': make_pack_factory(True, False, 1), |
|
1446 |
'graph': True, |
|
1447 |
'key_length': 1, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1448 |
'support_partial_insertion': False, |
1449 |
}),
|
|
1450 |
('groupcompress-nograph', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1451 |
'cleanup': groupcompress.cleanup_pack_group, |
1452 |
'factory': groupcompress.make_pack_factory(False, False, 1), |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1453 |
'graph': False, |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1454 |
'key_length': 1, |
1455 |
'support_partial_insertion': False, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1456 |
}),
|
1457 |
]
|
|
1458 |
len_two_scenarios = [ |
|
1459 |
('weave-prefix', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1460 |
'cleanup': None, |
1461 |
'factory': make_versioned_files_factory(WeaveFile, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1462 |
PrefixMapper()), |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1463 |
'graph': True, |
1464 |
'key_length': 2, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1465 |
'support_partial_insertion': False, |
1466 |
}),
|
|
1467 |
('annotated-knit-escape', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1468 |
'cleanup': None, |
1469 |
'factory': make_file_factory(True, HashEscapedPrefixMapper()), |
|
1470 |
'graph': True, |
|
1471 |
'key_length': 2, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1472 |
'support_partial_insertion': False, |
1473 |
}),
|
|
1474 |
('plain-knit-pack', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1475 |
'cleanup': cleanup_pack_knit, |
1476 |
'factory': make_pack_factory(True, True, 2), |
|
1477 |
'graph': True, |
|
1478 |
'key_length': 2, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1479 |
'support_partial_insertion': True, |
1480 |
}),
|
|
1481 |
('groupcompress', { |
|
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1482 |
'cleanup': groupcompress.cleanup_pack_group, |
1483 |
'factory': groupcompress.make_pack_factory(True, False, 1), |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1484 |
'graph': True, |
|
6809.1.1
by Martin
Apply 2to3 ws_comma fixer |
1485 |
'key_length': 1, |
1486 |
'support_partial_insertion': False, |
|
|
5559.2.2
by Martin Pool
Change to using standard load_tests_apply_scenarios. |
1487 |
}),
|
1488 |
]
|
|
1489 |
||
1490 |
scenarios = len_one_scenarios + len_two_scenarios |
|
1491 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1492 |
def get_versionedfiles(self, relpath='files'): |
1493 |
transport = self.get_transport(relpath) |
|
1494 |
if relpath != '.': |
|
1495 |
transport.mkdir('.') |
|
1496 |
files = self.factory(transport) |
|
1497 |
if self.cleanup is not None: |
|
|
4985.2.1
by Vincent Ladeuil
Deploy addAttrCleanup on the whole test suite. |
1498 |
self.addCleanup(self.cleanup, files) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1499 |
return files |
1500 |
||
|
4398.8.8
by John Arbash Meinel
Respond to Andrew's review comments. |
1501 |
def get_simple_key(self, suffix): |
1502 |
"""Return a key for the object under test.""" |
|
1503 |
if self.key_length == 1: |
|
1504 |
return (suffix,) |
|
1505 |
else: |
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1506 |
return (b'FileA',) + (suffix,) |
|
4398.8.8
by John Arbash Meinel
Respond to Andrew's review comments. |
1507 |
|
|
5816.8.2
by Andrew Bennetts
Add test for without_fallbacks. |
1508 |
def test_add_fallback_implies_without_fallbacks(self): |
1509 |
f = self.get_versionedfiles('files') |
|
1510 |
if getattr(f, 'add_fallback_versioned_files', None) is None: |
|
1511 |
raise TestNotApplicable("%s doesn't support fallbacks" |
|
1512 |
% (f.__class__.__name__,)) |
|
1513 |
g = self.get_versionedfiles('fallback') |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1514 |
key_a = self.get_simple_key(b'a') |
1515 |
g.add_lines(key_a, [], [b'\n']) |
|
|
5816.8.2
by Andrew Bennetts
Add test for without_fallbacks. |
1516 |
f.add_fallback_versioned_files(g) |
1517 |
self.assertTrue(key_a in f.get_parent_map([key_a])) |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1518 |
self.assertFalse( |
1519 |
key_a in f.without_fallbacks().get_parent_map([key_a])) |
|
|
5816.8.2
by Andrew Bennetts
Add test for without_fallbacks. |
1520 |
|
|
4398.8.1
by John Arbash Meinel
Add a VersionedFile.add_text() api. |
1521 |
def test_add_lines(self): |
1522 |
f = self.get_versionedfiles() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1523 |
key0 = self.get_simple_key(b'r0') |
1524 |
key1 = self.get_simple_key(b'r1') |
|
1525 |
key2 = self.get_simple_key(b'r2') |
|
1526 |
keyf = self.get_simple_key(b'foo') |
|
1527 |
f.add_lines(key0, [], [b'a\n', b'b\n']) |
|
|
4398.8.1
by John Arbash Meinel
Add a VersionedFile.add_text() api. |
1528 |
if self.graph: |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1529 |
f.add_lines(key1, [key0], [b'b\n', b'c\n']) |
|
4398.8.1
by John Arbash Meinel
Add a VersionedFile.add_text() api. |
1530 |
else: |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1531 |
f.add_lines(key1, [], [b'b\n', b'c\n']) |
|
4398.8.1
by John Arbash Meinel
Add a VersionedFile.add_text() api. |
1532 |
keys = f.keys() |
1533 |
self.assertTrue(key0 in keys) |
|
1534 |
self.assertTrue(key1 in keys) |
|
1535 |
records = [] |
|
1536 |
for record in f.get_record_stream([key0, key1], 'unordered', True): |
|
1537 |
records.append((record.key, record.get_bytes_as('fulltext'))) |
|
1538 |
records.sort() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1539 |
self.assertEqual([(key0, b'a\nb\n'), (key1, b'b\nc\n')], records) |
|
4398.8.1
by John Arbash Meinel
Add a VersionedFile.add_text() api. |
1540 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1541 |
def test_annotate(self): |
1542 |
files = self.get_versionedfiles() |
|
1543 |
self.get_diamond_files(files) |
|
1544 |
if self.key_length == 1: |
|
1545 |
prefix = () |
|
1546 |
else: |
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1547 |
prefix = (b'FileA',) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1548 |
# introduced full text
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1549 |
origins = files.annotate(prefix + (b'origin',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1550 |
self.assertEqual([ |
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1551 |
(prefix + (b'origin',), b'origin\n')], |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1552 |
origins) |
1553 |
# a delta
|
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1554 |
origins = files.annotate(prefix + (b'base',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1555 |
self.assertEqual([ |
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1556 |
(prefix + (b'base',), b'base\n')], |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1557 |
origins) |
1558 |
# a merge
|
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1559 |
origins = files.annotate(prefix + (b'merged',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1560 |
if self.graph: |
1561 |
self.assertEqual([ |
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
1562 |
(prefix + (b'base',), b'base\n'), |
1563 |
(prefix + (b'left',), b'left\n'), |
|
1564 |
(prefix + (b'right',), b'right\n'), |
|
1565 |
(prefix + (b'merged',), b'merged\n') |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1566 |
],
|
1567 |
origins) |
|
1568 |
else: |
|
1569 |
# Without a graph everything is new.
|
|
1570 |
self.assertEqual([ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1571 |
(prefix + (b'merged',), b'base\n'), |
1572 |
(prefix + (b'merged',), b'left\n'), |
|
1573 |
(prefix + (b'merged',), b'right\n'), |
|
1574 |
(prefix + (b'merged',), b'merged\n') |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1575 |
],
|
1576 |
origins) |
|
1577 |
self.assertRaises(RevisionNotPresent, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1578 |
files.annotate, prefix + ('missing-key',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1579 |
|
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
1580 |
def test_check_no_parameters(self): |
1581 |
files = self.get_versionedfiles() |
|
1582 |
||
1583 |
def test_check_progressbar_parameter(self): |
|
1584 |
"""A progress bar can be supplied because check can be a generator.""" |
|
1585 |
pb = ui.ui_factory.nested_progress_bar() |
|
1586 |
self.addCleanup(pb.finished) |
|
1587 |
files = self.get_versionedfiles() |
|
1588 |
files.check(progress_bar=pb) |
|
1589 |
||
1590 |
def test_check_with_keys_becomes_generator(self): |
|
|
4454.3.65
by John Arbash Meinel
Tests that VF implementations support .get_annotator() |
1591 |
files = self.get_versionedfiles() |
1592 |
self.get_diamond_files(files) |
|
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
1593 |
keys = files.keys() |
1594 |
entries = files.check(keys=keys) |
|
1595 |
seen = set() |
|
1596 |
# Texts output should be fulltexts.
|
|
1597 |
self.capture_stream(files, entries, seen.add, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1598 |
files.get_parent_map(keys), require_fulltext=True) |
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
1599 |
# All texts should be output.
|
1600 |
self.assertEqual(set(keys), seen) |
|
|
4454.3.65
by John Arbash Meinel
Tests that VF implementations support .get_annotator() |
1601 |
|
|
4744.2.5
by John Arbash Meinel
Change to a generic 'VersionedFiles.clear_cache()' api. |
1602 |
def test_clear_cache(self): |
1603 |
files = self.get_versionedfiles() |
|
1604 |
files.clear_cache() |
|
1605 |
||
|
3350.6.2
by Robert Collins
Prepare parameterised test environment. |
1606 |
def test_construct(self): |
1607 |
"""Each parameterised test can be constructed on a transport.""" |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1608 |
files = self.get_versionedfiles() |
1609 |
||
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1610 |
def get_diamond_files(self, files, trailing_eol=True, left_only=False, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1611 |
nokeys=False): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1612 |
return get_diamond_files(files, self.key_length, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1613 |
trailing_eol=trailing_eol, nograph=not self.graph, |
1614 |
left_only=left_only, nokeys=nokeys) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1615 |
|
|
4398.8.4
by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles |
1616 |
def _add_content_nostoresha(self, add_lines): |
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1617 |
"""When nostore_sha is supplied using old content raises.""" |
1618 |
vf = self.get_versionedfiles() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1619 |
empty_text = (b'a', []) |
1620 |
sample_text_nl = (b'b', [b"foo\n", b"bar\n"]) |
|
1621 |
sample_text_no_nl = (b'c', [b"foo\n", b"bar"]) |
|
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1622 |
shas = [] |
1623 |
for version, lines in (empty_text, sample_text_nl, sample_text_no_nl): |
|
|
4398.8.4
by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles |
1624 |
if add_lines: |
1625 |
sha, _, _ = vf.add_lines(self.get_simple_key(version), [], |
|
1626 |
lines) |
|
1627 |
else: |
|
|
6839
by Jelmer Vernooij
Merge lp:~jelmer/brz/get-full. |
1628 |
sha, _, _ = vf.add_lines(self.get_simple_key(version), [], |
1629 |
lines) |
|
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1630 |
shas.append(sha) |
1631 |
# we now have a copy of all the lines in the vf.
|
|
1632 |
for sha, (version, lines) in zip( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1633 |
shas, (empty_text, sample_text_nl, sample_text_no_nl)): |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1634 |
new_key = self.get_simple_key(version + b"2") |
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1635 |
self.assertRaises(errors.ExistingContent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1636 |
vf.add_lines, new_key, [], lines, |
1637 |
nostore_sha=sha) |
|
|
4398.8.4
by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles |
1638 |
self.assertRaises(errors.ExistingContent, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1639 |
vf.add_lines, new_key, [], lines, |
1640 |
nostore_sha=sha) |
|
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1641 |
# and no new version should have been added.
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
1642 |
record = next(vf.get_record_stream([new_key], 'unordered', True)) |
|
4119.1.1
by John Arbash Meinel
Move the 'add_lines_nostoresha' to being tested against all VF implementations. |
1643 |
self.assertEqual('absent', record.storage_kind) |
1644 |
||
|
4398.8.4
by John Arbash Meinel
Implement add_text for GroupCompressVersionedFiles |
1645 |
def test_add_lines_nostoresha(self): |
1646 |
self._add_content_nostoresha(add_lines=True) |
|
1647 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1648 |
def test_add_lines_return(self): |
1649 |
files = self.get_versionedfiles() |
|
1650 |
# save code by using the stock data insertion helper.
|
|
1651 |
adds = self.get_diamond_files(files) |
|
1652 |
results = [] |
|
1653 |
# We can only validate the first 2 elements returned from add_lines.
|
|
1654 |
for add in adds: |
|
1655 |
self.assertEqual(3, len(add)) |
|
1656 |
results.append(add[:2]) |
|
1657 |
if self.key_length == 1: |
|
1658 |
self.assertEqual([ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1659 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
1660 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1661 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1662 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1663 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)], |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1664 |
results) |
1665 |
elif self.key_length == 2: |
|
1666 |
self.assertEqual([ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1667 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
1668 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
|
1669 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1670 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1671 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1672 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1673 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1674 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1675 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23), |
|
1676 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)], |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1677 |
results) |
1678 |
||
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1679 |
def test_add_lines_no_key_generates_chk_key(self): |
1680 |
files = self.get_versionedfiles() |
|
1681 |
# save code by using the stock data insertion helper.
|
|
1682 |
adds = self.get_diamond_files(files, nokeys=True) |
|
1683 |
results = [] |
|
1684 |
# We can only validate the first 2 elements returned from add_lines.
|
|
1685 |
for add in adds: |
|
1686 |
self.assertEqual(3, len(add)) |
|
1687 |
results.append(add[:2]) |
|
1688 |
if self.key_length == 1: |
|
1689 |
self.assertEqual([ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1690 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
1691 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1692 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1693 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1694 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)], |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1695 |
results) |
1696 |
# Check the added items got CHK keys.
|
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1697 |
self.assertEqual({ |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1698 |
(b'sha1:00e364d235126be43292ab09cb4686cf703ddc17',), |
1699 |
(b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44',), |
|
1700 |
(b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1',), |
|
1701 |
(b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f',), |
|
1702 |
(b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d',), |
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1703 |
},
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1704 |
files.keys()) |
1705 |
elif self.key_length == 2: |
|
1706 |
self.assertEqual([ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1707 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
1708 |
(b'00e364d235126be43292ab09cb4686cf703ddc17', 7), |
|
1709 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1710 |
(b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', 5), |
|
1711 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1712 |
(b'a8478686da38e370e32e42e8a0c220e33ee9132f', 10), |
|
1713 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1714 |
(b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', 11), |
|
1715 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23), |
|
1716 |
(b'ed8bce375198ea62444dc71952b22cfc2b09226d', 23)], |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1717 |
results) |
1718 |
# Check the added items got CHK keys.
|
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1719 |
self.assertEqual({ |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1720 |
(b'FileA', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'), |
1721 |
(b'FileA', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'), |
|
1722 |
(b'FileA', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'), |
|
1723 |
(b'FileA', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'), |
|
1724 |
(b'FileA', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'), |
|
1725 |
(b'FileB', b'sha1:00e364d235126be43292ab09cb4686cf703ddc17'), |
|
1726 |
(b'FileB', b'sha1:51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44'), |
|
1727 |
(b'FileB', b'sha1:9ef09dfa9d86780bdec9219a22560c6ece8e0ef1'), |
|
1728 |
(b'FileB', b'sha1:a8478686da38e370e32e42e8a0c220e33ee9132f'), |
|
1729 |
(b'FileB', b'sha1:ed8bce375198ea62444dc71952b22cfc2b09226d'), |
|
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
1730 |
},
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1731 |
files.keys()) |
1732 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1733 |
def test_empty_lines(self): |
1734 |
"""Empty files can be stored.""" |
|
1735 |
f = self.get_versionedfiles() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1736 |
key_a = self.get_simple_key(b'a') |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1737 |
f.add_lines(key_a, [], []) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1738 |
self.assertEqual(b'', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1739 |
next(f.get_record_stream([key_a], 'unordered', True |
1740 |
)).get_bytes_as('fulltext')) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1741 |
key_b = self.get_simple_key(b'b') |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1742 |
f.add_lines(key_b, self.get_parents([key_a]), []) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1743 |
self.assertEqual(b'', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1744 |
next(f.get_record_stream([key_b], 'unordered', True |
1745 |
)).get_bytes_as('fulltext')) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1746 |
|
1747 |
def test_newline_only(self): |
|
1748 |
f = self.get_versionedfiles() |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1749 |
key_a = self.get_simple_key(b'a') |
1750 |
f.add_lines(key_a, [], [b'\n']) |
|
1751 |
self.assertEqual(b'\n', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1752 |
next(f.get_record_stream([key_a], 'unordered', True |
1753 |
)).get_bytes_as('fulltext')) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1754 |
key_b = self.get_simple_key(b'b') |
1755 |
f.add_lines(key_b, self.get_parents([key_a]), [b'\n']) |
|
1756 |
self.assertEqual(b'\n', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1757 |
next(f.get_record_stream([key_b], 'unordered', True |
1758 |
)).get_bytes_as('fulltext')) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1759 |
|
|
4593.5.35
by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry. |
1760 |
def test_get_known_graph_ancestry(self): |
1761 |
f = self.get_versionedfiles() |
|
|
4593.5.36
by John Arbash Meinel
a few more implementations of the interface. |
1762 |
if not self.graph: |
1763 |
raise TestNotApplicable('ancestry info only relevant with graph.') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1764 |
key_a = self.get_simple_key(b'a') |
1765 |
key_b = self.get_simple_key(b'b') |
|
1766 |
key_c = self.get_simple_key(b'c') |
|
|
4593.5.35
by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry. |
1767 |
# A
|
1768 |
# |\
|
|
1769 |
# | B
|
|
1770 |
# |/
|
|
1771 |
# C
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1772 |
f.add_lines(key_a, [], [b'\n']) |
1773 |
f.add_lines(key_b, [key_a], [b'\n']) |
|
1774 |
f.add_lines(key_c, [key_a, key_b], [b'\n']) |
|
|
4593.5.35
by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry. |
1775 |
kg = f.get_known_graph_ancestry([key_c]) |
1776 |
self.assertIsInstance(kg, _mod_graph.KnownGraph) |
|
1777 |
self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort())) |
|
1778 |
||
|
4634.11.2
by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241) |
1779 |
def test_known_graph_with_fallbacks(self): |
1780 |
f = self.get_versionedfiles('files') |
|
1781 |
if not self.graph: |
|
1782 |
raise TestNotApplicable('ancestry info only relevant with graph.') |
|
1783 |
if getattr(f, 'add_fallback_versioned_files', None) is None: |
|
1784 |
raise TestNotApplicable("%s doesn't support fallbacks" |
|
1785 |
% (f.__class__.__name__,)) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1786 |
key_a = self.get_simple_key(b'a') |
1787 |
key_b = self.get_simple_key(b'b') |
|
1788 |
key_c = self.get_simple_key(b'c') |
|
|
4634.11.2
by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241) |
1789 |
# A only in fallback
|
1790 |
# |\
|
|
1791 |
# | B
|
|
1792 |
# |/
|
|
1793 |
# C
|
|
1794 |
g = self.get_versionedfiles('fallback') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1795 |
g.add_lines(key_a, [], [b'\n']) |
|
4634.11.2
by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241) |
1796 |
f.add_fallback_versioned_files(g) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1797 |
f.add_lines(key_b, [key_a], [b'\n']) |
1798 |
f.add_lines(key_c, [key_a, key_b], [b'\n']) |
|
|
4634.11.2
by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241) |
1799 |
kg = f.get_known_graph_ancestry([key_c]) |
1800 |
self.assertEqual([key_a, key_b, key_c], list(kg.topo_sort())) |
|
1801 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1802 |
def test_get_record_stream_empty(self): |
1803 |
"""An empty stream can be requested without error.""" |
|
1804 |
f = self.get_versionedfiles() |
|
1805 |
entries = f.get_record_stream([], 'unordered', False) |
|
1806 |
self.assertEqual([], list(entries)) |
|
1807 |
||
1808 |
def assertValidStorageKind(self, storage_kind): |
|
1809 |
"""Assert that storage_kind is a valid storage_kind.""" |
|
1810 |
self.assertSubset([storage_kind], |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1811 |
['mpdiff', 'knit-annotated-ft', 'knit-annotated-delta', |
1812 |
'knit-ft', 'knit-delta', 'chunked', 'fulltext', |
|
1813 |
'knit-annotated-ft-gz', 'knit-annotated-delta-gz', 'knit-ft-gz', |
|
1814 |
'knit-delta-gz', |
|
1815 |
'knit-delta-closure', 'knit-delta-closure-ref', |
|
1816 |
'groupcompress-block', 'groupcompress-block-ref']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1817 |
|
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
1818 |
def capture_stream(self, f, entries, on_seen, parents, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1819 |
require_fulltext=False): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1820 |
"""Capture a stream for testing.""" |
1821 |
for factory in entries: |
|
1822 |
on_seen(factory.key) |
|
1823 |
self.assertValidStorageKind(factory.storage_kind) |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1824 |
if factory.sha1 is not None: |
1825 |
self.assertEqual(f.get_sha1s([factory.key])[factory.key], |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1826 |
factory.sha1) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1827 |
self.assertEqual(parents[factory.key], factory.parents) |
1828 |
self.assertIsInstance(factory.get_bytes_as(factory.storage_kind), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1829 |
bytes) |
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
1830 |
if require_fulltext: |
1831 |
factory.get_bytes_as('fulltext') |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1832 |
|
1833 |
def test_get_record_stream_interface(self): |
|
1834 |
"""each item in a stream has to provide a regular interface.""" |
|
1835 |
files = self.get_versionedfiles() |
|
1836 |
self.get_diamond_files(files) |
|
1837 |
keys, _ = self.get_keys_and_sort_order() |
|
1838 |
parent_map = files.get_parent_map(keys) |
|
1839 |
entries = files.get_record_stream(keys, 'unordered', False) |
|
1840 |
seen = set() |
|
1841 |
self.capture_stream(files, entries, seen.add, parent_map) |
|
1842 |
self.assertEqual(set(keys), seen) |
|
1843 |
||
1844 |
def get_keys_and_sort_order(self): |
|
1845 |
"""Get diamond test keys list, and their sort ordering.""" |
|
1846 |
if self.key_length == 1: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1847 |
keys = [(b'merged',), (b'left',), (b'right',), (b'base',)] |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1848 |
sort_order = {(b'merged',): 2, (b'left',): 1, |
1849 |
(b'right',): 1, (b'base',): 0} |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1850 |
else: |
1851 |
keys = [ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1852 |
(b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'), |
1853 |
(b'FileA', b'base'), |
|
1854 |
(b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'), |
|
1855 |
(b'FileB', b'base'), |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1856 |
]
|
1857 |
sort_order = { |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
1858 |
(b'FileA', b'merged'): 2, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1, |
1859 |
(b'FileA', b'base'): 0, |
|
1860 |
(b'FileB', b'merged'): 2, (b'FileB', b'left'): 1, (b'FileB', b'right'): 1, |
|
1861 |
(b'FileB', b'base'): 0, |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1862 |
}
|
1863 |
return keys, sort_order |
|
1864 |
||
|
4111.1.1
by Robert Collins
Add a groupcompress sort order. |
1865 |
def get_keys_and_groupcompress_sort_order(self): |
1866 |
"""Get diamond test keys list, and their groupcompress sort ordering.""" |
|
1867 |
if self.key_length == 1: |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1868 |
keys = [(b'merged',), (b'left',), (b'right',), (b'base',)] |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1869 |
sort_order = {(b'merged',): 0, (b'left',): 1, |
1870 |
(b'right',): 1, (b'base',): 2} |
|
|
4111.1.1
by Robert Collins
Add a groupcompress sort order. |
1871 |
else: |
1872 |
keys = [ |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1873 |
(b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'), |
1874 |
(b'FileA', b'base'), |
|
1875 |
(b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'), |
|
1876 |
(b'FileB', b'base'), |
|
|
4111.1.1
by Robert Collins
Add a groupcompress sort order. |
1877 |
]
|
1878 |
sort_order = { |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1879 |
(b'FileA', b'merged'): 0, (b'FileA', b'left'): 1, (b'FileA', b'right'): 1, |
1880 |
(b'FileA', b'base'): 2, |
|
1881 |
(b'FileB', b'merged'): 3, (b'FileB', b'left'): 4, (b'FileB', b'right'): 4, |
|
1882 |
(b'FileB', b'base'): 5, |
|
|
4111.1.1
by Robert Collins
Add a groupcompress sort order. |
1883 |
}
|
1884 |
return keys, sort_order |
|
1885 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1886 |
def test_get_record_stream_interface_ordered(self): |
1887 |
"""each item in a stream has to provide a regular interface.""" |
|
1888 |
files = self.get_versionedfiles() |
|
1889 |
self.get_diamond_files(files) |
|
1890 |
keys, sort_order = self.get_keys_and_sort_order() |
|
1891 |
parent_map = files.get_parent_map(keys) |
|
1892 |
entries = files.get_record_stream(keys, 'topological', False) |
|
1893 |
seen = [] |
|
1894 |
self.capture_stream(files, entries, seen.append, parent_map) |
|
1895 |
self.assertStreamOrder(sort_order, seen, keys) |
|
1896 |
||
1897 |
def test_get_record_stream_interface_ordered_with_delta_closure(self): |
|
1898 |
"""each item must be accessible as a fulltext.""" |
|
1899 |
files = self.get_versionedfiles() |
|
1900 |
self.get_diamond_files(files) |
|
1901 |
keys, sort_order = self.get_keys_and_sort_order() |
|
1902 |
parent_map = files.get_parent_map(keys) |
|
1903 |
entries = files.get_record_stream(keys, 'topological', True) |
|
1904 |
seen = [] |
|
1905 |
for factory in entries: |
|
1906 |
seen.append(factory.key) |
|
1907 |
self.assertValidStorageKind(factory.storage_kind) |
|
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
1908 |
self.assertSubset([factory.sha1], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1909 |
[None, files.get_sha1s([factory.key])[factory.key]]) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1910 |
self.assertEqual(parent_map[factory.key], factory.parents) |
1911 |
# self.assertEqual(files.get_text(factory.key),
|
|
|
3890.2.1
by John Arbash Meinel
Start working on a ChunkedContentFactory. |
1912 |
ft_bytes = factory.get_bytes_as('fulltext') |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
1913 |
self.assertIsInstance(ft_bytes, bytes) |
|
3890.2.1
by John Arbash Meinel
Start working on a ChunkedContentFactory. |
1914 |
chunked_bytes = factory.get_bytes_as('chunked') |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1915 |
self.assertEqualDiff(ft_bytes, b''.join(chunked_bytes)) |
|
3890.2.1
by John Arbash Meinel
Start working on a ChunkedContentFactory. |
1916 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1917 |
self.assertStreamOrder(sort_order, seen, keys) |
1918 |
||
|
4111.1.1
by Robert Collins
Add a groupcompress sort order. |
1919 |
def test_get_record_stream_interface_groupcompress(self): |
1920 |
"""each item in a stream has to provide a regular interface.""" |
|
1921 |
files = self.get_versionedfiles() |
|
1922 |
self.get_diamond_files(files) |
|
1923 |
keys, sort_order = self.get_keys_and_groupcompress_sort_order() |
|
1924 |
parent_map = files.get_parent_map(keys) |
|
1925 |
entries = files.get_record_stream(keys, 'groupcompress', False) |
|
1926 |
seen = [] |
|
1927 |
self.capture_stream(files, entries, seen.append, parent_map) |
|
1928 |
self.assertStreamOrder(sort_order, seen, keys) |
|
1929 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1930 |
def assertStreamOrder(self, sort_order, seen, keys): |
1931 |
self.assertEqual(len(set(seen)), len(keys)) |
|
1932 |
if self.key_length == 1: |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1933 |
lows = {(): 0} |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1934 |
else: |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1935 |
lows = {(b'FileA',): 0, (b'FileB',): 0} |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1936 |
if not self.graph: |
1937 |
self.assertEqual(set(keys), set(seen)) |
|
1938 |
else: |
|
1939 |
for key in seen: |
|
1940 |
sort_pos = sort_order[key] |
|
1941 |
self.assertTrue(sort_pos >= lows[key[:-1]], |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1942 |
"Out of order in sorted stream: %r, %r" % (key, seen)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1943 |
lows[key[:-1]] = sort_pos |
1944 |
||
1945 |
def test_get_record_stream_unknown_storage_kind_raises(self): |
|
1946 |
"""Asking for a storage kind that the stream cannot supply raises.""" |
|
1947 |
files = self.get_versionedfiles() |
|
1948 |
self.get_diamond_files(files) |
|
1949 |
if self.key_length == 1: |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1950 |
keys = [(b'merged',), (b'left',), (b'right',), (b'base',)] |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1951 |
else: |
1952 |
keys = [ |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1953 |
(b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'), |
1954 |
(b'FileA', b'base'), |
|
1955 |
(b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'), |
|
1956 |
(b'FileB', b'base'), |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1957 |
]
|
1958 |
parent_map = files.get_parent_map(keys) |
|
1959 |
entries = files.get_record_stream(keys, 'unordered', False) |
|
1960 |
# We track the contents because we should be able to try, fail a
|
|
1961 |
# particular kind and then ask for one that works and continue.
|
|
1962 |
seen = set() |
|
1963 |
for factory in entries: |
|
1964 |
seen.add(factory.key) |
|
1965 |
self.assertValidStorageKind(factory.storage_kind) |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
1966 |
if factory.sha1 is not None: |
1967 |
self.assertEqual(files.get_sha1s([factory.key])[factory.key], |
|
1968 |
factory.sha1) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1969 |
self.assertEqual(parent_map[factory.key], factory.parents) |
1970 |
# currently no stream emits mpdiff
|
|
1971 |
self.assertRaises(errors.UnavailableRepresentation, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1972 |
factory.get_bytes_as, 'mpdiff') |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1973 |
self.assertIsInstance(factory.get_bytes_as(factory.storage_kind), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1974 |
bytes) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1975 |
self.assertEqual(set(keys), seen) |
1976 |
||
1977 |
def test_get_record_stream_missing_records_are_absent(self): |
|
1978 |
files = self.get_versionedfiles() |
|
1979 |
self.get_diamond_files(files) |
|
1980 |
if self.key_length == 1: |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
1981 |
keys = [(b'merged',), (b'left',), (b'right',), |
1982 |
(b'absent',), (b'base',)] |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1983 |
else: |
1984 |
keys = [ |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
1985 |
(b'FileA', b'merged'), (b'FileA', b'left'), (b'FileA', b'right'), |
1986 |
(b'FileA', b'absent'), (b'FileA', b'base'), |
|
1987 |
(b'FileB', b'merged'), (b'FileB', b'left'), (b'FileB', b'right'), |
|
1988 |
(b'FileB', b'absent'), (b'FileB', b'base'), |
|
1989 |
(b'absent', b'absent'), |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
1990 |
]
|
1991 |
parent_map = files.get_parent_map(keys) |
|
1992 |
entries = files.get_record_stream(keys, 'unordered', False) |
|
1993 |
self.assertAbsentRecord(files, keys, parent_map, entries) |
|
1994 |
entries = files.get_record_stream(keys, 'topological', False) |
|
1995 |
self.assertAbsentRecord(files, keys, parent_map, entries) |
|
1996 |
||
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
1997 |
def assertRecordHasContent(self, record, bytes): |
1998 |
"""Assert that record has the bytes bytes.""" |
|
1999 |
self.assertEqual(bytes, record.get_bytes_as('fulltext')) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2000 |
self.assertEqual(bytes, b''.join(record.get_bytes_as('chunked'))) |
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2001 |
|
|
4005.3.2
by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully. |
2002 |
def test_get_record_stream_native_formats_are_wire_ready_one_ft(self): |
2003 |
files = self.get_versionedfiles() |
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
2004 |
key = self.get_simple_key(b'foo') |
2005 |
files.add_lines(key, (), [b'my text\n', b'content']) |
|
|
4005.3.2
by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully. |
2006 |
stream = files.get_record_stream([key], 'unordered', False) |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
2007 |
record = next(stream) |
|
4005.3.2
by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully. |
2008 |
if record.storage_kind in ('chunked', 'fulltext'): |
2009 |
# chunked and fulltext representations are for direct use not wire
|
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2010 |
# serialisation: check they are able to be used directly. To send
|
2011 |
# such records over the wire translation will be needed.
|
|
|
6963.2.3
by Jelmer Vernooij
Fix some more tests. |
2012 |
self.assertRecordHasContent(record, b"my text\ncontent") |
|
4005.3.2
by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully. |
2013 |
else: |
2014 |
bytes = [record.get_bytes_as(record.storage_kind)] |
|
2015 |
network_stream = versionedfile.NetworkRecordStream(bytes).read() |
|
2016 |
source_record = record |
|
2017 |
records = [] |
|
2018 |
for record in network_stream: |
|
2019 |
records.append(record) |
|
2020 |
self.assertEqual(source_record.storage_kind, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2021 |
record.storage_kind) |
|
4005.3.2
by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully. |
2022 |
self.assertEqual(source_record.parents, record.parents) |
2023 |
self.assertEqual( |
|
2024 |
source_record.get_bytes_as(source_record.storage_kind), |
|
2025 |
record.get_bytes_as(record.storage_kind)) |
|
2026 |
self.assertEqual(1, len(records)) |
|
2027 |
||
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2028 |
def assertStreamMetaEqual(self, records, expected, stream): |
2029 |
"""Assert that streams expected and stream have the same records. |
|
|
4032.1.2
by John Arbash Meinel
Track down a few more files that have trailing whitespace. |
2030 |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2031 |
:param records: A list to collect the seen records.
|
2032 |
:return: A generator of the records in stream.
|
|
2033 |
"""
|
|
|
6631.2.3
by Martin
Fix per_versionedfile test failures and rethink future_builtins |
2034 |
# We make assertions during copying to catch things early for easier
|
2035 |
# debugging. This must use the iterating zip() from the future.
|
|
|
6631.2.2
by Martin
Run 2to3 itertools fixer and refactor |
2036 |
for record, ref_record in zip(stream, expected): |
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2037 |
records.append(record) |
2038 |
self.assertEqual(ref_record.key, record.key) |
|
2039 |
self.assertEqual(ref_record.storage_kind, record.storage_kind) |
|
2040 |
self.assertEqual(ref_record.parents, record.parents) |
|
2041 |
yield record |
|
2042 |
||
2043 |
def stream_to_bytes_or_skip_counter(self, skipped_records, full_texts, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2044 |
stream): |
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2045 |
"""Convert a stream to a bytes iterator. |
2046 |
||
2047 |
:param skipped_records: A list with one element to increment when a
|
|
2048 |
record is skipped.
|
|
|
4032.1.2
by John Arbash Meinel
Track down a few more files that have trailing whitespace. |
2049 |
:param full_texts: A dict from key->fulltext representation, for
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2050 |
checking chunked or fulltext stored records.
|
2051 |
:param stream: A record_stream.
|
|
2052 |
:return: An iterator over the bytes of each record.
|
|
2053 |
"""
|
|
2054 |
for record in stream: |
|
2055 |
if record.storage_kind in ('chunked', 'fulltext'): |
|
2056 |
skipped_records[0] += 1 |
|
2057 |
# check the content is correct for direct use.
|
|
2058 |
self.assertRecordHasContent(record, full_texts[record.key]) |
|
2059 |
else: |
|
2060 |
yield record.get_bytes_as(record.storage_kind) |
|
2061 |
||
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2062 |
def test_get_record_stream_native_formats_are_wire_ready_ft_delta(self): |
2063 |
files = self.get_versionedfiles() |
|
2064 |
target_files = self.get_versionedfiles('target') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2065 |
key = self.get_simple_key(b'ft') |
2066 |
key_delta = self.get_simple_key(b'delta') |
|
2067 |
files.add_lines(key, (), [b'my text\n', b'content']) |
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2068 |
if self.graph: |
2069 |
delta_parents = (key,) |
|
2070 |
else: |
|
2071 |
delta_parents = () |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2072 |
files.add_lines(key_delta, delta_parents, [ |
2073 |
b'different\n', b'content\n']) |
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2074 |
local = files.get_record_stream([key, key_delta], 'unordered', False) |
2075 |
ref = files.get_record_stream([key, key_delta], 'unordered', False) |
|
2076 |
skipped_records = [0] |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2077 |
full_texts = { |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2078 |
key: b"my text\ncontent", |
2079 |
key_delta: b"different\ncontent\n", |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2080 |
}
|
2081 |
byte_stream = self.stream_to_bytes_or_skip_counter( |
|
2082 |
skipped_records, full_texts, local) |
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2083 |
network_stream = versionedfile.NetworkRecordStream(byte_stream).read() |
2084 |
records = [] |
|
2085 |
# insert the stream from the network into a versioned files object so we can
|
|
2086 |
# check the content was carried across correctly without doing delta
|
|
2087 |
# inspection.
|
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2088 |
target_files.insert_record_stream( |
2089 |
self.assertStreamMetaEqual(records, ref, network_stream)) |
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2090 |
# No duplicates on the wire thank you!
|
2091 |
self.assertEqual(2, len(records) + skipped_records[0]) |
|
2092 |
if len(records): |
|
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2093 |
# if any content was copied it all must have all been.
|
2094 |
self.assertIdenticalVersionedFile(files, target_files) |
|
2095 |
||
2096 |
def test_get_record_stream_native_formats_are_wire_ready_delta(self): |
|
2097 |
# copy a delta over the wire
|
|
2098 |
files = self.get_versionedfiles() |
|
2099 |
target_files = self.get_versionedfiles('target') |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2100 |
key = self.get_simple_key(b'ft') |
2101 |
key_delta = self.get_simple_key(b'delta') |
|
2102 |
files.add_lines(key, (), [b'my text\n', b'content']) |
|
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2103 |
if self.graph: |
2104 |
delta_parents = (key,) |
|
2105 |
else: |
|
2106 |
delta_parents = () |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2107 |
files.add_lines(key_delta, delta_parents, [ |
2108 |
b'different\n', b'content\n']) |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2109 |
# Copy the basis text across so we can reconstruct the delta during
|
2110 |
# insertion into target.
|
|
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2111 |
target_files.insert_record_stream(files.get_record_stream([key], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2112 |
'unordered', False)) |
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2113 |
local = files.get_record_stream([key_delta], 'unordered', False) |
2114 |
ref = files.get_record_stream([key_delta], 'unordered', False) |
|
2115 |
skipped_records = [0] |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2116 |
full_texts = { |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2117 |
key_delta: b"different\ncontent\n", |
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2118 |
}
|
2119 |
byte_stream = self.stream_to_bytes_or_skip_counter( |
|
2120 |
skipped_records, full_texts, local) |
|
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2121 |
network_stream = versionedfile.NetworkRecordStream(byte_stream).read() |
2122 |
records = [] |
|
2123 |
# insert the stream from the network into a versioned files object so we can
|
|
2124 |
# check the content was carried across correctly without doing delta
|
|
2125 |
# inspection during check_stream.
|
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2126 |
target_files.insert_record_stream( |
2127 |
self.assertStreamMetaEqual(records, ref, network_stream)) |
|
|
4005.3.4
by Robert Collins
Test copying just a delta over the wire. |
2128 |
# No duplicates on the wire thank you!
|
2129 |
self.assertEqual(1, len(records) + skipped_records[0]) |
|
2130 |
if len(records): |
|
2131 |
# if any content was copied it all must have all been
|
|
|
4005.3.3
by Robert Collins
Test NetworkRecordStream with delta'd texts. |
2132 |
self.assertIdenticalVersionedFile(files, target_files) |
2133 |
||
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2134 |
def test_get_record_stream_wire_ready_delta_closure_included(self): |
2135 |
# copy a delta over the wire with the ability to get its full text.
|
|
2136 |
files = self.get_versionedfiles() |
|
|
6963.2.12
by Jelmer Vernooij
Fix some more tests. |
2137 |
key = self.get_simple_key(b'ft') |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2138 |
key_delta = self.get_simple_key(b'delta') |
2139 |
files.add_lines(key, (), [b'my text\n', b'content']) |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2140 |
if self.graph: |
2141 |
delta_parents = (key,) |
|
2142 |
else: |
|
2143 |
delta_parents = () |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2144 |
files.add_lines(key_delta, delta_parents, [ |
2145 |
b'different\n', b'content\n']) |
|
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2146 |
local = files.get_record_stream([key_delta], 'unordered', True) |
2147 |
ref = files.get_record_stream([key_delta], 'unordered', True) |
|
2148 |
skipped_records = [0] |
|
2149 |
full_texts = { |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2150 |
key_delta: b"different\ncontent\n", |
|
4005.3.5
by Robert Collins
Interface level test for using delta_closure=True over the network. |
2151 |
}
|
2152 |
byte_stream = self.stream_to_bytes_or_skip_counter( |
|
2153 |
skipped_records, full_texts, local) |
|
2154 |
network_stream = versionedfile.NetworkRecordStream(byte_stream).read() |
|
2155 |
records = [] |
|
2156 |
# insert the stream from the network into a versioned files object so we can
|
|
2157 |
# check the content was carried across correctly without doing delta
|
|
2158 |
# inspection during check_stream.
|
|
2159 |
for record in self.assertStreamMetaEqual(records, ref, network_stream): |
|
2160 |
# we have to be able to get the full text out:
|
|
2161 |
self.assertRecordHasContent(record, full_texts[record.key]) |
|
2162 |
# No duplicates on the wire thank you!
|
|
2163 |
self.assertEqual(1, len(records) + skipped_records[0]) |
|
2164 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2165 |
def assertAbsentRecord(self, files, keys, parents, entries): |
2166 |
"""Helper for test_get_record_stream_missing_records_are_absent.""" |
|
2167 |
seen = set() |
|
2168 |
for factory in entries: |
|
2169 |
seen.add(factory.key) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2170 |
if factory.key[-1] == b'absent': |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
2171 |
self.assertEqual('absent', factory.storage_kind) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2172 |
self.assertEqual(None, factory.sha1) |
2173 |
self.assertEqual(None, factory.parents) |
|
2174 |
else: |
|
2175 |
self.assertValidStorageKind(factory.storage_kind) |
|
|
4241.4.1
by Ian Clatworthy
add sha generation support to versionedfiles |
2176 |
if factory.sha1 is not None: |
2177 |
sha1 = files.get_sha1s([factory.key])[factory.key] |
|
2178 |
self.assertEqual(sha1, factory.sha1) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2179 |
self.assertEqual(parents[factory.key], factory.parents) |
2180 |
self.assertIsInstance(factory.get_bytes_as(factory.storage_kind), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2181 |
bytes) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2182 |
self.assertEqual(set(keys), seen) |
2183 |
||
2184 |
def test_filter_absent_records(self): |
|
2185 |
"""Requested missing records can be filter trivially.""" |
|
2186 |
files = self.get_versionedfiles() |
|
2187 |
self.get_diamond_files(files) |
|
2188 |
keys, _ = self.get_keys_and_sort_order() |
|
2189 |
parent_map = files.get_parent_map(keys) |
|
2190 |
# Add an absent record in the middle of the present keys. (We don't ask
|
|
2191 |
# for just absent keys to ensure that content before and after the
|
|
2192 |
# absent keys is still delivered).
|
|
2193 |
present_keys = list(keys) |
|
2194 |
if self.key_length == 1: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2195 |
keys.insert(2, (b'extra',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2196 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2197 |
keys.insert(2, (b'extra', b'extra')) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2198 |
entries = files.get_record_stream(keys, 'unordered', False) |
2199 |
seen = set() |
|
2200 |
self.capture_stream(files, versionedfile.filter_absent(entries), seen.add, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2201 |
parent_map) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2202 |
self.assertEqual(set(present_keys), seen) |
2203 |
||
2204 |
def get_mapper(self): |
|
2205 |
"""Get a mapper suitable for the key length of the test interface.""" |
|
2206 |
if self.key_length == 1: |
|
2207 |
return ConstantMapper('source') |
|
2208 |
else: |
|
2209 |
return HashEscapedPrefixMapper() |
|
2210 |
||
2211 |
def get_parents(self, parents): |
|
2212 |
"""Get parents, taking self.graph into consideration.""" |
|
2213 |
if self.graph: |
|
2214 |
return parents |
|
2215 |
else: |
|
2216 |
return None |
|
2217 |
||
|
4332.3.32
by Robert Collins
Merge bzr.dev. |
2218 |
def test_get_annotator(self): |
2219 |
files = self.get_versionedfiles() |
|
2220 |
self.get_diamond_files(files) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2221 |
origin_key = self.get_simple_key(b'origin') |
2222 |
base_key = self.get_simple_key(b'base') |
|
2223 |
left_key = self.get_simple_key(b'left') |
|
2224 |
right_key = self.get_simple_key(b'right') |
|
2225 |
merged_key = self.get_simple_key(b'merged') |
|
|
4332.3.32
by Robert Collins
Merge bzr.dev. |
2226 |
# annotator = files.get_annotator()
|
2227 |
# introduced full text
|
|
2228 |
origins, lines = files.get_annotator().annotate(origin_key) |
|
2229 |
self.assertEqual([(origin_key,)], origins) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2230 |
self.assertEqual([b'origin\n'], lines) |
|
4332.3.32
by Robert Collins
Merge bzr.dev. |
2231 |
# a delta
|
2232 |
origins, lines = files.get_annotator().annotate(base_key) |
|
2233 |
self.assertEqual([(base_key,)], origins) |
|
2234 |
# a merge
|
|
2235 |
origins, lines = files.get_annotator().annotate(merged_key) |
|
2236 |
if self.graph: |
|
2237 |
self.assertEqual([ |
|
2238 |
(base_key,), |
|
2239 |
(left_key,), |
|
2240 |
(right_key,), |
|
2241 |
(merged_key,), |
|
2242 |
], origins) |
|
2243 |
else: |
|
2244 |
# Without a graph everything is new.
|
|
2245 |
self.assertEqual([ |
|
2246 |
(merged_key,), |
|
2247 |
(merged_key,), |
|
2248 |
(merged_key,), |
|
2249 |
(merged_key,), |
|
2250 |
], origins) |
|
2251 |
self.assertRaises(RevisionNotPresent, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2252 |
files.get_annotator().annotate, self.get_simple_key(b'missing-key')) |
|
4332.3.32
by Robert Collins
Merge bzr.dev. |
2253 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2254 |
def test_get_parent_map(self): |
2255 |
files = self.get_versionedfiles() |
|
2256 |
if self.key_length == 1: |
|
2257 |
parent_details = [ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2258 |
((b'r0',), self.get_parents(())), |
2259 |
((b'r1',), self.get_parents(((b'r0',),))), |
|
2260 |
((b'r2',), self.get_parents(())), |
|
2261 |
((b'r3',), self.get_parents(())), |
|
2262 |
((b'm',), self.get_parents(((b'r0',), (b'r1',), (b'r2',), (b'r3',)))), |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2263 |
]
|
2264 |
else: |
|
2265 |
parent_details = [ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2266 |
((b'FileA', b'r0'), self.get_parents(())), |
2267 |
((b'FileA', b'r1'), self.get_parents(((b'FileA', b'r0'),))), |
|
2268 |
((b'FileA', b'r2'), self.get_parents(())), |
|
2269 |
((b'FileA', b'r3'), self.get_parents(())), |
|
2270 |
((b'FileA', b'm'), self.get_parents(((b'FileA', b'r0'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2271 |
(b'FileA', b'r1'), (b'FileA', b'r2'), (b'FileA', b'r3')))), |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2272 |
]
|
2273 |
for key, parents in parent_details: |
|
2274 |
files.add_lines(key, parents, []) |
|
2275 |
# immediately after adding it should be queryable.
|
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2276 |
self.assertEqual({key: parents}, files.get_parent_map([key])) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2277 |
# We can ask for an empty set
|
2278 |
self.assertEqual({}, files.get_parent_map([])) |
|
2279 |
# We can ask for many keys
|
|
2280 |
all_parents = dict(parent_details) |
|
2281 |
self.assertEqual(all_parents, files.get_parent_map(all_parents.keys())) |
|
2282 |
# Absent keys are just not included in the result.
|
|
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
2283 |
keys = list(all_parents.keys()) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2284 |
if self.key_length == 1: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2285 |
keys.insert(1, (b'missing',)) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2286 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2287 |
keys.insert(1, (b'missing', b'missing')) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2288 |
# Absent keys are just ignored
|
2289 |
self.assertEqual(all_parents, files.get_parent_map(keys)) |
|
2290 |
||
2291 |
def test_get_sha1s(self): |
|
2292 |
files = self.get_versionedfiles() |
|
2293 |
self.get_diamond_files(files) |
|
2294 |
if self.key_length == 1: |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2295 |
keys = [(b'base',), (b'origin',), (b'left',), |
2296 |
(b'merged',), (b'right',)] |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2297 |
else: |
2298 |
# ask for shas from different prefixes.
|
|
2299 |
keys = [ |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2300 |
(b'FileA', b'base'), (b'FileB', b'origin'), (b'FileA', b'left'), |
2301 |
(b'FileA', b'merged'), (b'FileB', b'right'), |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2302 |
]
|
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
2303 |
self.assertEqual({ |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2304 |
keys[0]: b'51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44', |
2305 |
keys[1]: b'00e364d235126be43292ab09cb4686cf703ddc17', |
|
2306 |
keys[2]: b'a8478686da38e370e32e42e8a0c220e33ee9132f', |
|
2307 |
keys[3]: b'ed8bce375198ea62444dc71952b22cfc2b09226d', |
|
2308 |
keys[4]: b'9ef09dfa9d86780bdec9219a22560c6ece8e0ef1', |
|
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
2309 |
},
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2310 |
files.get_sha1s(keys)) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2311 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2312 |
def test_insert_record_stream_empty(self): |
2313 |
"""Inserting an empty record stream should work.""" |
|
2314 |
files = self.get_versionedfiles() |
|
2315 |
files.insert_record_stream([]) |
|
2316 |
||
2317 |
def assertIdenticalVersionedFile(self, expected, actual): |
|
2318 |
"""Assert that left and right have the same contents.""" |
|
2319 |
self.assertEqual(set(actual.keys()), set(expected.keys())) |
|
2320 |
actual_parents = actual.get_parent_map(actual.keys()) |
|
2321 |
if self.graph: |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2322 |
self.assertEqual( |
2323 |
actual_parents, expected.get_parent_map(expected.keys())) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2324 |
else: |
2325 |
for key, parents in actual_parents.items(): |
|
2326 |
self.assertEqual(None, parents) |
|
2327 |
for key in actual.keys(): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2328 |
actual_text = next(actual.get_record_stream( |
2329 |
[key], 'unordered', True)).get_bytes_as('fulltext') |
|
2330 |
expected_text = next(expected.get_record_stream( |
|
2331 |
[key], 'unordered', True)).get_bytes_as('fulltext') |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2332 |
self.assertEqual(actual_text, expected_text) |
2333 |
||
2334 |
def test_insert_record_stream_fulltexts(self): |
|
2335 |
"""Any file should accept a stream of fulltexts.""" |
|
2336 |
files = self.get_versionedfiles() |
|
2337 |
mapper = self.get_mapper() |
|
2338 |
source_transport = self.get_transport('source') |
|
2339 |
source_transport.mkdir('.') |
|
2340 |
# weaves always output fulltexts.
|
|
2341 |
source = make_versioned_files_factory(WeaveFile, mapper)( |
|
2342 |
source_transport) |
|
2343 |
self.get_diamond_files(source, trailing_eol=False) |
|
2344 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2345 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2346 |
files.insert_record_stream(stream) |
2347 |
self.assertIdenticalVersionedFile(source, files) |
|
2348 |
||
2349 |
def test_insert_record_stream_fulltexts_noeol(self): |
|
2350 |
"""Any file should accept a stream of fulltexts.""" |
|
2351 |
files = self.get_versionedfiles() |
|
2352 |
mapper = self.get_mapper() |
|
2353 |
source_transport = self.get_transport('source') |
|
2354 |
source_transport.mkdir('.') |
|
2355 |
# weaves always output fulltexts.
|
|
2356 |
source = make_versioned_files_factory(WeaveFile, mapper)( |
|
2357 |
source_transport) |
|
2358 |
self.get_diamond_files(source, trailing_eol=False) |
|
2359 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2360 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2361 |
files.insert_record_stream(stream) |
2362 |
self.assertIdenticalVersionedFile(source, files) |
|
2363 |
||
2364 |
def test_insert_record_stream_annotated_knits(self): |
|
2365 |
"""Any file should accept a stream from plain knits.""" |
|
2366 |
files = self.get_versionedfiles() |
|
2367 |
mapper = self.get_mapper() |
|
2368 |
source_transport = self.get_transport('source') |
|
2369 |
source_transport.mkdir('.') |
|
2370 |
source = make_file_factory(True, mapper)(source_transport) |
|
2371 |
self.get_diamond_files(source) |
|
2372 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2373 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2374 |
files.insert_record_stream(stream) |
2375 |
self.assertIdenticalVersionedFile(source, files) |
|
2376 |
||
2377 |
def test_insert_record_stream_annotated_knits_noeol(self): |
|
2378 |
"""Any file should accept a stream from plain knits.""" |
|
2379 |
files = self.get_versionedfiles() |
|
2380 |
mapper = self.get_mapper() |
|
2381 |
source_transport = self.get_transport('source') |
|
2382 |
source_transport.mkdir('.') |
|
2383 |
source = make_file_factory(True, mapper)(source_transport) |
|
2384 |
self.get_diamond_files(source, trailing_eol=False) |
|
2385 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2386 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2387 |
files.insert_record_stream(stream) |
2388 |
self.assertIdenticalVersionedFile(source, files) |
|
2389 |
||
2390 |
def test_insert_record_stream_plain_knits(self): |
|
2391 |
"""Any file should accept a stream from plain knits.""" |
|
2392 |
files = self.get_versionedfiles() |
|
2393 |
mapper = self.get_mapper() |
|
2394 |
source_transport = self.get_transport('source') |
|
2395 |
source_transport.mkdir('.') |
|
2396 |
source = make_file_factory(False, mapper)(source_transport) |
|
2397 |
self.get_diamond_files(source) |
|
2398 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2399 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2400 |
files.insert_record_stream(stream) |
2401 |
self.assertIdenticalVersionedFile(source, files) |
|
2402 |
||
2403 |
def test_insert_record_stream_plain_knits_noeol(self): |
|
2404 |
"""Any file should accept a stream from plain knits.""" |
|
2405 |
files = self.get_versionedfiles() |
|
2406 |
mapper = self.get_mapper() |
|
2407 |
source_transport = self.get_transport('source') |
|
2408 |
source_transport.mkdir('.') |
|
2409 |
source = make_file_factory(False, mapper)(source_transport) |
|
2410 |
self.get_diamond_files(source, trailing_eol=False) |
|
2411 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2412 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2413 |
files.insert_record_stream(stream) |
2414 |
self.assertIdenticalVersionedFile(source, files) |
|
2415 |
||
2416 |
def test_insert_record_stream_existing_keys(self): |
|
2417 |
"""Inserting keys already in a file should not error.""" |
|
2418 |
files = self.get_versionedfiles() |
|
2419 |
source = self.get_versionedfiles('source') |
|
2420 |
self.get_diamond_files(source) |
|
2421 |
# insert some keys into f.
|
|
2422 |
self.get_diamond_files(files, left_only=True) |
|
2423 |
stream = source.get_record_stream(source.keys(), 'topological', |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2424 |
False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2425 |
files.insert_record_stream(stream) |
2426 |
self.assertIdenticalVersionedFile(source, files) |
|
2427 |
||
2428 |
def test_insert_record_stream_missing_keys(self): |
|
2429 |
"""Inserting a stream with absent keys should raise an error.""" |
|
2430 |
files = self.get_versionedfiles() |
|
2431 |
source = self.get_versionedfiles('source') |
|
|
6963.2.11
by Jelmer Vernooij
Fix some more tests. |
2432 |
stream = source.get_record_stream([(b'missing',) * self.key_length], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2433 |
'topological', False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2434 |
self.assertRaises(errors.RevisionNotPresent, files.insert_record_stream, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2435 |
stream) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2436 |
|
2437 |
def test_insert_record_stream_out_of_order(self): |
|
2438 |
"""An out of order stream can either error or work.""" |
|
2439 |
files = self.get_versionedfiles() |
|
2440 |
source = self.get_versionedfiles('source') |
|
2441 |
self.get_diamond_files(source) |
|
2442 |
if self.key_length == 1: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2443 |
origin_keys = [(b'origin',)] |
2444 |
end_keys = [(b'merged',), (b'left',)] |
|
2445 |
start_keys = [(b'right',), (b'base',)] |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2446 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2447 |
origin_keys = [(b'FileA', b'origin'), (b'FileB', b'origin')] |
2448 |
end_keys = [(b'FileA', b'merged',), (b'FileA', b'left',), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2449 |
(b'FileB', b'merged',), (b'FileB', b'left',)] |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2450 |
start_keys = [(b'FileA', b'right',), (b'FileA', b'base',), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2451 |
(b'FileB', b'right',), (b'FileB', b'base',)] |
2452 |
origin_entries = source.get_record_stream( |
|
2453 |
origin_keys, 'unordered', False) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2454 |
end_entries = source.get_record_stream(end_keys, 'topological', False) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2455 |
start_entries = source.get_record_stream( |
2456 |
start_keys, 'topological', False) |
|
|
6631.2.3
by Martin
Fix per_versionedfile test failures and rethink future_builtins |
2457 |
entries = itertools.chain(origin_entries, end_entries, start_entries) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2458 |
try: |
2459 |
files.insert_record_stream(entries) |
|
2460 |
except RevisionNotPresent: |
|
2461 |
# Must not have corrupted the file.
|
|
2462 |
files.check() |
|
2463 |
else: |
|
2464 |
self.assertIdenticalVersionedFile(source, files) |
|
2465 |
||
|
4634.84.2
by Andrew Bennetts
Add test. |
2466 |
def test_insert_record_stream_long_parent_chain_out_of_order(self): |
2467 |
"""An out of order stream can either error or work.""" |
|
2468 |
if not self.graph: |
|
2469 |
raise TestNotApplicable('ancestry info only relevant with graph.') |
|
2470 |
# Create a reasonably long chain of records based on each other, where
|
|
2471 |
# most will be deltas.
|
|
2472 |
source = self.get_versionedfiles('source') |
|
2473 |
parents = () |
|
2474 |
keys = [] |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2475 |
content = [(b'same same %d\n' % n) for n in range(500)] |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
2476 |
letters = b'abcdefghijklmnopqrstuvwxyz' |
2477 |
for i in range(len(letters)): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2478 |
letter = letters[i:i + 1] |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
2479 |
key = (b'key-' + letter,) |
|
4634.84.2
by Andrew Bennetts
Add test. |
2480 |
if self.key_length == 2: |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2481 |
key = (b'prefix',) + key |
2482 |
content.append(b'content for ' + letter + b'\n') |
|
|
4634.84.2
by Andrew Bennetts
Add test. |
2483 |
source.add_lines(key, parents, content) |
2484 |
keys.append(key) |
|
2485 |
parents = (key,) |
|
2486 |
# Create a stream of these records, excluding the first record that the
|
|
2487 |
# rest ultimately depend upon, and insert it into a new vf.
|
|
2488 |
streams = [] |
|
2489 |
for key in reversed(keys): |
|
2490 |
streams.append(source.get_record_stream([key], 'unordered', False)) |
|
|
6631.2.3
by Martin
Fix per_versionedfile test failures and rethink future_builtins |
2491 |
deltas = itertools.chain.from_iterable(streams[:-1]) |
|
4634.84.2
by Andrew Bennetts
Add test. |
2492 |
files = self.get_versionedfiles() |
2493 |
try: |
|
2494 |
files.insert_record_stream(deltas) |
|
2495 |
except RevisionNotPresent: |
|
2496 |
# Must not have corrupted the file.
|
|
2497 |
files.check() |
|
2498 |
else: |
|
2499 |
# Must only report either just the first key as a missing parent,
|
|
2500 |
# no key as missing (for nodelta scenarios).
|
|
2501 |
missing = set(files.get_missing_compression_parent_keys()) |
|
2502 |
missing.discard(keys[0]) |
|
2503 |
self.assertEqual(set(), missing) |
|
2504 |
||
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2505 |
def get_knit_delta_source(self): |
2506 |
"""Get a source that can produce a stream with knit delta records, |
|
2507 |
regardless of this test's scenario.
|
|
2508 |
"""
|
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2509 |
mapper = self.get_mapper() |
2510 |
source_transport = self.get_transport('source') |
|
2511 |
source_transport.mkdir('.') |
|
2512 |
source = make_file_factory(False, mapper)(source_transport) |
|
|
4009.3.1
by Andrew Bennetts
Fix test_insert_record_stream_delta_missing_basis_no_corruption to test what it claims to, and fix KnitVersionedFiles.get_record_stream to match the expected exception. |
2513 |
get_diamond_files(source, self.key_length, trailing_eol=True, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2514 |
nograph=False, left_only=False) |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2515 |
return source |
2516 |
||
2517 |
def test_insert_record_stream_delta_missing_basis_no_corruption(self): |
|
2518 |
"""Insertion where a needed basis is not included notifies the caller |
|
2519 |
of the missing basis. In the meantime a record missing its basis is
|
|
2520 |
not added.
|
|
2521 |
"""
|
|
2522 |
source = self.get_knit_delta_source() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2523 |
keys = [self.get_simple_key(b'origin'), self.get_simple_key(b'merged')] |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2524 |
entries = source.get_record_stream(keys, 'unordered', False) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2525 |
files = self.get_versionedfiles() |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2526 |
if self.support_partial_insertion: |
|
4009.3.12
by Robert Collins
Polish on inserting record streams with missing compression parents. |
2527 |
self.assertEqual([], |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2528 |
list(files.get_missing_compression_parent_keys())) |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2529 |
files.insert_record_stream(entries) |
2530 |
missing_bases = files.get_missing_compression_parent_keys() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2531 |
self.assertEqual({self.get_simple_key(b'left')}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2532 |
set(missing_bases)) |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2533 |
self.assertEqual(set(keys), set(files.get_parent_map(keys))) |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2534 |
else: |
2535 |
self.assertRaises( |
|
2536 |
errors.RevisionNotPresent, files.insert_record_stream, entries) |
|
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2537 |
files.check() |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2538 |
|
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2539 |
def test_insert_record_stream_delta_missing_basis_can_be_added_later(self): |
2540 |
"""Insertion where a needed basis is not included notifies the caller |
|
2541 |
of the missing basis. That basis can be added in a second
|
|
2542 |
insert_record_stream call that does not need to repeat records present
|
|
|
4009.3.3
by Andrew Bennetts
Add docstrings. |
2543 |
in the previous stream. The record(s) that required that basis are
|
2544 |
fully inserted once their basis is no longer missing.
|
|
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2545 |
"""
|
2546 |
if not self.support_partial_insertion: |
|
2547 |
raise TestNotApplicable( |
|
2548 |
'versioned file scenario does not support partial insertion') |
|
2549 |
source = self.get_knit_delta_source() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2550 |
entries = source.get_record_stream([self.get_simple_key(b'origin'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2551 |
self.get_simple_key(b'merged')], 'unordered', False) |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2552 |
files = self.get_versionedfiles() |
2553 |
files.insert_record_stream(entries) |
|
2554 |
missing_bases = files.get_missing_compression_parent_keys() |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2555 |
self.assertEqual({self.get_simple_key(b'left')}, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2556 |
set(missing_bases)) |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2557 |
# 'merged' is inserted (although a commit of a write group involving
|
2558 |
# this versionedfiles would fail).
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2559 |
merged_key = self.get_simple_key(b'merged') |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2560 |
self.assertEqual( |
|
6973.14.4
by Jelmer Vernooij
Fix checking for options. |
2561 |
[merged_key], list(files.get_parent_map([merged_key]).keys())) |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2562 |
# Add the full delta closure of the missing records
|
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2563 |
missing_entries = source.get_record_stream( |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2564 |
missing_bases, 'unordered', True) |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2565 |
files.insert_record_stream(missing_entries) |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2566 |
# Now 'merged' is fully inserted (and a commit would succeed).
|
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2567 |
self.assertEqual([], list(files.get_missing_compression_parent_keys())) |
2568 |
self.assertEqual( |
|
|
6973.14.4
by Jelmer Vernooij
Fix checking for options. |
2569 |
[merged_key], list(files.get_parent_map([merged_key]).keys())) |
|
4009.3.7
by Andrew Bennetts
Most tests passing. |
2570 |
files.check() |
|
4009.3.2
by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later. |
2571 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2572 |
def test_iter_lines_added_or_present_in_keys(self): |
2573 |
# test that we get at least an equalset of the lines added by
|
|
2574 |
# versions in the store.
|
|
2575 |
# the ordering here is to make a tree so that dumb searches have
|
|
2576 |
# more changes to muck up.
|
|
2577 |
||
|
4961.2.9
by Martin Pool
Rip out most remaining uses of DummyProgressBar |
2578 |
class InstrumentedProgress(progress.ProgressTask): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2579 |
|
2580 |
def __init__(self): |
|
|
4961.2.9
by Martin Pool
Rip out most remaining uses of DummyProgressBar |
2581 |
progress.ProgressTask.__init__(self) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2582 |
self.updates = [] |
2583 |
||
2584 |
def update(self, msg=None, current=None, total=None): |
|
2585 |
self.updates.append((msg, current, total)) |
|
2586 |
||
2587 |
files = self.get_versionedfiles() |
|
2588 |
# add a base to get included
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2589 |
files.add_lines(self.get_simple_key(b'base'), (), [b'base\n']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2590 |
# add a ancestor to be included on one side
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2591 |
files.add_lines(self.get_simple_key( |
2592 |
b'lancestor'), (), [b'lancestor\n']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2593 |
# add a ancestor to be included on the other side
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2594 |
files.add_lines(self.get_simple_key(b'rancestor'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2595 |
self.get_parents([self.get_simple_key(b'base')]), [b'rancestor\n']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2596 |
# add a child of rancestor with no eofile-nl
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2597 |
files.add_lines(self.get_simple_key(b'child'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2598 |
self.get_parents([self.get_simple_key(b'rancestor')]), |
2599 |
[b'base\n', b'child\n']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2600 |
# add a child of lancestor and base to join the two roots
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2601 |
files.add_lines(self.get_simple_key(b'otherchild'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2602 |
self.get_parents([self.get_simple_key(b'lancestor'), |
2603 |
self.get_simple_key(b'base')]), |
|
2604 |
[b'base\n', b'lancestor\n', b'otherchild\n']) |
|
2605 |
||
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2606 |
def iter_with_keys(keys, expected): |
2607 |
# now we need to see what lines are returned, and how often.
|
|
2608 |
lines = {} |
|
2609 |
progress = InstrumentedProgress() |
|
2610 |
# iterate over the lines
|
|
2611 |
for line in files.iter_lines_added_or_present_in_keys(keys, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2612 |
pb=progress): |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2613 |
lines.setdefault(line, 0) |
2614 |
lines[line] += 1 |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2615 |
if [] != progress.updates: |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2616 |
self.assertEqual(expected, progress.updates) |
2617 |
return lines |
|
2618 |
lines = iter_with_keys( |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2619 |
[self.get_simple_key(b'child'), |
2620 |
self.get_simple_key(b'otherchild')], |
|
|
4103.3.4
by Martin Pool
Update test that depends on progress bar strings |
2621 |
[('Walking content', 0, 2), |
2622 |
('Walking content', 1, 2), |
|
2623 |
('Walking content', 2, 2)]) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2624 |
# we must see child and otherchild
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2625 |
self.assertTrue(lines[(b'child\n', self.get_simple_key(b'child'))] > 0) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2626 |
self.assertTrue( |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2627 |
lines[(b'otherchild\n', self.get_simple_key(b'otherchild'))] > 0) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2628 |
# we dont care if we got more than that.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2629 |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2630 |
# test all lines
|
2631 |
lines = iter_with_keys(files.keys(), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2632 |
[('Walking content', 0, 5), |
2633 |
('Walking content', 1, 5), |
|
2634 |
('Walking content', 2, 5), |
|
2635 |
('Walking content', 3, 5), |
|
2636 |
('Walking content', 4, 5), |
|
2637 |
('Walking content', 5, 5)]) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2638 |
# all lines must be seen at least once
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2639 |
self.assertTrue(lines[(b'base\n', self.get_simple_key(b'base'))] > 0) |
2640 |
self.assertTrue( |
|
2641 |
lines[(b'lancestor\n', self.get_simple_key(b'lancestor'))] > 0) |
|
2642 |
self.assertTrue( |
|
2643 |
lines[(b'rancestor\n', self.get_simple_key(b'rancestor'))] > 0) |
|
2644 |
self.assertTrue(lines[(b'child\n', self.get_simple_key(b'child'))] > 0) |
|
2645 |
self.assertTrue( |
|
2646 |
lines[(b'otherchild\n', self.get_simple_key(b'otherchild'))] > 0) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2647 |
|
2648 |
def test_make_mpdiffs(self): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
2649 |
from breezy import multiparent |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2650 |
files = self.get_versionedfiles('source') |
2651 |
# add texts that should trip the knit maximum delta chain threshold
|
|
2652 |
# as well as doing parallel chains of data in knits.
|
|
2653 |
# this is done by two chains of 25 insertions
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2654 |
files.add_lines(self.get_simple_key(b'base'), [], [b'line\n']) |
2655 |
files.add_lines(self.get_simple_key(b'noeol'), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2656 |
self.get_parents([self.get_simple_key(b'base')]), [b'line']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2657 |
# detailed eol tests:
|
2658 |
# shared last line with parent no-eol
|
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2659 |
files.add_lines(self.get_simple_key(b'noeolsecond'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2660 |
self.get_parents([self.get_simple_key(b'noeol')]), |
2661 |
[b'line\n', b'line']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2662 |
# differing last line with parent, both no-eol
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2663 |
files.add_lines(self.get_simple_key(b'noeolnotshared'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2664 |
self.get_parents( |
2665 |
[self.get_simple_key(b'noeolsecond')]), |
|
2666 |
[b'line\n', b'phone']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2667 |
# add eol following a noneol parent, change content
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2668 |
files.add_lines(self.get_simple_key(b'eol'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2669 |
self.get_parents([self.get_simple_key(b'noeol')]), [b'phone\n']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2670 |
# add eol following a noneol parent, no change content
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2671 |
files.add_lines(self.get_simple_key(b'eolline'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2672 |
self.get_parents([self.get_simple_key(b'noeol')]), [b'line\n']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2673 |
# noeol with no parents:
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2674 |
files.add_lines(self.get_simple_key(b'noeolbase'), [], [b'line']) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2675 |
# noeol preceeding its leftmost parent in the output:
|
2676 |
# this is done by making it a merge of two parents with no common
|
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2677 |
# anestry: noeolbase and noeol with the
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2678 |
# later-inserted parent the leftmost.
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2679 |
files.add_lines(self.get_simple_key(b'eolbeforefirstparent'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2680 |
self.get_parents([self.get_simple_key(b'noeolbase'), |
2681 |
self.get_simple_key(b'noeol')]), |
|
2682 |
[b'line']) |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2683 |
# two identical eol texts
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2684 |
files.add_lines(self.get_simple_key(b'noeoldup'), |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2685 |
self.get_parents([self.get_simple_key(b'noeol')]), [b'line']) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2686 |
next_parent = self.get_simple_key(b'base') |
2687 |
text_name = b'chain1-' |
|
2688 |
text = [b'line\n'] |
|
2689 |
sha1s = {0: b'da6d3141cb4a5e6f464bf6e0518042ddc7bfd079', |
|
2690 |
1: b'45e21ea146a81ea44a821737acdb4f9791c8abe7', |
|
2691 |
2: b'e1f11570edf3e2a070052366c582837a4fe4e9fa', |
|
2692 |
3: b'26b4b8626da827088c514b8f9bbe4ebf181edda1', |
|
2693 |
4: b'e28a5510be25ba84d31121cff00956f9970ae6f6', |
|
2694 |
5: b'd63ec0ce22e11dcf65a931b69255d3ac747a318d', |
|
2695 |
6: b'2c2888d288cb5e1d98009d822fedfe6019c6a4ea', |
|
2696 |
7: b'95c14da9cafbf828e3e74a6f016d87926ba234ab', |
|
2697 |
8: b'779e9a0b28f9f832528d4b21e17e168c67697272', |
|
2698 |
9: b'1f8ff4e5c6ff78ac106fcfe6b1e8cb8740ff9a8f', |
|
2699 |
10: b'131a2ae712cf51ed62f143e3fbac3d4206c25a05', |
|
2700 |
11: b'c5a9d6f520d2515e1ec401a8f8a67e6c3c89f199', |
|
2701 |
12: b'31a2286267f24d8bedaa43355f8ad7129509ea85', |
|
2702 |
13: b'dc2a7fe80e8ec5cae920973973a8ee28b2da5e0a', |
|
2703 |
14: b'2c4b1736566b8ca6051e668de68650686a3922f2', |
|
2704 |
15: b'5912e4ecd9b0c07be4d013e7e2bdcf9323276cde', |
|
2705 |
16: b'b0d2e18d3559a00580f6b49804c23fea500feab3', |
|
2706 |
17: b'8e1d43ad72f7562d7cb8f57ee584e20eb1a69fc7', |
|
2707 |
18: b'5cf64a3459ae28efa60239e44b20312d25b253f3', |
|
2708 |
19: b'1ebed371807ba5935958ad0884595126e8c4e823', |
|
2709 |
20: b'2aa62a8b06fb3b3b892a3292a068ade69d5ee0d3', |
|
2710 |
21: b'01edc447978004f6e4e962b417a4ae1955b6fe5d', |
|
2711 |
22: b'd8d8dc49c4bf0bab401e0298bb5ad827768618bb', |
|
2712 |
23: b'c21f62b1c482862983a8ffb2b0c64b3451876e3f', |
|
2713 |
24: b'c0593fe795e00dff6b3c0fe857a074364d5f04fc', |
|
2714 |
25: b'dd1a1cf2ba9cc225c3aff729953e6364bf1d1855', |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2715 |
}
|
2716 |
for depth in range(26): |
|
|
6963.2.6
by Jelmer Vernooij
Fix some more tests. |
2717 |
new_version = self.get_simple_key(text_name + b'%d' % depth) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2718 |
text = text + [b'line\n'] |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2719 |
files.add_lines(new_version, self.get_parents([next_parent]), text) |
2720 |
next_parent = new_version |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2721 |
next_parent = self.get_simple_key(b'base') |
2722 |
text_name = b'chain2-' |
|
2723 |
text = [b'line\n'] |
|
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2724 |
for depth in range(26): |
|
6963.2.10
by Jelmer Vernooij
Fix a bunch of tests. |
2725 |
new_version = self.get_simple_key(text_name + b'%d' % depth) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2726 |
text = text + [b'line\n'] |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2727 |
files.add_lines(new_version, self.get_parents([next_parent]), text) |
2728 |
next_parent = new_version |
|
2729 |
target = self.get_versionedfiles('target') |
|
2730 |
for key in multiparent.topo_iter_keys(files, files.keys()): |
|
2731 |
mpdiff = files.make_mpdiffs([key])[0] |
|
2732 |
parents = files.get_parent_map([key])[key] or [] |
|
2733 |
target.add_mpdiffs( |
|
|
3350.8.3
by Robert Collins
VF.get_sha1s needed changing to be stackable. |
2734 |
[(key, parents, files.get_sha1s([key])[key], mpdiff)]) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2735 |
self.assertEqualDiff( |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2736 |
next(files.get_record_stream([key], 'unordered', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2737 |
True)).get_bytes_as('fulltext'), |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2738 |
next(target.get_record_stream([key], 'unordered', |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2739 |
True)).get_bytes_as('fulltext') |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2740 |
)
|
2741 |
||
2742 |
def test_keys(self): |
|
2743 |
# While use is discouraged, versions() is still needed by aspects of
|
|
2744 |
# bzr.
|
|
2745 |
files = self.get_versionedfiles() |
|
2746 |
self.assertEqual(set(), set(files.keys())) |
|
2747 |
if self.key_length == 1: |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2748 |
key = (b'foo',) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2749 |
else: |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2750 |
key = (b'foo', b'bar',) |
|
3350.6.4
by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores. |
2751 |
files.add_lines(key, (), []) |
|
6619.3.12
by Jelmer Vernooij
Use 2to3 set_literal fixer. |
2752 |
self.assertEqual({key}, set(files.keys())) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2753 |
|
2754 |
||
2755 |
class VirtualVersionedFilesTests(TestCase): |
|
2756 |
"""Basic tests for the VirtualVersionedFiles implementations.""" |
|
2757 |
||
2758 |
def _get_parent_map(self, keys): |
|
2759 |
ret = {} |
|
2760 |
for k in keys: |
|
2761 |
if k in self._parent_map: |
|
2762 |
ret[k] = self._parent_map[k] |
|
2763 |
return ret |
|
2764 |
||
2765 |
def setUp(self): |
|
|
6552.1.4
by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super(). |
2766 |
super(VirtualVersionedFilesTests, self).setUp() |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2767 |
self._lines = {} |
2768 |
self._parent_map = {} |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2769 |
self.texts = VirtualVersionedFiles(self._get_parent_map, |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2770 |
self._lines.get) |
2771 |
||
2772 |
def test_add_lines(self): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2773 |
self.assertRaises(NotImplementedError, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2774 |
self.texts.add_lines, b"foo", [], []) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2775 |
|
2776 |
def test_add_mpdiffs(self): |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
2777 |
self.assertRaises(NotImplementedError, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2778 |
self.texts.add_mpdiffs, []) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2779 |
|
|
4332.3.26
by Robert Collins
Allow passing keys to check to VersionedFile.check(). |
2780 |
def test_check_noerrors(self): |
2781 |
self.texts.check() |
|
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2782 |
|
2783 |
def test_insert_record_stream(self): |
|
2784 |
self.assertRaises(NotImplementedError, self.texts.insert_record_stream, |
|
2785 |
[])
|
|
2786 |
||
|
3518.1.2
by Jelmer Vernooij
Fix some stylistic issues pointed out by Ian. |
2787 |
def test_get_sha1s_nonexistent(self): |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2788 |
self.assertEqual({}, self.texts.get_sha1s([(b"NONEXISTENT",)])) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2789 |
|
2790 |
def test_get_sha1s(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2791 |
self._lines[b"key"] = [b"dataline1", b"dataline2"] |
2792 |
self.assertEqual({(b"key",): osutils.sha_strings(self._lines[b"key"])}, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2793 |
self.texts.get_sha1s([(b"key",)])) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2794 |
|
2795 |
def test_get_parent_map(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2796 |
self._parent_map = {b"G": (b"A", b"B")} |
2797 |
self.assertEqual({(b"G",): ((b"A",), (b"B",))}, |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2798 |
self.texts.get_parent_map([(b"G",), (b"L",)])) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2799 |
|
2800 |
def test_get_record_stream(self): |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2801 |
self._lines[b"A"] = [b"FOO", b"BAR"] |
2802 |
it = self.texts.get_record_stream([(b"A",)], "unordered", True) |
|
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
2803 |
record = next(it) |
|
6614.1.3
by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual. |
2804 |
self.assertEqual("chunked", record.storage_kind) |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2805 |
self.assertEqual(b"FOOBAR", record.get_bytes_as("fulltext")) |
2806 |
self.assertEqual([b"FOO", b"BAR"], record.get_bytes_as("chunked")) |
|
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2807 |
|
2808 |
def test_get_record_stream_absent(self): |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2809 |
it = self.texts.get_record_stream([(b"A",)], "unordered", True) |
|
6634.2.1
by Martin
Apply 2to3 next fixer and make compatible |
2810 |
record = next(it) |
|
6614.1.3
by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual. |
2811 |
self.assertEqual("absent", record.storage_kind) |
|
3518.1.1
by Jelmer Vernooij
Add VirtualVersionedFiles class. |
2812 |
|
|
3949.4.1
by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys. |
2813 |
def test_iter_lines_added_or_present_in_keys(self): |
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2814 |
self._lines[b"A"] = [b"FOO", b"BAR"] |
2815 |
self._lines[b"B"] = [b"HEY"] |
|
2816 |
self._lines[b"C"] = [b"Alberta"] |
|
2817 |
it = self.texts.iter_lines_added_or_present_in_keys([(b"A",), (b"B",)]) |
|
2818 |
self.assertEqual(sorted([(b"FOO", b"A"), (b"BAR", b"A"), (b"HEY", b"B")]), |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2819 |
sorted(list(it))) |
|
3949.4.1
by Jelmer Vernooij
Implement VirtualVersionedFiles.iter_lines_added_or_present_in_keys. |
2820 |
|
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2821 |
|
2822 |
class TestOrderingVersionedFilesDecorator(TestCaseWithMemoryTransport): |
|
2823 |
||
2824 |
def get_ordering_vf(self, key_priority): |
|
2825 |
builder = self.make_branch_builder('test') |
|
2826 |
builder.start_series() |
|
|
6816.2.1
by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument. |
2827 |
builder.build_snapshot(None, [ |
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2828 |
('add', ('', b'TREE_ROOT', 'directory', None))], |
2829 |
revision_id=b'A') |
|
2830 |
builder.build_snapshot([b'A'], [], revision_id=b'B') |
|
2831 |
builder.build_snapshot([b'B'], [], revision_id=b'C') |
|
2832 |
builder.build_snapshot([b'C'], [], revision_id=b'D') |
|
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2833 |
builder.finish_series() |
2834 |
b = builder.get_branch() |
|
2835 |
b.lock_read() |
|
2836 |
self.addCleanup(b.unlock) |
|
2837 |
vf = b.repository.inventories |
|
2838 |
return versionedfile.OrderingVersionedFilesDecorator(vf, key_priority) |
|
2839 |
||
2840 |
def test_get_empty(self): |
|
2841 |
vf = self.get_ordering_vf({}) |
|
2842 |
self.assertEqual([], vf.calls) |
|
2843 |
||
2844 |
def test_get_record_stream_topological(self): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2845 |
vf = self.get_ordering_vf( |
2846 |
{(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1}) |
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2847 |
request_keys = [(b'B',), (b'C',), (b'D',), (b'A',)] |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2848 |
keys = [r.key for r in vf.get_record_stream(request_keys, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2849 |
'topological', False)] |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2850 |
# We should have gotten the keys in topological order
|
|
6963.2.1
by Jelmer Vernooij
Fix more python3 tests. |
2851 |
self.assertEqual([(b'A',), (b'B',), (b'C',), (b'D',)], keys) |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2852 |
# And recorded that the request was made
|
2853 |
self.assertEqual([('get_record_stream', request_keys, 'topological', |
|
2854 |
False)], vf.calls) |
|
2855 |
||
2856 |
def test_get_record_stream_ordered(self): |
|
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2857 |
vf = self.get_ordering_vf( |
2858 |
{(b'A',): 3, (b'B',): 2, (b'C',): 4, (b'D',): 1}) |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2859 |
request_keys = [(b'B',), (b'C',), (b'D',), (b'A',)] |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2860 |
keys = [r.key for r in vf.get_record_stream(request_keys, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2861 |
'unordered', False)] |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2862 |
# They should be returned based on their priority
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2863 |
self.assertEqual([(b'D',), (b'B',), (b'A',), (b'C',)], keys) |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2864 |
# And the request recorded
|
2865 |
self.assertEqual([('get_record_stream', request_keys, 'unordered', |
|
2866 |
False)], vf.calls) |
|
2867 |
||
2868 |
def test_get_record_stream_implicit_order(self): |
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2869 |
vf = self.get_ordering_vf({(b'B',): 2, (b'D',): 1}) |
2870 |
request_keys = [(b'B',), (b'C',), (b'D',), (b'A',)] |
|
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2871 |
keys = [r.key for r in vf.get_record_stream(request_keys, |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
2872 |
'unordered', False)] |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2873 |
# A and C are not in the map, so they get sorted to the front. A comes
|
2874 |
# before C alphabetically, so it comes back first
|
|
|
6963.2.4
by Jelmer Vernooij
Add bees. |
2875 |
self.assertEqual([(b'A',), (b'C',), (b'D',), (b'B',)], keys) |
|
3871.4.1
by John Arbash Meinel
Add a VFDecorator that can yield records in a specified order |
2876 |
# And the request recorded
|
2877 |
self.assertEqual([('get_record_stream', request_keys, 'unordered', |
|
2878 |
False)], vf.calls) |