1
=== modified file 'breezy/bzr/smart/server.py'
2
--- breezy/bzr/smart/server.py	2020-02-18 01:57:45 +0000
3
+++ breezy/bzr/smart/server.py	2020-06-11 01:55:28 +0000
4
@@ -265,7 +265,7 @@
5
265
        still_active = []
265
        still_active = []
6
266
        for handler, thread in self._active_connections:
266
        for handler, thread in self._active_connections:
7
267
            thread.join(timeout)
267
            thread.join(timeout)
9
268
            if thread.isAlive():
268
            if thread.is_alive():
10
269
                still_active.append((handler, thread))
269
                still_active.append((handler, thread))
11
270
        self._active_connections = still_active
270
        self._active_connections = still_active
12
271
271
13
272
272
14
=== added directory 'breezy/bzr/tests'
15
=== added file 'breezy/bzr/tests/__init__.py'
16
--- breezy/bzr/tests/__init__.py	1970-01-01 00:00:00 +0000
17
+++ breezy/bzr/tests/__init__.py	2020-06-11 01:55:28 +0000
18
@@ -0,0 +1,85 @@
19
1
# Copyright (C) 2007-2020 Jelmer Vernoij <jelmer@jelmer.uk>
20
2
# Copyright (C) 2006, 2007 Canonical Ltd
21
3
#
22
4
# This program is free software; you can redistribute it and/or modify
23
5
# it under the terms of the GNU General Public License as published by
24
6
# the Free Software Foundation; either version 2 of the License, or
25
7
# (at your option) any later version.
26
8
#
27
9
# This program is distributed in the hope that it will be useful,
28
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
29
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
30
12
# GNU General Public License for more details.
31
13
#
32
14
# You should have received a copy of the GNU General Public License
33
15
# along with this program; if not, write to the Free Software
34
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
35
17
36
18
"""The basic test suite for bzr."""
37
19
38
20
from __future__ import absolute_import
39
21
40
22
from io import BytesIO
41
23
42
24
import time
43
25
44
26
from ... import (
45
27
    errors as bzr_errors,
46
28
    tests,
47
29
    )
48
30
from ...tests.features import (
49
31
    Feature,
50
32
    ModuleAvailableFeature,
51
33
    )
52
34
53
35
TestCase = tests.TestCase
54
36
TestCaseInTempDir = tests.TestCaseInTempDir
55
37
TestCaseWithTransport = tests.TestCaseWithTransport
56
38
TestCaseWithMemoryTransport = tests.TestCaseWithMemoryTransport
57
39
58
40
59
41
def test_suite():
60
42
    loader = tests.TestUtil.TestLoader()
61
43
62
44
    suite = tests.TestUtil.TestSuite()
63
45
64
46
    testmod_names = [
65
47
        'test_dirstate',
66
48
        'per_bzrdir',
67
49
        'per_inventory',
68
50
        'per_pack_repository',
69
51
        'per_repository_chk',
70
52
        'per_repository_vf',
71
53
        'per_versionedfile',
72
54
        'test__btree_serializer',
73
55
        'test__chk_map',
74
56
        'test__dirstate_helpers',
75
57
        'test__groupcompress',
76
58
        'test_btree_index',
77
59
        'test_chk_map',
78
60
        'test_chk_serializer',
79
61
        'test_generate_ids',
80
62
        'test_groupcompress',
81
63
        'test_index',
82
64
        'test_inv',
83
65
        'test_inventory_delta',
84
66
        'test_knit',
85
67
        'test_matchers',
86
68
        'test_pack',
87
69
        'test_remote',
88
70
        'test_smart',
89
71
        'test_smart_request',
90
72
        'test_smart_signals',
91
73
        'test_smart_transport',
92
74
        'test_serializer',
93
75
        'test_tags',
94
76
        'test_testament',
95
77
        'test_versionedfile',
96
78
        'test_workingtree_4',
97
79
        'test_weave',
98
80
        'test_xml',
99
81
        ]
100
82
    testmod_names = ['%s.%s' % (__name__, t) for t in testmod_names]
101
83
    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
102
84
103
85
    return suite
104
0
86
105
=== added file 'breezy/bzr/tests/matchers.py'
106
--- breezy/bzr/tests/matchers.py	1970-01-01 00:00:00 +0000
107
+++ breezy/bzr/tests/matchers.py	2020-06-11 01:55:28 +0000
108
@@ -0,0 +1,70 @@
109
1
# Copyright (C) 2010 Canonical Ltd
110
2
#
111
3
# This program is free software; you can redistribute it and/or modify
112
4
# it under the terms of the GNU General Public License as published by
113
5
# the Free Software Foundation; either version 2 of the License, or
114
6
# (at your option) any later version.
115
7
#
116
8
# This program is distributed in the hope that it will be useful,
117
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
118
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
119
11
# GNU General Public License for more details.
120
12
#
121
13
# You should have received a copy of the GNU General Public License
122
14
# along with this program; if not, write to the Free Software
123
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
124
16
125
17
"""Matchers for breezy.
126
18
127
19
Primarily test support, Matchers are used by self.assertThat in the breezy
128
20
test suite. A matcher is a stateful test helper which can be used to determine
129
21
if a passed object 'matches', much like a regex. If the object does not match
130
22
the mismatch can be described in a human readable fashion. assertThat then
131
23
raises if a mismatch occurs, showing the description as the assertion error.
132
24
133
25
Matchers are designed to be more reusable and composable than layered
134
26
assertions in Test Case objects, so they are recommended for new testing work.
135
27
"""
136
28
137
29
__all__ = [
138
30
    'ContainsNoVfsCalls',
139
31
    ]
140
32
141
33
from breezy.bzr.smart.request import request_handlers as smart_request_handlers
142
34
from breezy.bzr.smart import vfs
143
35
144
36
from testtools.matchers import Mismatch, Matcher
145
37
146
38
147
39
class _NoVfsCallsMismatch(Mismatch):
148
40
    """Mismatch describing a list of HPSS calls which includes VFS requests."""
149
41
150
42
    def __init__(self, vfs_calls):
151
43
        self.vfs_calls = vfs_calls
152
44
153
45
    def describe(self):
154
46
        return "no VFS calls expected, got: %s" % ",".join([
155
47
            "%s(%s)" % (c.method,
156
48
                        ", ".join([repr(a) for a in c.args])) for c in self.vfs_calls])
157
49
158
50
159
51
class ContainsNoVfsCalls(Matcher):
160
52
    """Ensure that none of the specified calls are HPSS calls."""
161
53
162
54
    def __str__(self):
163
55
        return 'ContainsNoVfsCalls()'
164
56
165
57
    @classmethod
166
58
    def match(cls, hpss_calls):
167
59
        vfs_calls = []
168
60
        for call in hpss_calls:
169
61
            try:
170
62
                request_method = smart_request_handlers.get(call.call.method)
171
63
            except KeyError:
172
64
                # A method we don't know about doesn't count as a VFS method.
173
65
                continue
174
66
            if issubclass(request_method, vfs.VfsRequest):
175
67
                vfs_calls.append(call.call)
176
68
        if len(vfs_calls) == 0:
177
69
            return None
178
70
        return _NoVfsCallsMismatch(vfs_calls)
179
0
71
180
=== renamed directory 'breezy/tests/per_bzrdir' => 'breezy/bzr/tests/per_bzrdir'
181
=== modified file 'breezy/bzr/tests/per_bzrdir/__init__.py'
182
--- breezy/tests/per_bzrdir/__init__.py	2017-06-11 14:07:05 +0000
183
+++ breezy/bzr/tests/per_bzrdir/__init__.py	2020-06-11 01:55:28 +0000
184
@@ -55,7 +55,7 @@
185
55
55
186
56
def load_tests(loader, standard_tests, pattern):
56
def load_tests(loader, standard_tests, pattern):
187
57
    test_per_bzrdir = [
57
    test_per_bzrdir = [
189
58
        'breezy.tests.per_bzrdir.test_bzrdir',
58
        'breezy.bzr.tests.per_bzrdir.test_bzrdir',
190
59
        ]
59
        ]
191
60
    submod_tests = loader.loadTestsFromModuleNames(test_per_bzrdir)
60
    submod_tests = loader.loadTestsFromModuleNames(test_per_bzrdir)
192
61
    formats = [format for format in ControlDirFormat.known_formats()
61
    formats = [format for format in ControlDirFormat.known_formats()
193
62
62
194
=== modified file 'breezy/bzr/tests/per_bzrdir/test_bzrdir.py'
195
--- breezy/tests/per_bzrdir/test_bzrdir.py	2020-03-22 18:52:18 +0000
196
+++ breezy/bzr/tests/per_bzrdir/test_bzrdir.py	2020-06-11 01:55:28 +0000
197
@@ -36,7 +36,7 @@
198
36
    TestNotApplicable,
36
    TestNotApplicable,
199
37
    TestSkipped,
37
    TestSkipped,
200
38
    )
38
    )
202
39
from breezy.tests.per_bzrdir import TestCaseWithBzrDir
39
from breezy.bzr.tests.per_bzrdir import TestCaseWithBzrDir
203
40
from breezy.transport.local import (
40
from breezy.transport.local import (
204
41
    LocalTransport,
41
    LocalTransport,
205
42
    )
42
    )
206
43
43
207
=== renamed directory 'breezy/tests/per_inventory' => 'breezy/bzr/tests/per_inventory'
208
=== modified file 'breezy/bzr/tests/per_inventory/__init__.py'
209
--- breezy/tests/per_inventory/__init__.py	2018-11-11 04:08:32 +0000
210
+++ breezy/bzr/tests/per_inventory/__init__.py	2020-06-11 01:55:28 +0000
211
@@ -27,7 +27,7 @@
212
27
def load_tests(loader, basic_tests, pattern):
27
def load_tests(loader, basic_tests, pattern):
213
28
    """Generate suite containing all parameterized tests"""
28
    """Generate suite containing all parameterized tests"""
214
29
    modules_to_test = [
29
    modules_to_test = [
216
30
        'breezy.tests.per_inventory.basics',
30
        'breezy.bzr.tests.per_inventory.basics',
217
31
        ]
31
        ]
218
32
    from breezy.bzr.inventory import Inventory, CHKInventory
32
    from breezy.bzr.inventory import Inventory, CHKInventory
219
33
33
220
34
34
221
=== modified file 'breezy/bzr/tests/per_inventory/basics.py'
222
--- breezy/tests/per_inventory/basics.py	2019-10-06 11:30:57 +0000
223
+++ breezy/bzr/tests/per_inventory/basics.py	2020-06-11 01:55:28 +0000
224
@@ -35,7 +35,7 @@
225
35
    TreeReference,
35
    TreeReference,
226
36
    )
36
    )
227
37
37
229
38
from breezy.tests.per_inventory import TestCaseWithInventory
38
from breezy.bzr.tests.per_inventory import TestCaseWithInventory
230
39
39
231
40
40
232
41
class TestInventory(TestCaseWithInventory):
41
class TestInventory(TestCaseWithInventory):
233
42
42
234
=== renamed file 'breezy/tests/per_pack_repository.py' => 'breezy/bzr/tests/per_pack_repository.py'
235
--- breezy/tests/per_pack_repository.py	2020-01-30 16:13:31 +0000
236
+++ breezy/bzr/tests/per_pack_repository.py	2020-06-11 01:55:28 +0000
237
@@ -21,9 +21,9 @@
238
21
21
239
22
from stat import S_ISDIR
22
from stat import S_ISDIR
240
23
23
244
24
from ..bzr.btree_index import BTreeGraphIndex
24
from ..btree_index import BTreeGraphIndex
245
25
from ..bzr.index import GraphIndex
25
from ..index import GraphIndex
246
26
from .. import (
26
from ... import (
247
27
    controldir,
27
    controldir,
248
28
    errors,
28
    errors,
249
29
    gpg,
29
    gpg,
250
@@ -34,21 +34,21 @@
251
34
    transport,
34
    transport,
252
35
    ui,
35
    ui,
253
36
    )
36
    )
255
37
from ..bzr import (
37
from .. import (
256
38
    inventory,
38
    inventory,
257
39
    )
39
    )
260
40
from ..bzr.groupcompress_repo import RepositoryFormat2a
40
from ..groupcompress_repo import RepositoryFormat2a
261
41
from ..bzr.smart import (
41
from ..smart import (
262
42
    client,
42
    client,
263
43
    )
43
    )
265
44
from . import (
44
from ...tests import (
266
45
    TestCaseWithTransport,
45
    TestCaseWithTransport,
267
46
    TestNotApplicable,
46
    TestNotApplicable,
268
47
    )
47
    )
270
48
from ..transport import (
48
from ...transport import (
271
49
    memory,
49
    memory,
272
50
    )
50
    )
274
51
from . import test_server
51
from ...tests import test_server
275
52
52
276
53
53
277
54
class TestPackRepository(TestCaseWithTransport):
54
class TestPackRepository(TestCaseWithTransport):
278
55
55
279
=== renamed directory 'breezy/tests/per_repository_chk' => 'breezy/bzr/tests/per_repository_chk'
280
=== modified file 'breezy/bzr/tests/per_repository_chk/__init__.py'
281
--- breezy/tests/per_repository_chk/__init__.py	2018-11-11 04:08:32 +0000
282
+++ breezy/bzr/tests/per_repository_chk/__init__.py	2020-06-11 01:55:28 +0000
283
@@ -76,9 +76,9 @@
284
76
            unsupported_scenarios.append((test_name, scenario_info))
76
            unsupported_scenarios.append((test_name, scenario_info))
285
77
    result = loader.suiteClass()
77
    result = loader.suiteClass()
286
78
    supported_tests = loader.loadTestsFromModuleNames([
78
    supported_tests = loader.loadTestsFromModuleNames([
288
79
        'breezy.tests.per_repository_chk.test_supported'])
79
        'breezy.bzr.tests.per_repository_chk.test_supported'])
289
80
    unsupported_tests = loader.loadTestsFromModuleNames([
80
    unsupported_tests = loader.loadTestsFromModuleNames([
291
81
        'breezy.tests.per_repository_chk.test_unsupported'])
81
        'breezy.bzr.tests.per_repository_chk.test_unsupported'])
292
82
    multiply_tests(supported_tests, supported_scenarios, result)
82
    multiply_tests(supported_tests, supported_scenarios, result)
293
83
    multiply_tests(unsupported_tests, unsupported_scenarios, result)
83
    multiply_tests(unsupported_tests, unsupported_scenarios, result)
294
84
    return result
84
    return result
295
85
85
296
=== modified file 'breezy/bzr/tests/per_repository_chk/test_supported.py'
297
--- breezy/tests/per_repository_chk/test_supported.py	2019-05-29 03:22:34 +0000
298
+++ breezy/bzr/tests/per_repository_chk/test_supported.py	2020-06-11 01:55:28 +0000
299
@@ -27,7 +27,7 @@
300
27
from breezy.bzr.versionedfile import VersionedFiles
27
from breezy.bzr.versionedfile import VersionedFiles
301
28
from breezy.bzr.remote import RemoteRepository
28
from breezy.bzr.remote import RemoteRepository
302
29
from breezy.tests import TestNotApplicable
29
from breezy.tests import TestNotApplicable
304
30
from breezy.tests.per_repository_chk import TestCaseWithRepositoryCHK
30
from breezy.bzr.tests.per_repository_chk import TestCaseWithRepositoryCHK
305
31
31
306
32
32
307
33
class TestCHKSupport(TestCaseWithRepositoryCHK):
33
class TestCHKSupport(TestCaseWithRepositoryCHK):
308
34
34
309
=== modified file 'breezy/bzr/tests/per_repository_chk/test_unsupported.py'
310
--- breezy/tests/per_repository_chk/test_unsupported.py	2017-05-21 18:10:28 +0000
311
+++ breezy/bzr/tests/per_repository_chk/test_unsupported.py	2020-06-11 01:55:28 +0000
312
@@ -20,7 +20,7 @@
313
20
attributes CHK support added should fail in known ways.
20
attributes CHK support added should fail in known ways.
314
21
"""
21
"""
315
22
22
317
23
from breezy.tests.per_repository_chk import TestCaseWithRepositoryCHK
23
from breezy.bzr.tests.per_repository_chk import TestCaseWithRepositoryCHK
318
24
24
319
25
25
320
26
class TestNoCHKSupport(TestCaseWithRepositoryCHK):
26
class TestNoCHKSupport(TestCaseWithRepositoryCHK):
321
27
27
322
=== renamed directory 'breezy/tests/per_repository_vf' => 'breezy/bzr/tests/per_repository_vf'
323
=== modified file 'breezy/bzr/tests/per_repository_vf/helpers.py'
324
--- breezy/tests/per_repository_vf/helpers.py	2020-01-31 10:39:02 +0000
325
+++ breezy/bzr/tests/per_repository_vf/helpers.py	2020-06-11 01:55:28 +0000
326
@@ -16,17 +16,17 @@
327
16
16
328
17
"""Helper classes for repository implementation tests."""
17
"""Helper classes for repository implementation tests."""
329
18
18
331
19
from ... import (
19
from .... import (
332
20
    osutils,
20
    osutils,
333
21
    revision as _mod_revision,
21
    revision as _mod_revision,
334
22
    )
22
    )
337
23
from ...repository import WriteGroup
23
from ....repository import WriteGroup
338
24
from ...bzr import (
24
from ... import (
339
25
    inventory,
25
    inventory,
340
26
    )
26
    )
344
27
from ...bzr.knitrepo import RepositoryFormatKnit
27
from ...knitrepo import RepositoryFormatKnit
345
28
from ..per_repository import TestCaseWithRepository
28
from ....tests.per_repository import TestCaseWithRepository
346
29
from .. import TestNotApplicable
29
from ....tests import TestNotApplicable
347
30
30
348
31
31
349
32
class TestCaseWithBrokenRevisionIndex(TestCaseWithRepository):
32
class TestCaseWithBrokenRevisionIndex(TestCaseWithRepository):
350
33
33
351
=== modified file 'breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py'
352
--- breezy/tests/per_repository_vf/test__generate_text_key_index.py	2017-05-21 18:10:28 +0000
353
+++ breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py	2020-06-11 01:55:28 +0000
354
@@ -19,7 +19,7 @@
355
19
19
356
20
20
357
21
from breezy.tests.scenarios import load_tests_apply_scenarios
21
from breezy.tests.scenarios import load_tests_apply_scenarios
359
22
from breezy.tests.per_repository_vf import (
22
from breezy.bzr.tests.per_repository_vf import (
360
23
    TestCaseWithRepository,
23
    TestCaseWithRepository,
361
24
    all_repository_vf_format_scenarios,
24
    all_repository_vf_format_scenarios,
362
25
    )
25
    )
363
26
26
364
=== modified file 'breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py'
365
--- breezy/tests/per_repository_vf/test_add_inventory_by_delta.py	2018-11-11 04:08:32 +0000
366
+++ breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py	2020-06-11 01:55:28 +0000
367
@@ -17,7 +17,7 @@
368
17
"""Tests for Repository.add_inventory_by_delta."""
17
"""Tests for Repository.add_inventory_by_delta."""
369
18
18
370
19
from breezy import errors, revision
19
from breezy import errors, revision
372
20
from breezy.tests.per_repository_vf import (
20
from breezy.bzr.tests.per_repository_vf import (
373
21
    all_repository_vf_format_scenarios,
21
    all_repository_vf_format_scenarios,
374
22
    TestCaseWithRepository
22
    TestCaseWithRepository
375
23
    )
23
    )
376
24
24
377
=== modified file 'breezy/bzr/tests/per_repository_vf/test_check.py'
378
--- breezy/tests/per_repository_vf/test_check.py	2019-06-29 19:54:32 +0000
379
+++ breezy/bzr/tests/per_repository_vf/test_check.py	2020-06-11 01:55:28 +0000
380
@@ -24,11 +24,11 @@
381
24
    TestNotApplicable,
24
    TestNotApplicable,
382
25
    )
25
    )
383
26
from breezy.tests.scenarios import load_tests_apply_scenarios
26
from breezy.tests.scenarios import load_tests_apply_scenarios
385
27
from breezy.tests.per_repository_vf import (
27
from breezy.bzr.tests.per_repository_vf import (
386
28
    TestCaseWithRepository,
28
    TestCaseWithRepository,
387
29
    all_repository_vf_format_scenarios,
29
    all_repository_vf_format_scenarios,
388
30
    )
30
    )
390
31
from breezy.tests.per_repository_vf.helpers import (
31
from breezy.bzr.tests.per_repository_vf.helpers import (
391
32
    TestCaseWithBrokenRevisionIndex,
32
    TestCaseWithBrokenRevisionIndex,
392
33
    )
33
    )
393
34
34
394
35
35
395
=== modified file 'breezy/bzr/tests/per_repository_vf/test_check_reconcile.py'
396
--- breezy/tests/per_repository_vf/test_check_reconcile.py	2019-05-29 03:22:34 +0000
397
+++ breezy/bzr/tests/per_repository_vf/test_check_reconcile.py	2020-06-11 01:55:28 +0000
398
@@ -34,7 +34,7 @@
399
34
    TestNotApplicable,
34
    TestNotApplicable,
400
35
    multiply_scenarios,
35
    multiply_scenarios,
401
36
    )
36
    )
403
37
from breezy.tests.per_repository_vf import (
37
from breezy.bzr.tests.per_repository_vf import (
404
38
    TestCaseWithRepository,
38
    TestCaseWithRepository,
405
39
    all_repository_vf_format_scenarios,
39
    all_repository_vf_format_scenarios,
406
40
    )
40
    )
407
41
41
408
=== modified file 'breezy/bzr/tests/per_repository_vf/test_fetch.py'
409
--- breezy/tests/per_repository_vf/test_fetch.py	2018-11-11 04:08:32 +0000
410
+++ breezy/bzr/tests/per_repository_vf/test_fetch.py	2020-06-11 01:55:28 +0000
411
@@ -19,7 +19,7 @@
412
19
from breezy.bzr import (
19
from breezy.bzr import (
413
20
    vf_search,
20
    vf_search,
414
21
    )
21
    )
416
22
from breezy.tests.per_repository_vf import (
22
from breezy.bzr.tests.per_repository_vf import (
417
23
    TestCaseWithRepository,
23
    TestCaseWithRepository,
418
24
    all_repository_vf_format_scenarios,
24
    all_repository_vf_format_scenarios,
419
25
    )
25
    )
420
26
26
421
=== modified file 'breezy/bzr/tests/per_repository_vf/test_fileid_involved.py'
422
--- breezy/tests/per_repository_vf/test_fileid_involved.py	2019-09-21 19:27:04 +0000
423
+++ breezy/bzr/tests/per_repository_vf/test_fileid_involved.py	2020-06-11 01:55:28 +0000
424
@@ -28,7 +28,7 @@
425
28
    remote,
28
    remote,
426
29
    )
29
    )
427
30
from breezy.tests.scenarios import load_tests_apply_scenarios
30
from breezy.tests.scenarios import load_tests_apply_scenarios
429
31
from breezy.tests.per_repository_vf import (
31
from breezy.bzr.tests.per_repository_vf import (
430
32
    TestCaseWithRepository,
32
    TestCaseWithRepository,
431
33
    all_repository_vf_format_scenarios,
33
    all_repository_vf_format_scenarios,
432
34
    )
34
    )
433
35
35
434
=== modified file 'breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py'
435
--- breezy/tests/per_repository_vf/test_find_text_key_references.py	2017-05-21 18:10:28 +0000
436
+++ breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py	2020-06-11 01:55:28 +0000
437
@@ -18,7 +18,7 @@
438
18
"""Test the find_text_key_references API."""
18
"""Test the find_text_key_references API."""
439
19
19
440
20
20
442
21
from breezy.tests.per_repository_vf import (
21
from breezy.bzr.tests.per_repository_vf import (
443
22
    TestCaseWithRepository,
22
    TestCaseWithRepository,
444
23
    all_repository_vf_format_scenarios,
23
    all_repository_vf_format_scenarios,
445
24
    )
24
    )
446
25
25
447
=== modified file 'breezy/bzr/tests/per_repository_vf/test_merge_directive.py'
448
--- breezy/tests/per_repository_vf/test_merge_directive.py	2018-11-16 18:33:17 +0000
449
+++ breezy/bzr/tests/per_repository_vf/test_merge_directive.py	2020-06-11 01:55:28 +0000
450
@@ -28,7 +28,7 @@
451
28
    )
28
    )
452
29
29
453
30
from breezy.tests.scenarios import load_tests_apply_scenarios
30
from breezy.tests.scenarios import load_tests_apply_scenarios
455
31
from breezy.tests.per_repository_vf import (
31
from breezy.bzr.tests.per_repository_vf import (
456
32
    TestCaseWithRepository,
32
    TestCaseWithRepository,
457
33
    all_repository_vf_format_scenarios,
33
    all_repository_vf_format_scenarios,
458
34
    )
34
    )
459
35
35
460
=== modified file 'breezy/bzr/tests/per_repository_vf/test_reconcile.py'
461
--- breezy/tests/per_repository_vf/test_reconcile.py	2019-06-29 19:54:32 +0000
462
+++ breezy/bzr/tests/per_repository_vf/test_reconcile.py	2020-06-11 01:55:28 +0000
463
@@ -26,10 +26,10 @@
464
26
from breezy.revision import Revision
26
from breezy.revision import Revision
465
27
from breezy.tests import TestSkipped
27
from breezy.tests import TestSkipped
466
28
28
468
29
from breezy.tests.per_repository_vf.helpers import (
29
from breezy.bzr.tests.per_repository_vf.helpers import (
469
30
    TestCaseWithBrokenRevisionIndex,
30
    TestCaseWithBrokenRevisionIndex,
470
31
    )
31
    )
472
32
from breezy.tests.per_repository_vf import (
32
from breezy.bzr.tests.per_repository_vf import (
473
33
    TestCaseWithRepository,
33
    TestCaseWithRepository,
474
34
    all_repository_vf_format_scenarios,
34
    all_repository_vf_format_scenarios,
475
35
    )
35
    )
476
36
36
477
=== modified file 'breezy/bzr/tests/per_repository_vf/test_refresh_data.py'
478
--- breezy/tests/per_repository_vf/test_refresh_data.py	2018-11-11 04:08:32 +0000
479
+++ breezy/bzr/tests/per_repository_vf/test_refresh_data.py	2020-06-11 01:55:28 +0000
480
@@ -21,7 +21,7 @@
481
21
    repository,
21
    repository,
482
22
    )
22
    )
483
23
23
485
24
from breezy.tests.per_repository_vf import (
24
from breezy.bzr.tests.per_repository_vf import (
486
25
    TestCaseWithRepository,
25
    TestCaseWithRepository,
487
26
    all_repository_vf_format_scenarios,
26
    all_repository_vf_format_scenarios,
488
27
    )
27
    )
489
28
28
490
=== modified file 'breezy/bzr/tests/per_repository_vf/test_repository.py'
491
--- breezy/tests/per_repository_vf/test_repository.py	2019-06-29 13:16:26 +0000
492
+++ breezy/bzr/tests/per_repository_vf/test_repository.py	2020-06-11 01:55:28 +0000
493
@@ -30,7 +30,7 @@
494
30
    )
30
    )
495
31
31
496
32
from breezy.tests.matchers import MatchesAncestry
32
from breezy.tests.matchers import MatchesAncestry
498
33
from breezy.tests.per_repository_vf import (
33
from breezy.bzr.tests.per_repository_vf import (
499
34
    TestCaseWithRepository,
34
    TestCaseWithRepository,
500
35
    all_repository_vf_format_scenarios,
35
    all_repository_vf_format_scenarios,
501
36
    )
36
    )
502
37
37
503
=== modified file 'breezy/bzr/tests/per_repository_vf/test_write_group.py'
504
--- breezy/tests/per_repository_vf/test_write_group.py	2018-11-18 01:02:16 +0000
505
+++ breezy/bzr/tests/per_repository_vf/test_write_group.py	2020-06-11 01:55:28 +0000
506
@@ -30,7 +30,7 @@
507
30
    remote,
30
    remote,
508
31
    versionedfile,
31
    versionedfile,
509
32
    )
32
    )
511
33
from breezy.tests.per_repository_vf import (
33
from breezy.bzr.tests.per_repository_vf import (
512
34
    TestCaseWithRepository,
34
    TestCaseWithRepository,
513
35
    all_repository_vf_format_scenarios,
35
    all_repository_vf_format_scenarios,
514
36
    )
36
    )
515
37
37
516
=== renamed file 'breezy/tests/per_versionedfile.py' => 'breezy/bzr/tests/per_versionedfile.py'
517
--- breezy/tests/per_versionedfile.py	2020-02-07 02:14:30 +0000
518
+++ breezy/bzr/tests/per_versionedfile.py	2020-06-11 01:55:28 +0000
519
@@ -25,7 +25,7 @@
520
25
from io import BytesIO
25
from io import BytesIO
521
26
import itertools
26
import itertools
522
27
27
524
28
from .. import (
28
from ... import (
525
29
    errors,
29
    errors,
526
30
    graph as _mod_graph,
30
    graph as _mod_graph,
527
31
    osutils,
31
    osutils,
528
@@ -33,29 +33,29 @@
529
33
    transport,
33
    transport,
530
34
    ui,
34
    ui,
531
35
    )
35
    )
533
36
from ..bzr import (
36
from .. import (
534
37
    groupcompress,
37
    groupcompress,
535
38
    knit as _mod_knit,
38
    knit as _mod_knit,
536
39
    )
39
    )
538
40
from ..errors import (
40
from ...errors import (
539
41
    RevisionNotPresent,
41
    RevisionNotPresent,
540
42
    RevisionAlreadyPresent,
42
    RevisionAlreadyPresent,
541
43
    )
43
    )
543
44
from ..bzr.knit import (
44
from ..knit import (
544
45
    cleanup_pack_knit,
45
    cleanup_pack_knit,
545
46
    make_file_factory,
46
    make_file_factory,
546
47
    make_pack_factory,
47
    make_pack_factory,
547
48
    )
48
    )
549
49
from . import (
49
from ...tests import (
550
50
    TestCase,
50
    TestCase,
551
51
    TestCaseWithMemoryTransport,
51
    TestCaseWithMemoryTransport,
552
52
    TestNotApplicable,
52
    TestNotApplicable,
553
53
    TestSkipped,
53
    TestSkipped,
554
54
    )
54
    )
559
55
from .http_utils import TestCaseWithWebserver
55
from ...tests.http_utils import TestCaseWithWebserver
560
56
from ..transport.memory import MemoryTransport
56
from ...transport.memory import MemoryTransport
561
57
from ..bzr import versionedfile as versionedfile
57
from .. import versionedfile as versionedfile
562
58
from ..bzr.versionedfile import (
58
from ..versionedfile import (
563
59
    ChunkedContentFactory,
59
    ChunkedContentFactory,
564
60
    ConstantMapper,
60
    ConstantMapper,
565
61
    HashEscapedPrefixMapper,
61
    HashEscapedPrefixMapper,
566
@@ -63,12 +63,12 @@
567
63
    VirtualVersionedFiles,
63
    VirtualVersionedFiles,
568
64
    make_versioned_files_factory,
64
    make_versioned_files_factory,
569
65
    )
65
    )
571
66
from ..bzr.weave import (
66
from ..weave import (
572
67
    WeaveFile,
67
    WeaveFile,
573
68
    WeaveInvalidChecksum,
68
    WeaveInvalidChecksum,
574
69
    )
69
    )
577
70
from ..bzr.weavefile import write_weave
70
from ..weavefile import write_weave
578
71
from .scenarios import load_tests_apply_scenarios
71
from ...tests.scenarios import load_tests_apply_scenarios
579
72
72
580
73
73
581
74
load_tests = load_tests_apply_scenarios
74
load_tests = load_tests_apply_scenarios
582
75
75
583
=== renamed file 'breezy/tests/test__btree_serializer.py' => 'breezy/bzr/tests/test__btree_serializer.py'
584
--- breezy/tests/test__btree_serializer.py	2020-02-07 02:14:30 +0000
585
+++ breezy/bzr/tests/test__btree_serializer.py	2020-06-11 01:55:28 +0000
586
@@ -20,7 +20,7 @@
587
20
import binascii
20
import binascii
588
21
import bisect
21
import bisect
589
22
22
591
23
from .. import tests
23
from ... import tests
592
24
24
593
25
from .test_btree_index import compiled_btreeparser_feature
25
from .test_btree_index import compiled_btreeparser_feature
594
26
26
595
27
27
596
=== renamed file 'breezy/tests/test__chk_map.py' => 'breezy/bzr/tests/test__chk_map.py'
597
--- breezy/tests/test__chk_map.py	2020-02-07 02:14:30 +0000
598
+++ breezy/bzr/tests/test__chk_map.py	2020-06-11 01:55:28 +0000
599
@@ -16,13 +16,13 @@
600
16
16
601
17
"""Tests for _chk_map_*."""
17
"""Tests for _chk_map_*."""
602
18
18
603
19
from ... import (
604
20
    tests,
605
21
    )
606
19
from .. import (
22
from .. import (
607
20
    tests,
608
21
    )
609
22
from ..bzr import (
610
23
    chk_map,
23
    chk_map,
611
24
    )
24
    )
613
25
from ..static_tuple import StaticTuple
25
from ...static_tuple import StaticTuple
614
26
stuple = StaticTuple
26
stuple = StaticTuple
615
27
27
616
28
28
617
29
29
618
=== renamed file 'breezy/tests/test__dirstate_helpers.py' => 'breezy/bzr/tests/test__dirstate_helpers.py'
619
--- breezy/tests/test__dirstate_helpers.py	2019-06-29 13:16:26 +0000
620
+++ breezy/bzr/tests/test__dirstate_helpers.py	2020-06-11 01:55:28 +0000
621
@@ -20,23 +20,23 @@
622
20
import os
20
import os
623
21
import time
21
import time
624
22
22
626
23
from .. import (
23
from ... import (
627
24
    osutils,
24
    osutils,
628
25
    tests,
25
    tests,
629
26
    )
26
    )
631
27
from ..bzr import (
27
from .. import (
632
28
    dirstate,
28
    dirstate,
633
29
    _dirstate_helpers_py,
29
    _dirstate_helpers_py,
634
30
    )
30
    )
635
31
from . import (
31
from . import (
636
32
    test_dirstate,
32
    test_dirstate,
637
33
    )
33
    )
640
34
from .test_osutils import dir_reader_scenarios
34
from ...tests.test_osutils import dir_reader_scenarios
641
35
from .scenarios import (
35
from ...tests.scenarios import (
642
36
    load_tests_apply_scenarios,
36
    load_tests_apply_scenarios,
643
37
    multiply_scenarios,
37
    multiply_scenarios,
644
38
    )
38
    )
646
39
from . import (
39
from ...tests import (
647
40
    features,
40
    features,
648
41
    )
41
    )
649
42
42
650
@@ -227,7 +227,7 @@
651
227
    """Run all Bisect Path tests against _bisect_path_left."""
227
    """Run all Bisect Path tests against _bisect_path_left."""
652
228
228
653
229
    def get_bisect_path(self):
229
    def get_bisect_path(self):
655
230
        from breezy.bzr._dirstate_helpers_py import _bisect_path_left
230
        from .._dirstate_helpers_py import _bisect_path_left
656
231
        return _bisect_path_left
231
        return _bisect_path_left
657
232
232
658
233
    def get_bisect(self):
233
    def get_bisect(self):
659
@@ -240,7 +240,7 @@
660
240
    _test_needs_features = [compiled_dirstate_helpers_feature]
240
    _test_needs_features = [compiled_dirstate_helpers_feature]
661
241
241
662
242
    def get_bisect_path(self):
242
    def get_bisect_path(self):
664
243
        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
243
        from .._dirstate_helpers_pyx import _bisect_path_left
665
244
        return _bisect_path_left
244
        return _bisect_path_left
666
245
245
667
246
246
668
@@ -248,7 +248,7 @@
669
248
    """Run all Bisect Path tests against _bisect_path_right"""
248
    """Run all Bisect Path tests against _bisect_path_right"""
670
249
249
671
250
    def get_bisect_path(self):
250
    def get_bisect_path(self):
673
251
        from breezy.bzr._dirstate_helpers_py import _bisect_path_right
251
        from .._dirstate_helpers_py import _bisect_path_right
674
252
        return _bisect_path_right
252
        return _bisect_path_right
675
253
253
676
254
    def get_bisect(self):
254
    def get_bisect(self):
677
@@ -261,7 +261,7 @@
678
261
    _test_needs_features = [compiled_dirstate_helpers_feature]
261
    _test_needs_features = [compiled_dirstate_helpers_feature]
679
262
262
680
263
    def get_bisect_path(self):
263
    def get_bisect_path(self):
682
264
        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
264
        from .._dirstate_helpers_pyx import _bisect_path_right
683
265
        return _bisect_path_right
265
        return _bisect_path_right
684
266
266
685
267
267
686
@@ -279,7 +279,7 @@
687
279
279
688
280
    def get_bisect_dirblock(self):
280
    def get_bisect_dirblock(self):
689
281
        """Return an implementation of bisect_dirblock"""
281
        """Return an implementation of bisect_dirblock"""
691
282
        from breezy.bzr._dirstate_helpers_py import bisect_dirblock
282
        from .._dirstate_helpers_py import bisect_dirblock
692
283
        return bisect_dirblock
283
        return bisect_dirblock
693
284
284
694
285
    def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
285
    def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
695
@@ -373,7 +373,7 @@
696
373
    _test_needs_features = [compiled_dirstate_helpers_feature]
373
    _test_needs_features = [compiled_dirstate_helpers_feature]
697
374
374
698
375
    def get_bisect_dirblock(self):
375
    def get_bisect_dirblock(self):
700
376
        from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
376
        from .._dirstate_helpers_pyx import bisect_dirblock
701
377
        return bisect_dirblock
377
        return bisect_dirblock
702
378
378
703
379
379
704
@@ -389,7 +389,7 @@
705
389
389
706
390
    def get_lt_by_dirs(self):
390
    def get_lt_by_dirs(self):
707
391
        """Get a specific implementation of lt_by_dirs."""
391
        """Get a specific implementation of lt_by_dirs."""
709
392
        from ..bzr._dirstate_helpers_py import lt_by_dirs
392
        from .._dirstate_helpers_py import lt_by_dirs
710
393
        return lt_by_dirs
393
        return lt_by_dirs
711
394
394
712
395
    def assertCmpByDirs(self, expected, str1, str2):
395
    def assertCmpByDirs(self, expected, str1, str2):
713
@@ -496,7 +496,7 @@
714
496
    _test_needs_features = [compiled_dirstate_helpers_feature]
496
    _test_needs_features = [compiled_dirstate_helpers_feature]
715
497
497
716
498
    def get_lt_by_dirs(self):
498
    def get_lt_by_dirs(self):
718
499
        from ..bzr._dirstate_helpers_pyx import lt_by_dirs
499
        from .._dirstate_helpers_pyx import lt_by_dirs
719
500
        return lt_by_dirs
500
        return lt_by_dirs
720
501
501
721
502
502
722
@@ -512,7 +512,7 @@
723
512
512
724
513
    def get_lt_path_by_dirblock(self):
513
    def get_lt_path_by_dirblock(self):
725
514
        """Get a specific implementation of _lt_path_by_dirblock."""
514
        """Get a specific implementation of _lt_path_by_dirblock."""
727
515
        from ..bzr._dirstate_helpers_py import _lt_path_by_dirblock
515
        from .._dirstate_helpers_py import _lt_path_by_dirblock
728
516
        return _lt_path_by_dirblock
516
        return _lt_path_by_dirblock
729
517
517
730
518
    def assertLtPathByDirblock(self, paths):
518
    def assertLtPathByDirblock(self, paths):
731
@@ -637,7 +637,7 @@
732
637
    _test_needs_features = [compiled_dirstate_helpers_feature]
637
    _test_needs_features = [compiled_dirstate_helpers_feature]
733
638
638
734
639
    def get_lt_path_by_dirblock(self):
639
    def get_lt_path_by_dirblock(self):
736
640
        from ..bzr._dirstate_helpers_pyx import _lt_path_by_dirblock
640
        from .._dirstate_helpers_pyx import _lt_path_by_dirblock
737
641
        return _lt_path_by_dirblock
641
        return _lt_path_by_dirblock
738
642
642
739
643
643
740
@@ -647,7 +647,7 @@
741
647
    _test_needs_features = [compiled_dirstate_helpers_feature]
647
    _test_needs_features = [compiled_dirstate_helpers_feature]
742
648
648
743
649
    def assertMemRChr(self, expected, s, c):
649
    def assertMemRChr(self, expected, s, c):
745
650
        from breezy.bzr._dirstate_helpers_pyx import _py_memrchr
650
        from .._dirstate_helpers_pyx import _py_memrchr
746
651
        self.assertEqual(expected, _py_memrchr(s, c))
651
        self.assertEqual(expected, _py_memrchr(s, c))
747
652
652
748
653
    def test_missing(self):
653
    def test_missing(self):
749
@@ -697,7 +697,7 @@
750
697
    # inherits scenarios from test_dirstate
697
    # inherits scenarios from test_dirstate
751
698
698
752
699
    def get_read_dirblocks(self):
699
    def get_read_dirblocks(self):
754
700
        from breezy.bzr._dirstate_helpers_py import _read_dirblocks
700
        from .._dirstate_helpers_py import _read_dirblocks
755
701
        return _read_dirblocks
701
        return _read_dirblocks
756
702
702
757
703
    def test_smoketest(self):
703
    def test_smoketest(self):
758
@@ -737,7 +737,7 @@
759
737
    _test_needs_features = [compiled_dirstate_helpers_feature]
737
    _test_needs_features = [compiled_dirstate_helpers_feature]
760
738
738
761
739
    def get_read_dirblocks(self):
739
    def get_read_dirblocks(self):
763
740
        from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
740
        from .._dirstate_helpers_pyx import _read_dirblocks
764
741
        return _read_dirblocks
741
        return _read_dirblocks
765
742
742
766
743
743
767
@@ -751,52 +751,52 @@
768
751
751
769
752
    def test_bisect_dirblock(self):
752
    def test_bisect_dirblock(self):
770
753
        if compiled_dirstate_helpers_feature.available():
753
        if compiled_dirstate_helpers_feature.available():
772
754
            from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
754
            from .._dirstate_helpers_pyx import bisect_dirblock
773
755
        else:
755
        else:
775
756
            from breezy.bzr._dirstate_helpers_py import bisect_dirblock
756
            from .._dirstate_helpers_py import bisect_dirblock
776
757
        self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
757
        self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
777
758
758
778
759
    def test__bisect_path_left(self):
759
    def test__bisect_path_left(self):
779
760
        if compiled_dirstate_helpers_feature.available():
760
        if compiled_dirstate_helpers_feature.available():
781
761
            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
761
            from .._dirstate_helpers_pyx import _bisect_path_left
782
762
        else:
762
        else:
784
763
            from breezy.bzr._dirstate_helpers_py import _bisect_path_left
763
            from .._dirstate_helpers_py import _bisect_path_left
785
764
        self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
764
        self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
786
765
765
787
766
    def test__bisect_path_right(self):
766
    def test__bisect_path_right(self):
788
767
        if compiled_dirstate_helpers_feature.available():
767
        if compiled_dirstate_helpers_feature.available():
790
768
            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
768
            from .._dirstate_helpers_pyx import _bisect_path_right
791
769
        else:
769
        else:
793
770
            from breezy.bzr._dirstate_helpers_py import _bisect_path_right
770
            from .._dirstate_helpers_py import _bisect_path_right
794
771
        self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
771
        self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
795
772
772
796
773
    def test_lt_by_dirs(self):
773
    def test_lt_by_dirs(self):
797
774
        if compiled_dirstate_helpers_feature.available():
774
        if compiled_dirstate_helpers_feature.available():
799
775
            from ..bzr._dirstate_helpers_pyx import lt_by_dirs
775
            from .._dirstate_helpers_pyx import lt_by_dirs
800
776
        else:
776
        else:
802
777
            from ..bzr._dirstate_helpers_py import lt_by_dirs
777
            from .._dirstate_helpers_py import lt_by_dirs
803
778
        self.assertIs(lt_by_dirs, dirstate.lt_by_dirs)
778
        self.assertIs(lt_by_dirs, dirstate.lt_by_dirs)
804
779
779
805
780
    def test__read_dirblocks(self):
780
    def test__read_dirblocks(self):
806
781
        if compiled_dirstate_helpers_feature.available():
781
        if compiled_dirstate_helpers_feature.available():
808
782
            from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
782
            from .._dirstate_helpers_pyx import _read_dirblocks
809
783
        else:
783
        else:
811
784
            from breezy.bzr._dirstate_helpers_py import _read_dirblocks
784
            from .._dirstate_helpers_py import _read_dirblocks
812
785
        self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
785
        self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
813
786
786
814
787
    def test_update_entry(self):
787
    def test_update_entry(self):
815
788
        if compiled_dirstate_helpers_feature.available():
788
        if compiled_dirstate_helpers_feature.available():
817
789
            from breezy.bzr._dirstate_helpers_pyx import update_entry
789
            from .._dirstate_helpers_pyx import update_entry
818
790
        else:
790
        else:
820
791
            from breezy.bzr.dirstate import update_entry
791
            from ..dirstate import update_entry
821
792
        self.assertIs(update_entry, dirstate.update_entry)
792
        self.assertIs(update_entry, dirstate.update_entry)
822
793
793
823
794
    def test_process_entry(self):
794
    def test_process_entry(self):
824
795
        if compiled_dirstate_helpers_feature.available():
795
        if compiled_dirstate_helpers_feature.available():
826
796
            from breezy.bzr._dirstate_helpers_pyx import ProcessEntryC
796
            from .._dirstate_helpers_pyx import ProcessEntryC
827
797
            self.assertIs(ProcessEntryC, dirstate._process_entry)
797
            self.assertIs(ProcessEntryC, dirstate._process_entry)
828
798
        else:
798
        else:
830
799
            from breezy.bzr.dirstate import ProcessEntryPython
799
            from ..dirstate import ProcessEntryPython
831
800
            self.assertIs(ProcessEntryPython, dirstate._process_entry)
800
            self.assertIs(ProcessEntryPython, dirstate._process_entry)
832
801
801
833
802
802
834
@@ -1313,7 +1313,7 @@
835
1313
            raise RuntimeError('stop this')
1313
            raise RuntimeError('stop this')
836
1314
        self.overrideAttr(dirstate, 'is_inside', is_inside_raises)
1314
        self.overrideAttr(dirstate, 'is_inside', is_inside_raises)
837
1315
        try:
1315
        try:
839
1316
            from breezy.bzr import _dirstate_helpers_pyx
1316
            from .. import _dirstate_helpers_pyx
840
1317
        except ImportError:
1317
        except ImportError:
841
1318
            pass
1318
            pass
842
1319
        else:
1319
        else:
843
1320
1320
844
=== renamed file 'breezy/tests/test__groupcompress.py' => 'breezy/bzr/tests/test__groupcompress.py'
845
--- breezy/tests/test__groupcompress.py	2020-02-07 02:14:30 +0000
846
+++ breezy/bzr/tests/test__groupcompress.py	2020-06-11 01:55:28 +0000
847
@@ -18,16 +18,16 @@
848
18
18
849
19
import sys
19
import sys
850
20
20
851
21
from ... import (
852
22
    tests,
853
23
    )
854
21
from .. import (
24
from .. import (
855
22
    tests,
856
23
    )
857
24
from ..bzr import (
858
25
    _groupcompress_py,
25
    _groupcompress_py,
859
26
    )
26
    )
861
27
from .scenarios import (
27
from ...tests.scenarios import (
862
28
    load_tests_apply_scenarios,
28
    load_tests_apply_scenarios,
863
29
    )
29
    )
865
30
from . import (
30
from ...tests import (
866
31
    features,
31
    features,
867
32
    )
32
    )
868
33
33
869
34
34
870
=== renamed file 'breezy/tests/test_btree_index.py' => 'breezy/bzr/tests/test_btree_index.py'
871
--- breezy/tests/test_btree_index.py	2018-11-11 04:08:32 +0000
872
+++ breezy/bzr/tests/test_btree_index.py	2020-06-11 01:55:28 +0000
873
@@ -20,7 +20,7 @@
874
20
import pprint
20
import pprint
875
21
import zlib
21
import zlib
876
22
22
878
23
from .. import (
23
from ... import (
879
24
    errors,
24
    errors,
880
25
    fifo_cache,
25
    fifo_cache,
881
26
    lru_cache,
26
    lru_cache,
882
@@ -28,15 +28,15 @@
883
28
    tests,
28
    tests,
884
29
    transport,
29
    transport,
885
30
    )
30
    )
887
31
from ..bzr import (
31
from .. import (
888
32
    btree_index,
32
    btree_index,
889
33
    index as _mod_index,
33
    index as _mod_index,
890
34
    )
34
    )
892
35
from ..tests import (
35
from ...tests import (
893
36
    TestCaseWithTransport,
36
    TestCaseWithTransport,
894
37
    scenarios,
37
    scenarios,
895
38
    )
38
    )
897
39
from ..tests import (
39
from ...tests import (
898
40
    features,
40
    features,
899
41
    )
41
    )
900
42
42
901
43
43
902
=== renamed file 'breezy/tests/test_chk_map.py' => 'breezy/bzr/tests/test_chk_map.py'
903
--- breezy/tests/test_chk_map.py	2018-11-11 04:08:32 +0000
904
+++ breezy/bzr/tests/test_chk_map.py	2020-06-11 01:55:28 +0000
905
@@ -16,22 +16,22 @@
906
16
16
907
17
"""Tests for maps built on a CHK versionedfiles facility."""
17
"""Tests for maps built on a CHK versionedfiles facility."""
908
18
18
910
19
from .. import (
19
from ... import (
911
20
    errors,
20
    errors,
912
21
    osutils,
21
    osutils,
913
22
    tests,
22
    tests,
914
23
    )
23
    )
916
24
from ..bzr import (
24
from .. import (
917
25
    chk_map,
25
    chk_map,
918
26
    groupcompress,
26
    groupcompress,
919
27
    )
27
    )
921
28
from ..bzr.chk_map import (
28
from ..chk_map import (
922
29
    CHKMap,
29
    CHKMap,
923
30
    InternalNode,
30
    InternalNode,
924
31
    LeafNode,
31
    LeafNode,
925
32
    Node,
32
    Node,
926
33
    )
33
    )
928
34
from ..static_tuple import StaticTuple
34
from ...static_tuple import StaticTuple
929
35
35
930
36
36
931
37
class TestNode(tests.TestCase):
37
class TestNode(tests.TestCase):
932
38
38
933
=== renamed file 'breezy/tests/test_chk_serializer.py' => 'breezy/bzr/tests/test_chk_serializer.py'
934
--- breezy/tests/test_chk_serializer.py	2020-01-31 02:56:40 +0000
935
+++ breezy/bzr/tests/test_chk_serializer.py	2020-06-11 01:55:28 +0000
936
@@ -14,10 +14,10 @@
937
14
# along with this program; if not, write to the Free Software
14
# along with this program; if not, write to the Free Software
938
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
939
16
16
941
17
from ..bzr.chk_serializer import (
17
from ..chk_serializer import (
942
18
    chk_bencode_serializer,
18
    chk_bencode_serializer,
943
19
    )
19
    )
945
20
from ..revision import (
20
from ...revision import (
946
21
    Revision,
21
    Revision,
947
22
    )
22
    )
948
23
from . import TestCase
23
from . import TestCase
949
24
24
950
=== renamed file 'breezy/tests/test_dirstate.py' => 'breezy/bzr/tests/test_dirstate.py'
951
--- breezy/tests/test_dirstate.py	2020-01-11 02:39:17 +0000
952
+++ breezy/bzr/tests/test_dirstate.py	2020-06-11 01:55:28 +0000
953
@@ -19,7 +19,7 @@
954
19
import os
19
import os
955
20
import tempfile
20
import tempfile
956
21
21
958
22
from .. import (
22
from ... import (
959
23
    controldir,
23
    controldir,
960
24
    errors,
24
    errors,
961
25
    memorytree,
25
    memorytree,
962
@@ -28,17 +28,17 @@
963
28
    revisiontree,
28
    revisiontree,
964
29
    tests,
29
    tests,
965
30
    )
30
    )
967
31
from ..bzr import (
31
from .. import (
968
32
    dirstate,
32
    dirstate,
969
33
    inventory,
33
    inventory,
970
34
    inventorytree,
34
    inventorytree,
971
35
    workingtree_4,
35
    workingtree_4,
972
36
    )
36
    )
974
37
from . import (
37
from ...tests import (
975
38
    features,
38
    features,
976
39
    test_osutils,
39
    test_osutils,
977
40
    )
40
    )
979
41
from .scenarios import load_tests_apply_scenarios
41
from ...tests.scenarios import load_tests_apply_scenarios
980
42
42
981
43
43
982
44
# TODO:
44
# TODO:
983
45
45
984
=== renamed file 'breezy/tests/test_generate_ids.py' => 'breezy/bzr/tests/test_generate_ids.py'
985
--- breezy/tests/test_generate_ids.py	2019-02-04 19:39:30 +0000
986
+++ breezy/bzr/tests/test_generate_ids.py	2020-06-11 01:55:28 +0000
987
@@ -16,10 +16,10 @@
988
16
16
989
17
"""Tests for breezy/generate_ids.py"""
17
"""Tests for breezy/generate_ids.py"""
990
18
18
991
19
from ... import (
992
20
    tests,
993
21
    )
994
19
from .. import (
22
from .. import (
995
20
    tests,
996
21
    )
997
22
from ..bzr import (
998
23
    generate_ids,
23
    generate_ids,
999
24
    )
24
    )
1000
25
25
1001
26
26
1002
=== renamed file 'breezy/tests/test_groupcompress.py' => 'breezy/bzr/tests/test_groupcompress.py'
1003
--- breezy/tests/test_groupcompress.py	2020-02-09 02:20:11 +0000
1004
+++ breezy/bzr/tests/test_groupcompress.py	2020-06-11 01:55:28 +0000
1005
@@ -18,23 +18,23 @@
1006
18
18
1007
19
import zlib
19
import zlib
1008
20
20
1010
21
from .. import (
21
from ... import (
1011
22
    config,
22
    config,
1012
23
    errors,
23
    errors,
1013
24
    osutils,
24
    osutils,
1014
25
    tests,
25
    tests,
1015
26
    trace,
26
    trace,
1016
27
    )
27
    )
1018
28
from ..bzr import (
28
from .. import (
1019
29
    btree_index,
29
    btree_index,
1020
30
    groupcompress,
30
    groupcompress,
1021
31
    knit,
31
    knit,
1022
32
    index as _mod_index,
32
    index as _mod_index,
1023
33
    versionedfile,
33
    versionedfile,
1024
34
    )
34
    )
1026
35
from ..osutils import sha_string
35
from ...osutils import sha_string
1027
36
from .test__groupcompress import compiled_groupcompress_feature
36
from .test__groupcompress import compiled_groupcompress_feature
1029
37
from .scenarios import load_tests_apply_scenarios
37
from ...tests.scenarios import load_tests_apply_scenarios
1030
38
38
1031
39
39
1032
40
def group_compress_implementation_scenarios():
40
def group_compress_implementation_scenarios():
1033
41
41
1034
=== renamed file 'breezy/tests/test_index.py' => 'breezy/bzr/tests/test_index.py'
1035
--- breezy/tests/test_index.py	2020-02-07 02:14:30 +0000
1036
+++ breezy/bzr/tests/test_index.py	2020-06-11 01:55:28 +0000
1037
@@ -16,12 +16,12 @@
1038
16
16
1039
17
"""Tests for indices."""
17
"""Tests for indices."""
1040
18
18
1042
19
from .. import (
19
from ... import (
1043
20
    errors,
20
    errors,
1044
21
    tests,
21
    tests,
1045
22
    transport,
22
    transport,
1046
23
    )
23
    )
1048
24
from ..bzr import (
24
from .. import (
1049
25
    index as _mod_index,
25
    index as _mod_index,
1050
26
    )
26
    )
1051
27
27
1052
28
28
1053
=== renamed file 'breezy/tests/test_inv.py' => 'breezy/bzr/tests/test_inv.py'
1054
--- breezy/tests/test_inv.py	2020-02-07 02:14:30 +0000
1055
+++ breezy/bzr/tests/test_inv.py	2020-06-11 01:55:28 +0000
1056
@@ -15,7 +15,7 @@
1057
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1058
16
16
1059
17
17
1061
18
from .. import (
18
from ... import (
1062
19
    errors,
19
    errors,
1063
20
    osutils,
20
    osutils,
1064
21
    repository,
21
    repository,
1065
@@ -23,12 +23,12 @@
1066
23
    tests,
23
    tests,
1067
24
    workingtree,
24
    workingtree,
1068
25
    )
25
    )
1070
26
from ..bzr import (
26
from .. import (
1071
27
    chk_map,
27
    chk_map,
1072
28
    groupcompress,
28
    groupcompress,
1073
29
    inventory,
29
    inventory,
1074
30
    )
30
    )
1076
31
from ..bzr.inventory import (
31
from ..inventory import (
1077
32
    CHKInventory,
32
    CHKInventory,
1078
33
    Inventory,
33
    Inventory,
1079
34
    ROOT_ID,
34
    ROOT_ID,
1080
@@ -43,7 +43,7 @@
1081
43
    TestCase,
43
    TestCase,
1082
44
    TestCaseWithTransport,
44
    TestCaseWithTransport,
1083
45
    )
45
    )
1085
46
from .scenarios import load_tests_apply_scenarios
46
from ...tests.scenarios import load_tests_apply_scenarios
1086
47
47
1087
48
48
1088
49
load_tests = load_tests_apply_scenarios
49
load_tests = load_tests_apply_scenarios
1089
50
50
1090
=== renamed file 'breezy/tests/test_inventory_delta.py' => 'breezy/bzr/tests/test_inventory_delta.py'
1091
--- breezy/tests/test_inventory_delta.py	2020-02-13 23:57:28 +0000
1092
+++ breezy/bzr/tests/test_inventory_delta.py	2020-06-11 01:55:28 +0000
1093
@@ -22,14 +22,14 @@
1094
22
from io import (
22
from io import (
1095
23
    BytesIO,
23
    BytesIO,
1096
24
    )
24
    )
1099
25
from .. import osutils
25
from ... import osutils
1100
26
from ..bzr import (
26
from .. import (
1101
27
    inventory,
27
    inventory,
1102
28
    inventory_delta,
28
    inventory_delta,
1103
29
    )
29
    )
1107
30
from ..bzr.inventory_delta import InventoryDeltaError
30
from ..inventory_delta import InventoryDeltaError
1108
31
from ..bzr.inventory import Inventory
31
from ..inventory import Inventory
1109
32
from ..revision import NULL_REVISION
32
from ...revision import NULL_REVISION
1110
33
from . import TestCase
33
from . import TestCase
1111
34
34
1112
35
### DO NOT REFLOW THESE TEXTS. NEW LINES ARE SIGNIFICANT. ###
35
### DO NOT REFLOW THESE TEXTS. NEW LINES ARE SIGNIFICANT. ###
1113
36
36
1114
=== renamed file 'breezy/tests/test_knit.py' => 'breezy/bzr/tests/test_knit.py'
1115
--- breezy/tests/test_knit.py	2020-01-26 15:23:23 +0000
1116
+++ breezy/bzr/tests/test_knit.py	2020-06-11 01:55:28 +0000
1117
@@ -21,19 +21,19 @@
1118
21
from patiencediff import PatienceSequenceMatcher
21
from patiencediff import PatienceSequenceMatcher
1119
22
import sys
22
import sys
1120
23
23
1122
24
from .. import (
24
from ... import (
1123
25
    errors,
25
    errors,
1124
26
    multiparent,
26
    multiparent,
1125
27
    osutils,
27
    osutils,
1126
28
    tests,
28
    tests,
1127
29
    transport,
29
    transport,
1128
30
    )
30
    )
1130
31
from ..bzr import (
31
from .. import (
1131
32
    knit,
32
    knit,
1132
33
    pack,
33
    pack,
1133
34
    )
34
    )
1136
35
from ..bzr.index import *
35
from ..index import *
1137
36
from ..bzr.knit import (
36
from ..knit import (
1138
37
    AnnotatedKnitContent,
37
    AnnotatedKnitContent,
1139
38
    KnitContent,
38
    KnitContent,
1140
39
    KnitCorrupt,
39
    KnitCorrupt,
1141
@@ -49,23 +49,23 @@
1142
49
    _KnitKeyAccess,
49
    _KnitKeyAccess,
1143
50
    make_file_factory,
50
    make_file_factory,
1144
51
    )
51
    )
1146
52
from ..bzr import (
52
from .. import (
1147
53
    knitpack_repo,
53
    knitpack_repo,
1148
54
    pack_repo,
54
    pack_repo,
1149
55
    )
55
    )
1151
56
from . import (
56
from ...tests import (
1152
57
    TestCase,
57
    TestCase,
1153
58
    TestCaseWithMemoryTransport,
58
    TestCaseWithMemoryTransport,
1154
59
    TestCaseWithTransport,
59
    TestCaseWithTransport,
1155
60
    TestNotApplicable,
60
    TestNotApplicable,
1156
61
    )
61
    )
1158
62
from ..bzr.versionedfile import (
62
from ..versionedfile import (
1159
63
    AbsentContentFactory,
63
    AbsentContentFactory,
1160
64
    ConstantMapper,
64
    ConstantMapper,
1161
65
    network_bytes_to_kind_and_offset,
65
    network_bytes_to_kind_and_offset,
1162
66
    RecordingVersionedFilesDecorator,
66
    RecordingVersionedFilesDecorator,
1163
67
    )
67
    )
1165
68
from . import (
68
from ...tests import (
1166
69
    features,
69
    features,
1167
70
    )
70
    )
1168
71
71
1169
@@ -938,7 +938,7 @@
1170
938
938
1171
939
    @property
939
    @property
1172
940
    def _load_data(self):
940
    def _load_data(self):
1174
941
        from ..bzr._knit_load_data_py import _load_data_py
941
        from .._knit_load_data_py import _load_data_py
1175
942
        return _load_data_py
942
        return _load_data_py
1176
943
943
1177
944
    def get_knit_index(self, transport, name, mode):
944
    def get_knit_index(self, transport, name, mode):
1178
@@ -1331,7 +1331,7 @@
1179
1331
1331
1180
1332
    @property
1332
    @property
1181
1333
    def _load_data(self):
1333
    def _load_data(self):
1183
1334
        from ..bzr._knit_load_data_pyx import _load_data_c
1334
        from .._knit_load_data_pyx import _load_data_c
1184
1335
        return _load_data_c
1335
        return _load_data_c
1185
1336
1336
1186
1337
1337
1187
1338
1338
1188
=== added file 'breezy/bzr/tests/test_matchers.py'
1189
--- breezy/bzr/tests/test_matchers.py	1970-01-01 00:00:00 +0000
1190
+++ breezy/bzr/tests/test_matchers.py	2020-06-11 01:55:28 +0000
1191
@@ -0,0 +1,57 @@
1192
1
# Copyright (C) 2010, 2011, 2012, 2016 Canonical Ltd
1193
2
#
1194
3
# This program is free software; you can redistribute it and/or modify
1195
4
# it under the terms of the GNU General Public License as published by
1196
5
# the Free Software Foundation; either version 2 of the License, or
1197
6
# (at your option) any later version.
1198
7
#
1199
8
# This program is distributed in the hope that it will be useful,
1200
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1201
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1202
11
# GNU General Public License for more details.
1203
12
#
1204
13
# You should have received a copy of the GNU General Public License
1205
14
# along with this program; if not, write to the Free Software
1206
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1207
16
1208
17
"""Tests of breezy test matchers."""
1209
18
1210
19
from testtools.matchers import *
1211
20
1212
21
from ..smart.client import CallHookParams
1213
22
1214
23
from ...tests import (
1215
24
    CapturedCall,
1216
25
    TestCase,
1217
26
    )
1218
27
from .matchers import *
1219
28
1220
29
1221
30
class TestContainsNoVfsCalls(TestCase):
1222
31
1223
32
    def _make_call(self, method, args):
1224
33
        return CapturedCall(CallHookParams(method, args, None, None, None), 0)
1225
34
1226
35
    def test__str__(self):
1227
36
        self.assertEqual("ContainsNoVfsCalls()", str(ContainsNoVfsCalls()))
1228
37
1229
38
    def test_empty(self):
1230
39
        self.assertIs(None, ContainsNoVfsCalls().match([]))
1231
40
1232
41
    def test_no_vfs_calls(self):
1233
42
        calls = [self._make_call("Branch.get_config_file", [])]
1234
43
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
1235
44
1236
45
    def test_ignores_unknown(self):
1237
46
        calls = [self._make_call("unknown", [])]
1238
47
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
1239
48
1240
49
    def test_match(self):
1241
50
        calls = [self._make_call(b"append", [b"file"]),
1242
51
                 self._make_call(b"Branch.get_config_file", [])]
1243
52
        mismatch = ContainsNoVfsCalls().match(calls)
1244
53
        self.assertIsNot(None, mismatch)
1245
54
        self.assertEqual([calls[0].call], mismatch.vfs_calls)
1246
55
        self.assertIn(mismatch.describe(), [
1247
56
            "no VFS calls expected, got: b'append'(b'file')",
1248
57
            "no VFS calls expected, got: append('file')"])
1249
0
58
1250
=== renamed file 'breezy/tests/test_pack.py' => 'breezy/bzr/tests/test_pack.py'
1251
--- breezy/tests/test_pack.py	2020-02-13 23:57:28 +0000
1252
+++ breezy/bzr/tests/test_pack.py	2020-06-11 01:55:28 +0000
1253
@@ -18,8 +18,8 @@
1254
18
18
1255
19
from io import BytesIO
19
from io import BytesIO
1256
20
20
1259
21
from .. import errors, tests
21
from ... import errors, tests
1260
22
from ..bzr import (
22
from .. import (
1261
23
    pack,
23
    pack,
1262
24
    )
24
    )
1263
25
25
1264
26
26
1265
=== renamed file 'breezy/tests/test_remote.py' => 'breezy/bzr/tests/test_remote.py'
1266
--- breezy/tests/test_remote.py	2020-02-07 02:14:30 +0000
1267
+++ breezy/bzr/tests/test_remote.py	2020-06-11 01:55:28 +0000
1268
@@ -29,7 +29,7 @@
1269
29
import tarfile
29
import tarfile
1270
30
import zlib
30
import zlib
1271
31
31
1273
32
from .. import (
32
from ... import (
1274
33
    bencode,
33
    bencode,
1275
34
    branch,
34
    branch,
1276
35
    config,
35
    config,
1277
@@ -40,8 +40,8 @@
1278
40
    transport,
40
    transport,
1279
41
    treebuilder,
41
    treebuilder,
1280
42
    )
42
    )
1283
43
from ..branch import Branch
43
from ...branch import Branch
1284
44
from ..bzr import (
44
from .. import (
1285
45
    bzrdir,
45
    bzrdir,
1286
46
    inventory,
46
    inventory,
1287
47
    inventory_delta,
47
    inventory_delta,
1288
@@ -49,15 +49,15 @@
1289
49
    versionedfile,
49
    versionedfile,
1290
50
    vf_search,
50
    vf_search,
1291
51
    )
51
    )
1293
52
from ..bzr.bzrdir import (
52
from ..bzrdir import (
1294
53
    BzrDir,
53
    BzrDir,
1295
54
    BzrDirFormat,
54
    BzrDirFormat,
1296
55
    )
55
    )
1298
56
from ..bzr import (
56
from .. import (
1299
57
    RemoteBzrProber,
57
    RemoteBzrProber,
1300
58
    )
58
    )
1303
59
from ..bzr.chk_serializer import chk_bencode_serializer
59
from ..chk_serializer import chk_bencode_serializer
1304
60
from ..bzr.remote import (
60
from ..remote import (
1305
61
    RemoteBranch,
61
    RemoteBranch,
1306
62
    RemoteBranchFormat,
62
    RemoteBranchFormat,
1307
63
    RemoteBzrDir,
63
    RemoteBzrDir,
1308
@@ -65,24 +65,24 @@
1309
65
    RemoteRepository,
65
    RemoteRepository,
1310
66
    RemoteRepositoryFormat,
66
    RemoteRepositoryFormat,
1311
67
    )
67
    )
1314
68
from ..bzr import groupcompress_repo, knitpack_repo
68
from .. import groupcompress_repo, knitpack_repo
1315
69
from ..revision import (
69
from ...revision import (
1316
70
    NULL_REVISION,
70
    NULL_REVISION,
1317
71
    Revision,
71
    Revision,
1318
72
    )
72
    )
1322
73
from ..bzr.smart import medium, request
73
from ..smart import medium, request
1323
74
from ..bzr.smart.client import _SmartClient
74
from ..smart.client import _SmartClient
1324
75
from ..bzr.smart.repository import (
75
from ..smart.repository import (
1325
76
    SmartServerRepositoryGetParentMap,
76
    SmartServerRepositoryGetParentMap,
1326
77
    SmartServerRepositoryGetStream_1_19,
77
    SmartServerRepositoryGetStream_1_19,
1327
78
    _stream_to_byte_stream,
78
    _stream_to_byte_stream,
1328
79
    )
79
    )
1330
80
from . import (
80
from ...tests import (
1331
81
    test_server,
81
    test_server,
1332
82
    )
82
    )
1336
83
from .scenarios import load_tests_apply_scenarios
83
from ...tests.scenarios import load_tests_apply_scenarios
1337
84
from ..transport.memory import MemoryTransport
84
from ...transport.memory import MemoryTransport
1338
85
from ..transport.remote import (
85
from ...transport.remote import (
1339
86
    RemoteTransport,
86
    RemoteTransport,
1340
87
    RemoteSSHTransport,
87
    RemoteSSHTransport,
1341
88
    RemoteTCPTransport,
88
    RemoteTCPTransport,
1342
89
89
1343
=== renamed file 'breezy/tests/test_repository.py' => 'breezy/bzr/tests/test_repository.py'
1344
--- breezy/tests/test_repository.py	2020-01-30 16:13:31 +0000
1345
+++ breezy/bzr/tests/test_repository.py	2020-06-11 01:55:28 +0000
1346
@@ -213,7 +213,7 @@
1347
213
213
1348
214
    def test_register_extra_lazy(self):
214
    def test_register_extra_lazy(self):
1349
215
        self.assertEqual([], self.registry._get_all())
215
        self.assertEqual([], self.registry._get_all())
1351
216
        self.registry.register_extra_lazy("breezy.tests.test_repository",
216
        self.registry.register_extra_lazy(__name__,
1352
217
                                          "SampleExtraRepositoryFormat")
217
                                          "SampleExtraRepositoryFormat")
1353
218
        formats = self.registry._get_all()
218
        formats = self.registry._get_all()
1354
219
        self.assertEqual(1, len(formats))
219
        self.assertEqual(1, len(formats))
1355
220
220
1356
=== renamed file 'breezy/tests/test_serializer.py' => 'breezy/bzr/tests/test_serializer.py'
1357
--- breezy/tests/test_serializer.py	2017-06-10 21:59:15 +0000
1358
+++ breezy/bzr/tests/test_serializer.py	2020-06-11 01:55:28 +0000
1359
@@ -18,7 +18,7 @@
1360
18
"""Tests for the revision/inventory Serializers."""
18
"""Tests for the revision/inventory Serializers."""
1361
19
19
1362
20
20
1364
21
from ..bzr import (
21
from .. import (
1365
22
    chk_serializer,
22
    chk_serializer,
1366
23
    serializer,
23
    serializer,
1367
24
    xml5,
24
    xml5,
1368
25
25
1369
=== renamed file 'breezy/tests/test_smart.py' => 'breezy/bzr/tests/test_smart.py'
1370
=== renamed file 'breezy/tests/test_smart_request.py' => 'breezy/bzr/tests/test_smart_request.py'
1371
=== renamed file 'breezy/tests/test_smart_signals.py' => 'breezy/bzr/tests/test_smart_signals.py'
1372
=== renamed file 'breezy/tests/test_smart_transport.py' => 'breezy/bzr/tests/test_smart_transport.py'
1373
--- breezy/tests/test_smart_transport.py	2020-02-07 02:14:30 +0000
1374
+++ breezy/bzr/tests/test_smart_transport.py	2020-06-11 01:55:28 +0000
1375
@@ -30,7 +30,7 @@
1376
30
from testtools.matchers import DocTestMatches
30
from testtools.matchers import DocTestMatches
1377
31
31
1378
32
import breezy
32
import breezy
1380
33
from .. import (
33
from ... import (
1381
34
    controldir,
34
    controldir,
1382
35
    debug,
35
    debug,
1383
36
    errors,
36
    errors,
1384
@@ -39,10 +39,10 @@
1385
39
    transport as _mod_transport,
39
    transport as _mod_transport,
1386
40
    urlutils,
40
    urlutils,
1387
41
    )
41
    )
1389
42
from ..bzr import (
42
from .. import (
1390
43
    bzrdir,
43
    bzrdir,
1391
44
    )
44
    )
1393
45
from ..bzr.smart import (
45
from ..smart import (
1394
46
    client,
46
    client,
1395
47
    medium,
47
    medium,
1396
48
    message,
48
    message,
1397
@@ -51,18 +51,20 @@
1398
51
    server as _mod_server,
51
    server as _mod_server,
1399
52
    vfs,
52
    vfs,
1400
53
    )
53
    )
1402
54
from . import (
54
from ...tests import (
1403
55
    features,
55
    features,
1404
56
    test_smart,
1405
57
    test_server,
56
    test_server,
1406
58
    )
57
    )
1408
59
from ..transport import (
58
from ...transport import (
1409
60
    http,
59
    http,
1410
61
    local,
60
    local,
1411
62
    memory,
61
    memory,
1412
63
    remote,
62
    remote,
1413
64
    ssh,
63
    ssh,
1414
65
    )
64
    )
1415
65
from . import (
1416
66
    test_smart,
1417
67
    )
1418
66
68
1419
67
69
1420
68
def create_file_pipes():
70
def create_file_pipes():
1421
69
71
1422
=== added file 'breezy/bzr/tests/test_tag.py'
1423
--- breezy/bzr/tests/test_tag.py	1970-01-01 00:00:00 +0000
1424
+++ breezy/bzr/tests/test_tag.py	2020-06-11 01:55:28 +0000
1425
@@ -0,0 +1,45 @@
1426
1
# Copyright (C) 2007, 2009-2012, 2016 Canonical Ltd
1427
2
#
1428
3
# This program is free software; you can redistribute it and/or modify
1429
4
# it under the terms of the GNU General Public License as published by
1430
5
# the Free Software Foundation; either version 2 of the License, or
1431
6
# (at your option) any later version.
1432
7
#
1433
8
# This program is distributed in the hope that it will be useful,
1434
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1435
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1436
11
# GNU General Public License for more details.
1437
12
#
1438
13
# You should have received a copy of the GNU General Public License
1439
14
# along with this program; if not, write to the Free Software
1440
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1441
16
1442
17
"""Tests for breezy.bzr.tag."""
1443
18
1444
19
1445
20
from breezy.bzr.tag import (
1446
21
    BasicTags,
1447
22
    )
1448
23
from breezy.tests import (
1449
24
    TestCase,
1450
25
    )
1451
26
1452
27
1453
28
class TestTagSerialization(TestCase):
1454
29
1455
30
    def test_tag_serialization(self):
1456
31
        """Test the precise representation of tag dicts."""
1457
32
        # Don't change this after we commit to this format, as it checks
1458
33
        # that the format is stable and compatible across releases.
1459
34
        #
1460
35
        # This release stores them in bencode as a dictionary from name to
1461
36
        # target.
1462
37
        store = BasicTags(branch=None)
1463
38
        td = dict(stable=b'stable-revid', boring=b'boring-revid')
1464
39
        packed = store._serialize_tag_dict(td)
1465
40
        expected = br'd6:boring12:boring-revid6:stable12:stable-revide'
1466
41
        self.assertEqualDiff(packed, expected)
1467
42
        self.assertEqual(store._deserialize_tag_dict(packed), td)
1468
43
1469
44
1470
45
1471
0
46
1472
=== renamed file 'breezy/tests/test_testament.py' => 'breezy/bzr/tests/test_testament.py'
1473
=== renamed file 'breezy/tests/test_versionedfile.py' => 'breezy/bzr/tests/test_versionedfile.py'
1474
--- breezy/tests/test_versionedfile.py	2018-11-11 04:08:32 +0000
1475
+++ breezy/bzr/tests/test_versionedfile.py	2020-06-11 01:55:28 +0000
1476
@@ -16,12 +16,12 @@
1477
16
16
1478
17
"""Tests for VersionedFile classes"""
17
"""Tests for VersionedFile classes"""
1479
18
18
1481
19
from .. import (
19
from ... import (
1482
20
    errors,
20
    errors,
1483
21
    multiparent,
21
    multiparent,
1484
22
    tests,
22
    tests,
1485
23
    )
23
    )
1487
24
from ..bzr import (
24
from .. import (
1488
25
    groupcompress,
25
    groupcompress,
1489
26
    versionedfile,
26
    versionedfile,
1490
27
    )
27
    )
1491
28
28
1492
=== renamed file 'breezy/tests/test_weave.py' => 'breezy/bzr/tests/test_weave.py'
1493
--- breezy/tests/test_weave.py	2020-02-07 02:14:30 +0000
1494
+++ breezy/bzr/tests/test_weave.py	2020-06-11 01:55:28 +0000
1495
@@ -24,13 +24,13 @@
1496
24
from io import BytesIO
24
from io import BytesIO
1497
25
from pprint import pformat
25
from pprint import pformat
1498
26
26
1500
27
from .. import (
27
from ... import (
1501
28
    errors,
28
    errors,
1502
29
    )
29
    )
1504
30
from ..osutils import sha_string
30
from ...osutils import sha_string
1505
31
from . import TestCase, TestCaseInTempDir
31
from . import TestCase, TestCaseInTempDir
1508
32
from ..bzr.weave import Weave, WeaveFormatError, WeaveInvalidChecksum
32
from ..weave import Weave, WeaveFormatError, WeaveInvalidChecksum
1509
33
from ..bzr.weavefile import write_weave, read_weave
33
from ..weavefile import write_weave, read_weave
1510
34
34
1511
35
35
1512
36
# texts for use in testing
36
# texts for use in testing
1513
37
37
1514
=== renamed file 'breezy/tests/test_workingtree_4.py' => 'breezy/bzr/tests/test_workingtree_4.py'
1515
--- breezy/tests/test_workingtree_4.py	2019-09-21 23:05:12 +0000
1516
+++ breezy/bzr/tests/test_workingtree_4.py	2020-06-11 01:55:28 +0000
1517
@@ -20,19 +20,19 @@
1518
20
import os
20
import os
1519
21
import time
21
import time
1520
22
22
1522
23
from .. import (
23
from ... import (
1523
24
    errors,
24
    errors,
1524
25
    osutils,
25
    osutils,
1525
26
    )
26
    )
1527
27
from ..bzr import (
27
from .. import (
1528
28
    bzrdir,
28
    bzrdir,
1529
29
    dirstate,
29
    dirstate,
1530
30
    inventory,
30
    inventory,
1531
31
    workingtree_4,
31
    workingtree_4,
1532
32
    )
32
    )
1536
33
from ..lockdir import LockDir
33
from ...lockdir import LockDir
1537
34
from . import TestCaseWithTransport, TestSkipped, features
34
from ...tests import TestCaseWithTransport, TestSkipped, features
1538
35
from ..tree import InterTree
35
from ...tree import InterTree
1539
36
36
1540
37
37
1541
38
class TestWorkingTreeFormat4(TestCaseWithTransport):
38
class TestWorkingTreeFormat4(TestCaseWithTransport):
1542
@@ -63,16 +63,10 @@
1543
63
        # Only the last unlock call will actually reset the
63
        # Only the last unlock call will actually reset the
1544
64
        # ignores. (bug #785671)
64
        # ignores. (bug #785671)
1545
65
        tree = self.make_workingtree()
65
        tree = self.make_workingtree()
1550
66
        tree.lock_read()
66
        with tree.lock_read():
1551
67
        try:
67
            with tree.lock_read():
1548
68
            tree.lock_read()
1549
69
            try:
1552
70
                tree.is_ignored("foo")
68
                tree.is_ignored("foo")
1553
71
            finally:
1554
72
                tree.unlock()
1555
73
            self.assertIsNot(None, tree._ignoreglobster)
69
            self.assertIsNot(None, tree._ignoreglobster)
1556
74
        finally:
1557
75
            tree.unlock()
1558
76
        self.assertIs(None, tree._ignoreglobster)
70
        self.assertIs(None, tree._ignoreglobster)
1559
77
71
1560
78
    def test_uses_lockdir(self):
72
    def test_uses_lockdir(self):
1561
79
73
1562
=== renamed file 'breezy/tests/test_xml.py' => 'breezy/bzr/tests/test_xml.py'
1563
--- breezy/tests/test_xml.py	2020-02-07 02:14:30 +0000
1564
+++ breezy/bzr/tests/test_xml.py	2020-06-11 01:55:28 +0000
1565
@@ -16,17 +16,17 @@
1566
16
16
1567
17
from io import BytesIO
17
from io import BytesIO
1568
18
18
1570
19
from .. import (
19
from ... import (
1571
20
    errors,
20
    errors,
1572
21
    fifo_cache,
21
    fifo_cache,
1573
22
    )
22
    )
1575
23
from ..bzr import (
23
from .. import (
1576
24
    inventory,
24
    inventory,
1577
25
    xml6,
25
    xml6,
1578
26
    xml7,
26
    xml7,
1579
27
    xml8,
27
    xml8,
1580
28
    )
28
    )
1582
29
from ..bzr.inventory import Inventory
29
from ..inventory import Inventory
1583
30
from . import TestCase
30
from . import TestCase
1584
31
import breezy.bzr.xml5
31
import breezy.bzr.xml5
1585
32
32
1586
33
33
1587
=== modified file 'breezy/bzr/workingtree_4.py'
1588
--- breezy/bzr/workingtree_4.py	2020-02-18 01:57:45 +0000
1589
+++ breezy/bzr/workingtree_4.py	2020-06-11 01:55:28 +0000
1590
@@ -2201,7 +2201,7 @@
1591
2201
    @classmethod
2201
    @classmethod
1592
2202
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
2202
    def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
1593
2203
                                                  target):
2203
                                                  target):
1595
2204
        from ..tests.test__dirstate_helpers import \
2204
        from .tests.test__dirstate_helpers import \
1596
2205
            compiled_dirstate_helpers_feature
2205
            compiled_dirstate_helpers_feature
1597
2206
        test_case.requireFeature(compiled_dirstate_helpers_feature)
2206
        test_case.requireFeature(compiled_dirstate_helpers_feature)
1598
2207
        from ._dirstate_helpers_pyx import ProcessEntryC
2207
        from ._dirstate_helpers_pyx import ProcessEntryC
1599
2208
2208
1600
=== modified file 'breezy/git/mapping.py'
1601
--- breezy/git/mapping.py	2020-05-06 02:13:25 +0000
1602
+++ breezy/git/mapping.py	2020-06-11 01:55:28 +0000
1603
@@ -114,6 +114,8 @@
1604
114
    if b"<" not in text and b">" not in text:
114
    if b"<" not in text and b">" not in text:
1605
115
        username = text
115
        username = text
1606
116
        email = text
116
        email = text
1607
117
    elif b">" not in text:
1608
118
        return text + b">"
1609
117
    else:
119
    else:
1610
118
        if text.rindex(b">") < text.rindex(b"<"):
120
        if text.rindex(b">") < text.rindex(b"<"):
1611
119
            raise ValueError(text)
121
            raise ValueError(text)
1612
120
122
1613
=== modified file 'breezy/git/remote.py'
1614
--- breezy/git/remote.py	2020-06-01 23:15:18 +0000
1615
+++ breezy/git/remote.py	2020-06-11 01:55:28 +0000
1616
@@ -222,11 +222,13 @@
1617
222
        return e
222
        return e
1618
223
    interesting_lines = [
223
    interesting_lines = [
1619
224
        line for line in stderr_lines
224
        line for line in stderr_lines
1621
225
        if line and line.replace('=', '')]
225
        if line and line.replace(b'=', b'')]
1622
226
    if len(interesting_lines) == 1:
226
    if len(interesting_lines) == 1:
1623
227
        interesting_line = interesting_lines[0]
227
        interesting_line = interesting_lines[0]
1626
228
        return parse_git_error(url, interesting_line)
228
        return parse_git_error(
1627
229
    return RemoteGitError('\n'.join(stderr_lines))
229
            url, interesting_line.decode('utf-8', 'surrogateescape'))
1628
230
    return RemoteGitError(
1629
231
        b'\n'.join(stderr_lines).decode('utf-8', 'surrogateescape'))
1630
230
232
1631
231
233
1632
232
class GitSmartTransport(Transport):
234
class GitSmartTransport(Transport):
1633
233
235
1634
=== modified file 'breezy/git/tests/test_mapping.py'
1635
--- breezy/git/tests/test_mapping.py	2020-02-18 01:57:45 +0000
1636
+++ breezy/git/tests/test_mapping.py	2020-06-11 01:55:28 +0000
1637
@@ -441,9 +441,14 @@
1638
441
                         fix_person_identifier(b"bar@blah.nl"))
441
                         fix_person_identifier(b"bar@blah.nl"))
1639
442
442
1640
443
    def test_fix(self):
443
    def test_fix(self):
1645
444
        self.assertEqual(b"person <bar@blah.nl>",
444
        self.assertEqual(
1646
445
                         fix_person_identifier(b"somebody <person <bar@blah.nl>>"))
445
            b"person <bar@blah.nl>",
1647
446
        self.assertEqual(b"person <bar@blah.nl>",
446
            fix_person_identifier(b"somebody <person <bar@blah.nl>>"))
1648
447
                         fix_person_identifier(b"person<bar@blah.nl>"))
447
        self.assertEqual(
1649
448
            b"person <bar@blah.nl>",
1650
449
            fix_person_identifier(b"person<bar@blah.nl>"))
1651
450
        self.assertEqual(
1652
451
            b'Rohan Garg <rohangarg@kubuntu.org>',
1653
452
            fix_person_identifier(b'Rohan Garg <rohangarg@kubuntu.org'))
1654
448
        self.assertRaises(ValueError,
453
        self.assertRaises(ValueError,
1655
449
                          fix_person_identifier, b"person >bar@blah.nl<")
454
                          fix_person_identifier, b"person >bar@blah.nl<")
1656
450
455
1657
=== modified file 'breezy/git/tests/test_remote.py'
1658
--- breezy/git/tests/test_remote.py	2020-06-01 23:15:18 +0000
1659
+++ breezy/git/tests/test_remote.py	2020-06-11 01:55:28 +0000
1660
@@ -149,7 +149,7 @@
1661
149
    def setUp(self):
149
    def setUp(self):
1662
150
        super(ParseHangupTests, self).setUp()
150
        super(ParseHangupTests, self).setUp()
1663
151
        try:
151
        try:
1665
152
            HangupException(['foo'])
152
            HangupException([b'foo'])
1666
153
        except TypeError:
153
        except TypeError:
1667
154
            self.skipTest('dulwich version too old')
154
            self.skipTest('dulwich version too old')
1668
155
155
1669
@@ -160,18 +160,18 @@
1670
160
    def test_single_line(self):
160
    def test_single_line(self):
1671
161
        self.assertEqual(
161
        self.assertEqual(
1672
162
            RemoteGitError('foo bar'),
162
            RemoteGitError('foo bar'),
1674
163
            parse_git_hangup('http://', HangupException(['foo bar'])))
163
            parse_git_hangup('http://', HangupException([b'foo bar'])))
1675
164
164
1676
165
    def test_multi_lines(self):
165
    def test_multi_lines(self):
1677
166
        self.assertEqual(
166
        self.assertEqual(
1678
167
            RemoteGitError('foo bar\nbla bla'),
167
            RemoteGitError('foo bar\nbla bla'),
1679
168
            parse_git_hangup(
168
            parse_git_hangup(
1681
169
                'http://', HangupException(['foo bar', 'bla bla'])))
169
                'http://', HangupException([b'foo bar', b'bla bla'])))
1682
170
170
1683
171
    def test_filter_boring(self):
171
    def test_filter_boring(self):
1684
172
        self.assertEqual(
172
        self.assertEqual(
1685
173
            RemoteGitError('foo bar'), parse_git_hangup('http://', HangupException(
173
            RemoteGitError('foo bar'), parse_git_hangup('http://', HangupException(
1687
174
                ['=======', 'foo bar', '======'])))
174
                [b'=======', b'foo bar', b'======'])))
1688
175
175
1689
176
    def test_permission_denied(self):
176
    def test_permission_denied(self):
1690
177
        self.assertEqual(
177
        self.assertEqual(
1691
@@ -179,8 +179,8 @@
1692
179
            parse_git_hangup(
179
            parse_git_hangup(
1693
180
                'http://',
180
                'http://',
1694
181
                HangupException(
181
                HangupException(
1697
182
                    ['=======',
182
                    [b'=======',
1698
183
                     'You are not allowed to push code to this project.', '', '======'])))
183
                     b'You are not allowed to push code to this project.', b'', b'======'])))
1699
184
184
1700
185
185
1701
186
class TestRemoteGitBranchFormat(TestCase):
186
class TestRemoteGitBranchFormat(TestCase):
1702
187
187
1703
=== modified file 'breezy/plugins/weave_fmt/repository.py'
1704
--- breezy/plugins/weave_fmt/repository.py	2020-02-18 01:57:45 +0000
1705
+++ breezy/plugins/weave_fmt/repository.py	2020-06-11 01:55:28 +0000
1706
@@ -863,7 +863,7 @@
1707
863
                    self.source._eliminate_revisions_not_present(
863
                    self.source._eliminate_revisions_not_present(
1708
864
                        required_revisions))
864
                        required_revisions))
1709
865
            if limit is not None:
865
            if limit is not None:
1711
866
                topo_ordered = self.get_graph().iter_topo_order(result_set)
866
                topo_ordered = self.source.get_graph().iter_topo_order(result_set)
1712
867
                result_set = set(itertools.islice(topo_ordered, limit))
867
                result_set = set(itertools.islice(topo_ordered, limit))
1713
868
            return self.source.revision_ids_to_search_result(result_set)
868
            return self.source.revision_ids_to_search_result(result_set)
1714
869
869
1715
870
870
1716
=== modified file 'breezy/tests/__init__.py'
1717
--- breezy/tests/__init__.py	2020-02-18 01:57:45 +0000
1718
+++ breezy/tests/__init__.py	2020-06-11 01:55:28 +0000
1719
@@ -3962,6 +3962,41 @@
1720
3962
def _test_suite_testmod_names():
3962
def _test_suite_testmod_names():
1721
3963
    """Return the standard list of test module names to test."""
3963
    """Return the standard list of test module names to test."""
1722
3964
    return [
3964
    return [
1723
3965
        'breezy.bzr.tests.test_dirstate',
1724
3966
        'breezy.bzr.tests.per_bzrdir',
1725
3967
        'breezy.bzr.tests.per_inventory',
1726
3968
        'breezy.bzr.tests.per_pack_repository',
1727
3969
        'breezy.bzr.tests.per_repository_chk',
1728
3970
        'breezy.bzr.tests.per_repository_vf',
1729
3971
        'breezy.bzr.tests.per_versionedfile',
1730
3972
        'breezy.bzr.tests.test_groupcompress',
1731
3973
        'breezy.bzr.tests.test_btree_index',
1732
3974
        'breezy.bzr.tests.test_chk_map',
1733
3975
        'breezy.bzr.tests.test_chk_serializer',
1734
3976
        'breezy.bzr.tests.test_generate_ids',
1735
3977
        'breezy.bzr.tests.test_index',
1736
3978
        'breezy.bzr.tests.test_inv',
1737
3979
        'breezy.bzr.tests.test_inventory_delta',
1738
3980
        'breezy.bzr.tests.test_knit',
1739
3981
        'breezy.bzr.tests.test_matchers',
1740
3982
        'breezy.bzr.tests.test_pack',
1741
3983
        'breezy.bzr.tests.test_remote',
1742
3984
        'breezy.bzr.tests.test_repository',
1743
3985
        'breezy.bzr.tests.test_smart',
1744
3986
        'breezy.bzr.tests.test_smart_request',
1745
3987
        'breezy.bzr.tests.test_smart_signals',
1746
3988
        'breezy.bzr.tests.test_smart_transport',
1747
3989
        'breezy.bzr.tests.test_versionedfile',
1748
3990
        'breezy.bzr.tests.test_serializer',
1749
3991
        'breezy.bzr.tests.test_tag',
1750
3992
        'breezy.bzr.tests.test_testament',
1751
3993
        'breezy.bzr.tests.test_weave',
1752
3994
        'breezy.bzr.tests.test_workingtree_4',
1753
3995
        'breezy.bzr.tests.test_xml',
1754
3996
        'breezy.bzr.tests.test__btree_serializer',
1755
3997
        'breezy.bzr.tests.test__chk_map',
1756
3998
        'breezy.bzr.tests.test__dirstate_helpers',
1757
3999
        'breezy.bzr.tests.test__groupcompress',
1758
3965
        'breezy.git.tests.test_blackbox',
4000
        'breezy.git.tests.test_blackbox',
1759
3966
        'breezy.git.tests.test_builder',
4001
        'breezy.git.tests.test_builder',
1760
3967
        'breezy.git.tests.test_branch',
4002
        'breezy.git.tests.test_branch',
1761
@@ -3987,34 +4022,23 @@
1762
3987
        'breezy.tests.blackbox',
4022
        'breezy.tests.blackbox',
1763
3988
        'breezy.tests.commands',
4023
        'breezy.tests.commands',
1764
3989
        'breezy.tests.per_branch',
4024
        'breezy.tests.per_branch',
1765
3990
        'breezy.tests.per_bzrdir',
1766
3991
        'breezy.tests.per_controldir',
4025
        'breezy.tests.per_controldir',
1767
3992
        'breezy.tests.per_controldir_colo',
4026
        'breezy.tests.per_controldir_colo',
1768
3993
        'breezy.tests.per_foreign_vcs',
4027
        'breezy.tests.per_foreign_vcs',
1769
3994
        'breezy.tests.per_interrepository',
4028
        'breezy.tests.per_interrepository',
1770
3995
        'breezy.tests.per_intertree',
4029
        'breezy.tests.per_intertree',
1771
3996
        'breezy.tests.per_inventory',
1772
3997
        'breezy.tests.per_interbranch',
4030
        'breezy.tests.per_interbranch',
1773
3998
        'breezy.tests.per_lock',
4031
        'breezy.tests.per_lock',
1774
3999
        'breezy.tests.per_merger',
4032
        'breezy.tests.per_merger',
1775
4000
        'breezy.tests.per_transport',
4033
        'breezy.tests.per_transport',
1776
4001
        'breezy.tests.per_tree',
4034
        'breezy.tests.per_tree',
1777
4002
        'breezy.tests.per_pack_repository',
1778
4003
        'breezy.tests.per_repository',
4035
        'breezy.tests.per_repository',
1779
4004
        'breezy.tests.per_repository_chk',
1780
4005
        'breezy.tests.per_repository_reference',
4036
        'breezy.tests.per_repository_reference',
1781
4006
        'breezy.tests.per_repository_vf',
1782
4007
        'breezy.tests.per_uifactory',
4037
        'breezy.tests.per_uifactory',
1783
4008
        'breezy.tests.per_versionedfile',
1784
4009
        'breezy.tests.per_workingtree',
4038
        'breezy.tests.per_workingtree',
1785
4010
        'breezy.tests.test__annotator',
4039
        'breezy.tests.test__annotator',
1786
4011
        'breezy.tests.test__bencode',
4040
        'breezy.tests.test__bencode',
1787
4012
        'breezy.tests.test__btree_serializer',
1788
4013
        'breezy.tests.test__chk_map',
1789
4014
        'breezy.tests.test__dirstate_helpers',
1790
4015
        'breezy.tests.test__groupcompress',
1791
4016
        'breezy.tests.test__known_graph',
4041
        'breezy.tests.test__known_graph',
1792
4017
        'breezy.tests.test__rio',
1793
4018
        'breezy.tests.test__simple_set',
4042
        'breezy.tests.test__simple_set',
1794
4019
        'breezy.tests.test__static_tuple',
4043
        'breezy.tests.test__static_tuple',
1795
4020
        'breezy.tests.test__walkdirs_win32',
4044
        'breezy.tests.test__walkdirs_win32',
1796
@@ -4026,14 +4050,11 @@
1797
4026
        'breezy.tests.test_bisect_multi',
4050
        'breezy.tests.test_bisect_multi',
1798
4027
        'breezy.tests.test_branch',
4051
        'breezy.tests.test_branch',
1799
4028
        'breezy.tests.test_branchbuilder',
4052
        'breezy.tests.test_branchbuilder',
1800
4029
        'breezy.tests.test_btree_index',
1801
4030
        'breezy.tests.test_bugtracker',
4053
        'breezy.tests.test_bugtracker',
1802
4031
        'breezy.tests.test_bundle',
4054
        'breezy.tests.test_bundle',
1803
4032
        'breezy.tests.test_bzrdir',
4055
        'breezy.tests.test_bzrdir',
1804
4033
        'breezy.tests.test__chunks_to_lines',
4056
        'breezy.tests.test__chunks_to_lines',
1805
4034
        'breezy.tests.test_cache_utf8',
4057
        'breezy.tests.test_cache_utf8',
1806
4035
        'breezy.tests.test_chk_map',
1807
4036
        'breezy.tests.test_chk_serializer',
1808
4037
        'breezy.tests.test_chunk_writer',
4058
        'breezy.tests.test_chunk_writer',
1809
4038
        'breezy.tests.test_clean_tree',
4059
        'breezy.tests.test_clean_tree',
1810
4039
        'breezy.tests.test_cmdline',
4060
        'breezy.tests.test_cmdline',
1811
@@ -4051,7 +4072,6 @@
1812
4051
        'breezy.tests.test_debug',
4072
        'breezy.tests.test_debug',
1813
4052
        'breezy.tests.test_diff',
4073
        'breezy.tests.test_diff',
1814
4053
        'breezy.tests.test_directory_service',
4074
        'breezy.tests.test_directory_service',
1815
4054
        'breezy.tests.test_dirstate',
1816
4055
        'breezy.tests.test_email_message',
4075
        'breezy.tests.test_email_message',
1817
4056
        'breezy.tests.test_eol_filters',
4076
        'breezy.tests.test_eol_filters',
1818
4057
        'breezy.tests.test_errors',
4077
        'breezy.tests.test_errors',
1819
@@ -4068,12 +4088,10 @@
1820
4068
        'breezy.tests.test_filter_tree',
4088
        'breezy.tests.test_filter_tree',
1821
4069
        'breezy.tests.test_foreign',
4089
        'breezy.tests.test_foreign',
1822
4070
        'breezy.tests.test_generate_docs',
4090
        'breezy.tests.test_generate_docs',
1823
4071
        'breezy.tests.test_generate_ids',
1824
4072
        'breezy.tests.test_globbing',
4091
        'breezy.tests.test_globbing',
1825
4073
        'breezy.tests.test_gpg',
4092
        'breezy.tests.test_gpg',
1826
4074
        'breezy.tests.test_graph',
4093
        'breezy.tests.test_graph',
1827
4075
        'breezy.tests.test_grep',
4094
        'breezy.tests.test_grep',
1828
4076
        'breezy.tests.test_groupcompress',
1829
4077
        'breezy.tests.test_hashcache',
4095
        'breezy.tests.test_hashcache',
1830
4078
        'breezy.tests.test_help',
4096
        'breezy.tests.test_help',
1831
4079
        'breezy.tests.test_hooks',
4097
        'breezy.tests.test_hooks',
1832
@@ -4084,12 +4102,8 @@
1833
4084
        'breezy.tests.test_i18n',
4102
        'breezy.tests.test_i18n',
1834
4085
        'breezy.tests.test_identitymap',
4103
        'breezy.tests.test_identitymap',
1835
4086
        'breezy.tests.test_ignores',
4104
        'breezy.tests.test_ignores',
1836
4087
        'breezy.tests.test_index',
1837
4088
        'breezy.tests.test_import_tariff',
4105
        'breezy.tests.test_import_tariff',
1838
4089
        'breezy.tests.test_info',
4106
        'breezy.tests.test_info',
1839
4090
        'breezy.tests.test_inv',
1840
4091
        'breezy.tests.test_inventory_delta',
1841
4092
        'breezy.tests.test_knit',
1842
4093
        'breezy.tests.test_lazy_import',
4107
        'breezy.tests.test_lazy_import',
1843
4094
        'breezy.tests.test_lazy_regex',
4108
        'breezy.tests.test_lazy_regex',
1844
4095
        'breezy.tests.test_library_state',
4109
        'breezy.tests.test_library_state',
1845
@@ -4118,7 +4132,6 @@
1846
4118
        'breezy.tests.test_options',
4132
        'breezy.tests.test_options',
1847
4119
        'breezy.tests.test_osutils',
4133
        'breezy.tests.test_osutils',
1848
4120
        'breezy.tests.test_osutils_encodings',
4134
        'breezy.tests.test_osutils_encodings',
1849
4121
        'breezy.tests.test_pack',
1850
4122
        'breezy.tests.test_patch',
4135
        'breezy.tests.test_patch',
1851
4123
        'breezy.tests.test_patches',
4136
        'breezy.tests.test_patches',
1852
4124
        'breezy.tests.test_permissions',
4137
        'breezy.tests.test_permissions',
1853
@@ -4130,30 +4143,24 @@
1854
4130
        'breezy.tests.test_reconcile',
4143
        'breezy.tests.test_reconcile',
1855
4131
        'breezy.tests.test_reconfigure',
4144
        'breezy.tests.test_reconfigure',
1856
4132
        'breezy.tests.test_registry',
4145
        'breezy.tests.test_registry',
1857
4133
        'breezy.tests.test_remote',
1858
4134
        'breezy.tests.test_rename_map',
4146
        'breezy.tests.test_rename_map',
1859
4135
        'breezy.tests.test_repository',
1860
4136
        'breezy.tests.test_revert',
4147
        'breezy.tests.test_revert',
1861
4137
        'breezy.tests.test_revision',
4148
        'breezy.tests.test_revision',
1862
4138
        'breezy.tests.test_revisionspec',
4149
        'breezy.tests.test_revisionspec',
1863
4139
        'breezy.tests.test_revisiontree',
4150
        'breezy.tests.test_revisiontree',
1864
4140
        'breezy.tests.test_rio',
4151
        'breezy.tests.test_rio',
1865
4152
        'breezy.tests.test__rio',
1866
4141
        'breezy.tests.test_rules',
4153
        'breezy.tests.test_rules',
1867
4142
        'breezy.tests.test_url_policy_open',
4154
        'breezy.tests.test_url_policy_open',
1868
4143
        'breezy.tests.test_sampler',
4155
        'breezy.tests.test_sampler',
1869
4144
        'breezy.tests.test_scenarios',
4156
        'breezy.tests.test_scenarios',
1870
4145
        'breezy.tests.test_script',
4157
        'breezy.tests.test_script',
1871
4146
        'breezy.tests.test_selftest',
4158
        'breezy.tests.test_selftest',
1872
4147
        'breezy.tests.test_serializer',
1873
4148
        'breezy.tests.test_setup',
4159
        'breezy.tests.test_setup',
1874
4149
        'breezy.tests.test_sftp_transport',
4160
        'breezy.tests.test_sftp_transport',
1875
4150
        'breezy.tests.test_shelf',
4161
        'breezy.tests.test_shelf',
1876
4151
        'breezy.tests.test_shelf_ui',
4162
        'breezy.tests.test_shelf_ui',
1877
4152
        'breezy.tests.test_smart',
1878
4153
        'breezy.tests.test_smart_add',
4163
        'breezy.tests.test_smart_add',
1879
4154
        'breezy.tests.test_smart_request',
1880
4155
        'breezy.tests.test_smart_signals',
1881
4156
        'breezy.tests.test_smart_transport',
1882
4157
        'breezy.tests.test_smtp_connection',
4164
        'breezy.tests.test_smtp_connection',
1883
4158
        'breezy.tests.test_source',
4165
        'breezy.tests.test_source',
1884
4159
        'breezy.tests.test_ssh_transport',
4166
        'breezy.tests.test_ssh_transport',
1885
@@ -4164,7 +4171,6 @@
1886
4164
        'breezy.tests.test_symbol_versioning',
4171
        'breezy.tests.test_symbol_versioning',
1887
4165
        'breezy.tests.test_tag',
4172
        'breezy.tests.test_tag',
1888
4166
        'breezy.tests.test_test_server',
4173
        'breezy.tests.test_test_server',
1889
4167
        'breezy.tests.test_testament',
1890
4168
        'breezy.tests.test_textfile',
4174
        'breezy.tests.test_textfile',
1891
4169
        'breezy.tests.test_textmerge',
4175
        'breezy.tests.test_textmerge',
1892
4170
        'breezy.tests.test_cethread',
4176
        'breezy.tests.test_cethread',
1893
@@ -4188,16 +4194,12 @@
1894
4188
        'breezy.tests.test_utextwrap',
4194
        'breezy.tests.test_utextwrap',
1895
4189
        'breezy.tests.test_version',
4195
        'breezy.tests.test_version',
1896
4190
        'breezy.tests.test_version_info',
4196
        'breezy.tests.test_version_info',
1897
4191
        'breezy.tests.test_versionedfile',
1898
4192
        'breezy.tests.test_vf_search',
4197
        'breezy.tests.test_vf_search',
1899
4193
        'breezy.tests.test_views',
4198
        'breezy.tests.test_views',
1900
4194
        'breezy.tests.test_weave',
1901
4195
        'breezy.tests.test_whitebox',
4199
        'breezy.tests.test_whitebox',
1902
4196
        'breezy.tests.test_win32utils',
4200
        'breezy.tests.test_win32utils',
1903
4197
        'breezy.tests.test_workingtree',
4201
        'breezy.tests.test_workingtree',
1904
4198
        'breezy.tests.test_workingtree_4',
1905
4199
        'breezy.tests.test_wsgi',
4202
        'breezy.tests.test_wsgi',
1906
4200
        'breezy.tests.test_xml',
1907
4201
        ]
4203
        ]
1908
4202
4204
1909
4203
4205
1910
4204
4206
1911
=== modified file 'breezy/tests/blackbox/test_annotate.py'
1912
--- breezy/tests/blackbox/test_annotate.py	2019-06-16 17:36:59 +0000
1913
+++ breezy/tests/blackbox/test_annotate.py	2020-06-11 01:55:28 +0000
1914
@@ -29,7 +29,7 @@
1915
29
    tests,
29
    tests,
1916
30
    )
30
    )
1917
31
31
1919
32
from breezy.tests.matchers import ContainsNoVfsCalls
32
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
1920
33
from breezy.urlutils import joinpath
33
from breezy.urlutils import joinpath
1921
34
34
1922
35
from ..test_bedding import override_whoami
35
from ..test_bedding import override_whoami
1923
36
36
1924
=== modified file 'breezy/tests/blackbox/test_branch.py'
1925
--- breezy/tests/blackbox/test_branch.py	2020-04-02 01:37:43 +0000
1926
+++ breezy/tests/blackbox/test_branch.py	2020-06-11 01:55:28 +0000
1927
@@ -38,7 +38,7 @@
1928
38
    HardlinkFeature,
38
    HardlinkFeature,
1929
39
    )
39
    )
1930
40
from breezy.tests.blackbox import test_switch
40
from breezy.tests.blackbox import test_switch
1932
41
from breezy.tests.matchers import ContainsNoVfsCalls
41
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
1933
42
from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
42
from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
1934
43
from breezy.tests.script import run_script
43
from breezy.tests.script import run_script
1935
44
from breezy.urlutils import local_path_to_url, strip_trailing_slash
44
from breezy.urlutils import local_path_to_url, strip_trailing_slash
1936
45
45
1937
=== modified file 'breezy/tests/blackbox/test_break_lock.py'
1938
--- breezy/tests/blackbox/test_break_lock.py	2018-11-11 04:08:32 +0000
1939
+++ breezy/tests/blackbox/test_break_lock.py	2020-06-11 01:55:28 +0000
1940
@@ -24,7 +24,7 @@
1941
24
    osutils,
24
    osutils,
1942
25
    tests,
25
    tests,
1943
26
    )
26
    )
1945
27
from breezy.tests.matchers import ContainsNoVfsCalls
27
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
1946
28
from breezy.tests.script import (
28
from breezy.tests.script import (
1947
29
    run_script,
29
    run_script,
1948
30
    )
30
    )
1949
31
31
1950
=== modified file 'breezy/tests/blackbox/test_cat.py'
1951
--- breezy/tests/blackbox/test_cat.py	2018-11-11 04:08:32 +0000
1952
+++ breezy/tests/blackbox/test_cat.py	2020-06-11 01:55:28 +0000
1953
@@ -19,7 +19,7 @@
1954
19
"""
19
"""
1955
20
20
1956
21
from ... import tests
21
from ... import tests
1958
22
from ..matchers import ContainsNoVfsCalls
22
from ...bzr.tests.matchers import ContainsNoVfsCalls
1959
23
from ...transport import memory
23
from ...transport import memory
1960
24
24
1961
25
25
1962
26
26
1963
=== modified file 'breezy/tests/blackbox/test_checkout.py'
1964
--- breezy/tests/blackbox/test_checkout.py	2020-01-19 13:07:15 +0000
1965
+++ breezy/tests/blackbox/test_checkout.py	2020-06-11 01:55:28 +0000
1966
@@ -30,7 +30,7 @@
1967
30
from breezy.tests import (
30
from breezy.tests import (
1968
31
    TestCaseWithTransport,
31
    TestCaseWithTransport,
1969
32
    )
32
    )
1971
33
from breezy.tests.matchers import ContainsNoVfsCalls
33
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
1972
34
from breezy.tests.features import (
34
from breezy.tests.features import (
1973
35
    HardlinkFeature,
35
    HardlinkFeature,
1974
36
    )
36
    )
1975
37
37
1976
=== modified file 'breezy/tests/blackbox/test_commit.py'
1977
--- breezy/tests/blackbox/test_commit.py	2020-02-07 02:14:30 +0000
1978
+++ breezy/tests/blackbox/test_commit.py	2020-06-11 01:55:28 +0000
1979
@@ -36,7 +36,7 @@
1980
36
    features,
36
    features,
1981
37
    )
37
    )
1982
38
from .. import TestCaseWithTransport
38
from .. import TestCaseWithTransport
1984
39
from ..matchers import ContainsNoVfsCalls
39
from ...bzr.tests.matchers import ContainsNoVfsCalls
1985
40
from ..test_bedding import override_whoami
40
from ..test_bedding import override_whoami
1986
41
41
1987
42
42
1988
43
43
1989
=== modified file 'breezy/tests/blackbox/test_config.py'
1990
--- breezy/tests/blackbox/test_config.py	2018-11-11 04:08:32 +0000
1991
+++ breezy/tests/blackbox/test_config.py	2020-06-11 01:55:28 +0000
1992
@@ -25,7 +25,7 @@
1993
25
    script,
25
    script,
1994
26
    test_config as _t_config,
26
    test_config as _t_config,
1995
27
    )
27
    )
1997
28
from ..matchers import ContainsNoVfsCalls
28
from ...bzr.tests.matchers import ContainsNoVfsCalls
1998
29
29
1999
30
30
2000
31
class TestWithoutConfig(tests.TestCaseWithTransport):
31
class TestWithoutConfig(tests.TestCaseWithTransport):
2001
32
32
2002
=== modified file 'breezy/tests/blackbox/test_export.py'
2003
--- breezy/tests/blackbox/test_export.py	2020-02-07 02:14:30 +0000
2004
+++ breezy/tests/blackbox/test_export.py	2020-06-11 01:55:28 +0000
2005
@@ -35,7 +35,7 @@
2006
35
    features,
35
    features,
2007
36
    TestCaseWithTransport,
36
    TestCaseWithTransport,
2008
37
    )
37
    )
2010
38
from ..matchers import ContainsNoVfsCalls
38
from ...bzr.tests.matchers import ContainsNoVfsCalls
2011
39
39
2012
40
40
2013
41
class TestExport(TestCaseWithTransport):
41
class TestExport(TestCaseWithTransport):
2014
42
42
2015
=== modified file 'breezy/tests/blackbox/test_info.py'
2016
--- breezy/tests/blackbox/test_info.py	2019-09-21 19:27:04 +0000
2017
+++ breezy/tests/blackbox/test_info.py	2020-06-11 01:55:28 +0000
2018
@@ -33,7 +33,7 @@
2019
33
from breezy.bzr import (
33
from breezy.bzr import (
2020
34
    bzrdir,
34
    bzrdir,
2021
35
    )
35
    )
2023
36
from breezy.tests.matchers import ContainsNoVfsCalls
36
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2024
37
from breezy.transport import memory
37
from breezy.transport import memory
2025
38
38
2026
39
39
2027
40
40
2028
=== modified file 'breezy/tests/blackbox/test_log.py'
2029
--- breezy/tests/blackbox/test_log.py	2020-02-18 01:57:45 +0000
2030
+++ breezy/tests/blackbox/test_log.py	2020-06-11 01:55:28 +0000
2031
@@ -31,7 +31,7 @@
2032
31
    test_log,
31
    test_log,
2033
32
    features,
32
    features,
2034
33
    )
33
    )
2036
34
from breezy.tests.matchers import ContainsNoVfsCalls
34
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2037
35
35
2038
36
36
2039
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
2040
38
38
2041
=== modified file 'breezy/tests/blackbox/test_ls.py'
2042
--- breezy/tests/blackbox/test_ls.py	2018-11-11 04:08:32 +0000
2043
+++ breezy/tests/blackbox/test_ls.py	2020-06-11 01:55:28 +0000
2044
@@ -20,7 +20,7 @@
2045
20
    ignores,
20
    ignores,
2046
21
    tests,
21
    tests,
2047
22
    )
22
    )
2049
23
from breezy.tests.matchers import ContainsNoVfsCalls
23
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2050
24
24
2051
25
25
2052
26
class TestLS(tests.TestCaseWithTransport):
26
class TestLS(tests.TestCaseWithTransport):
2053
27
27
2054
=== modified file 'breezy/tests/blackbox/test_pack.py'
2055
--- breezy/tests/blackbox/test_pack.py	2018-11-11 04:08:32 +0000
2056
+++ breezy/tests/blackbox/test_pack.py	2020-06-11 01:55:28 +0000
2057
@@ -19,7 +19,7 @@
2058
19
import os
19
import os
2059
20
20
2060
21
from breezy import tests
21
from breezy import tests
2062
22
from breezy.tests.matchers import ContainsNoVfsCalls
22
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2063
23
23
2064
24
24
2065
25
class TestPack(tests.TestCaseWithTransport):
25
class TestPack(tests.TestCaseWithTransport):
2066
26
26
2067
=== modified file 'breezy/tests/blackbox/test_push.py'
2068
--- breezy/tests/blackbox/test_push.py	2019-09-01 15:33:59 +0000
2069
+++ breezy/tests/blackbox/test_push.py	2020-06-11 01:55:28 +0000
2070
@@ -41,7 +41,7 @@
2071
41
    script,
41
    script,
2072
42
    test_foreign,
42
    test_foreign,
2073
43
    )
43
    )
2075
44
from breezy.tests.matchers import ContainsNoVfsCalls
44
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2076
45
from breezy.transport import memory
45
from breezy.transport import memory
2077
46
46
2078
47
47
2079
48
48
2080
=== modified file 'breezy/tests/blackbox/test_reconcile.py'
2081
--- breezy/tests/blackbox/test_reconcile.py	2019-05-29 03:22:34 +0000
2082
+++ breezy/tests/blackbox/test_reconcile.py	2020-06-11 01:55:28 +0000
2083
@@ -25,7 +25,7 @@
2084
25
from breezy.bzr import (
25
from breezy.bzr import (
2085
26
    inventory,
26
    inventory,
2086
27
    )
27
    )
2088
28
from breezy.tests.matchers import ContainsNoVfsCalls
28
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2089
29
29
2090
30
30
2091
31
class TrivialTest(tests.TestCaseWithTransport):
31
class TrivialTest(tests.TestCaseWithTransport):
2092
32
32
2093
=== modified file 'breezy/tests/blackbox/test_revno.py'
2094
--- breezy/tests/blackbox/test_revno.py	2018-11-16 11:37:47 +0000
2095
+++ breezy/tests/blackbox/test_revno.py	2020-06-11 01:55:28 +0000
2096
@@ -22,7 +22,7 @@
2097
22
22
2098
23
from breezy import tests
23
from breezy import tests
2099
24
from breezy.errors import NoSuchRevision
24
from breezy.errors import NoSuchRevision
2101
25
from breezy.tests.matchers import ContainsNoVfsCalls
25
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2102
26
26
2103
27
27
2104
28
class TestRevno(tests.TestCaseWithTransport):
28
class TestRevno(tests.TestCaseWithTransport):
2105
29
29
2106
=== modified file 'breezy/tests/blackbox/test_rmbranch.py'
2107
--- breezy/tests/blackbox/test_rmbranch.py	2018-11-11 04:08:32 +0000
2108
+++ breezy/tests/blackbox/test_rmbranch.py	2020-06-11 01:55:28 +0000
2109
@@ -23,7 +23,7 @@
2110
23
from breezy.tests import (
23
from breezy.tests import (
2111
24
    TestCaseWithTransport,
24
    TestCaseWithTransport,
2112
25
    )
25
    )
2114
26
from breezy.tests.matchers import ContainsNoVfsCalls
26
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2115
27
27
2116
28
28
2117
29
class TestRemoveBranch(TestCaseWithTransport):
29
class TestRemoveBranch(TestCaseWithTransport):
2118
30
30
2119
=== modified file 'breezy/tests/blackbox/test_send.py'
2120
--- breezy/tests/blackbox/test_send.py	2020-02-07 02:14:30 +0000
2121
+++ breezy/tests/blackbox/test_send.py	2020-06-11 01:55:28 +0000
2122
@@ -30,7 +30,7 @@
2123
30
from .. import (
30
from .. import (
2124
31
    scenarios,
31
    scenarios,
2125
32
    )
32
    )
2127
33
from ..matchers import ContainsNoVfsCalls
33
from ...bzr.tests.matchers import ContainsNoVfsCalls
2128
34
34
2129
35
35
2130
36
load_tests = scenarios.load_tests_apply_scenarios
36
load_tests = scenarios.load_tests_apply_scenarios
2131
37
37
2132
=== modified file 'breezy/tests/blackbox/test_shared_repository.py'
2133
--- breezy/tests/blackbox/test_shared_repository.py	2019-09-01 15:33:59 +0000
2134
+++ breezy/tests/blackbox/test_shared_repository.py	2020-06-11 01:55:28 +0000
2135
@@ -22,7 +22,7 @@
2136
22
from breezy.controldir import ControlDir
22
from breezy.controldir import ControlDir
2137
23
import breezy.errors as errors
23
import breezy.errors as errors
2138
24
from breezy.tests import TestCaseInTempDir
24
from breezy.tests import TestCaseInTempDir
2140
25
from breezy.tests.matchers import ContainsNoVfsCalls
25
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2141
26
26
2142
27
27
2143
28
class TestSharedRepo(TestCaseInTempDir):
28
class TestSharedRepo(TestCaseInTempDir):
2144
29
29
2145
=== modified file 'breezy/tests/blackbox/test_sign_my_commits.py'
2146
--- breezy/tests/blackbox/test_sign_my_commits.py	2018-11-11 04:08:32 +0000
2147
+++ breezy/tests/blackbox/test_sign_my_commits.py	2020-06-11 01:55:28 +0000
2148
@@ -21,7 +21,7 @@
2149
21
    gpg,
21
    gpg,
2150
22
    tests,
22
    tests,
2151
23
    )
23
    )
2153
24
from breezy.tests.matchers import ContainsNoVfsCalls
24
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2154
25
25
2155
26
26
2156
27
class SignMyCommits(tests.TestCaseWithTransport):
27
class SignMyCommits(tests.TestCaseWithTransport):
2157
28
28
2158
=== modified file 'breezy/tests/blackbox/test_switch.py'
2159
--- breezy/tests/blackbox/test_switch.py	2020-03-22 18:52:18 +0000
2160
+++ breezy/tests/blackbox/test_switch.py	2020-06-11 01:55:28 +0000
2161
@@ -34,7 +34,7 @@
2162
34
from breezy.tests.features import UnicodeFilenameFeature
34
from breezy.tests.features import UnicodeFilenameFeature
2163
35
from breezy.directory_service import directories
35
from breezy.directory_service import directories
2164
36
36
2166
37
from breezy.tests.matchers import ContainsNoVfsCalls
37
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2167
38
38
2168
39
39
2169
40
class TestSwitch(TestCaseWithTransport):
40
class TestSwitch(TestCaseWithTransport):
2170
41
41
2171
=== modified file 'breezy/tests/blackbox/test_tags.py'
2172
--- breezy/tests/blackbox/test_tags.py	2020-02-07 02:14:30 +0000
2173
+++ breezy/tests/blackbox/test_tags.py	2020-06-11 01:55:28 +0000
2174
@@ -35,7 +35,7 @@
2175
35
    script,
35
    script,
2176
36
    TestCaseWithTransport,
36
    TestCaseWithTransport,
2177
37
    )
37
    )
2179
38
from breezy.tests.matchers import ContainsNoVfsCalls
38
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2180
39
from breezy.workingtree import WorkingTree
39
from breezy.workingtree import WorkingTree
2181
40
40
2182
41
41
2183
42
42
2184
=== modified file 'breezy/tests/blackbox/test_testament.py'
2185
--- breezy/tests/blackbox/test_testament.py	2020-02-07 02:14:30 +0000
2186
+++ breezy/tests/blackbox/test_testament.py	2020-06-11 01:55:28 +0000
2187
@@ -18,7 +18,7 @@
2188
18
18
2189
19
import re
19
import re
2190
20
20
2192
21
from breezy.tests.test_testament import (
21
from breezy.bzr.tests.test_testament import (
2193
22
    osutils,
22
    osutils,
2194
23
    REV_1_SHORT,
23
    REV_1_SHORT,
2195
24
    REV_1_SHORT_STRICT,
24
    REV_1_SHORT_STRICT,
2196
25
25
2197
=== modified file 'breezy/tests/blackbox/test_uncommit.py'
2198
--- breezy/tests/blackbox/test_uncommit.py	2019-02-16 17:54:34 +0000
2199
+++ breezy/tests/blackbox/test_uncommit.py	2020-06-11 01:55:28 +0000
2200
@@ -22,7 +22,7 @@
2201
22
from breezy.bzr.bzrdir import BzrDirMetaFormat1
22
from breezy.bzr.bzrdir import BzrDirMetaFormat1
2202
23
from breezy.errors import BoundBranchOutOfDate
23
from breezy.errors import BoundBranchOutOfDate
2203
24
from breezy.tests import TestCaseWithTransport
24
from breezy.tests import TestCaseWithTransport
2205
25
from breezy.tests.matchers import ContainsNoVfsCalls
25
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2206
26
from breezy.tests.script import (
26
from breezy.tests.script import (
2207
27
    run_script,
27
    run_script,
2208
28
    ScriptRunner,
28
    ScriptRunner,
2209
29
29
2210
=== modified file 'breezy/tests/blackbox/test_verify_signatures.py'
2211
--- breezy/tests/blackbox/test_verify_signatures.py	2018-11-11 04:08:32 +0000
2212
+++ breezy/tests/blackbox/test_verify_signatures.py	2020-06-11 01:55:28 +0000
2213
@@ -21,7 +21,7 @@
2214
21
    gpg,
21
    gpg,
2215
22
    tests,
22
    tests,
2216
23
    )
23
    )
2218
24
from breezy.tests.matchers import ContainsNoVfsCalls
24
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
2219
25
25
2220
26
26
2221
27
class TestVerifySignatures(tests.TestCaseWithTransport):
27
class TestVerifySignatures(tests.TestCaseWithTransport):
2222
28
28
2223
=== modified file 'breezy/tests/matchers.py'
2224
--- breezy/tests/matchers.py	2020-02-13 23:57:28 +0000
2225
+++ breezy/tests/matchers.py	2020-06-11 01:55:28 +0000
2226
@@ -30,7 +30,6 @@
2227
30
    'HasLayout',
30
    'HasLayout',
2228
31
    'HasPathRelations',
31
    'HasPathRelations',
2229
32
    'MatchesAncestry',
32
    'MatchesAncestry',
2230
33
    'ContainsNoVfsCalls',
2231
34
    'ReturnsUnlockable',
33
    'ReturnsUnlockable',
2232
35
    'RevisionHistoryMatches',
34
    'RevisionHistoryMatches',
2233
36
    ]
35
    ]
2234
@@ -39,16 +38,8 @@
2235
39
    osutils,
38
    osutils,
2236
40
    revision as _mod_revision,
39
    revision as _mod_revision,
2237
41
    )
40
    )
2248
42
from .. import lazy_import
41
2249
43
lazy_import.lazy_import(globals(),
42
from ..tree import InterTree
2240
44
                        """
2241
45
from breezy.bzr.smart.request import request_handlers as smart_request_handlers
2242
46
from breezy.bzr.smart import vfs
2243
47
""")
2244
48
from ..tree import (
2245
49
    find_previous_path,
2246
50
    InterTree,
2247
51
    )
2250
52
43
2251
53
from testtools.matchers import Equals, Mismatch, Matcher
44
from testtools.matchers import Equals, Mismatch, Matcher
2252
54
45
2253
@@ -278,37 +269,3 @@
2254
278
                branch.last_revision(), [_mod_revision.NULL_REVISION]))
269
                branch.last_revision(), [_mod_revision.NULL_REVISION]))
2255
279
            history.reverse()
270
            history.reverse()
2256
280
        return Equals(self.expected).match(history)
271
        return Equals(self.expected).match(history)
2257
281
2258
282
2259
283
class _NoVfsCallsMismatch(Mismatch):
2260
284
    """Mismatch describing a list of HPSS calls which includes VFS requests."""
2261
285
2262
286
    def __init__(self, vfs_calls):
2263
287
        self.vfs_calls = vfs_calls
2264
288
2265
289
    def describe(self):
2266
290
        return "no VFS calls expected, got: %s" % ",".join([
2267
291
            "%s(%s)" % (c.method,
2268
292
                        ", ".join([repr(a) for a in c.args])) for c in self.vfs_calls])
2269
293
2270
294
2271
295
class ContainsNoVfsCalls(Matcher):
2272
296
    """Ensure that none of the specified calls are HPSS calls."""
2273
297
2274
298
    def __str__(self):
2275
299
        return 'ContainsNoVfsCalls()'
2276
300
2277
301
    @classmethod
2278
302
    def match(cls, hpss_calls):
2279
303
        vfs_calls = []
2280
304
        for call in hpss_calls:
2281
305
            try:
2282
306
                request_method = smart_request_handlers.get(call.call.method)
2283
307
            except KeyError:
2284
308
                # A method we don't know about doesn't count as a VFS method.
2285
309
                continue
2286
310
            if issubclass(request_method, vfs.VfsRequest):
2287
311
                vfs_calls.append(call.call)
2288
312
        if len(vfs_calls) == 0:
2289
313
            return None
2290
314
        return _NoVfsCallsMismatch(vfs_calls)
2291
315
272
2292
=== modified file 'breezy/tests/per_branch/test_branch.py'
2293
--- breezy/tests/per_branch/test_branch.py	2020-02-07 02:14:30 +0000
2294
+++ breezy/tests/per_branch/test_branch.py	2020-06-11 01:55:28 +0000
2295
@@ -37,7 +37,6 @@
2296
37
    tree as _mod_tree,
37
    tree as _mod_tree,
2297
38
    )
38
    )
2298
39
from breezy.bzr import (
39
from breezy.bzr import (
2299
40
    branch as _mod_bzrbranch,
2300
41
    remote,
40
    remote,
2301
42
    )
41
    )
2302
43
from breezy.tests import (
42
from breezy.tests import (
2303
@@ -257,7 +256,7 @@
2304
257
        """
256
        """
2305
258
        t = self.get_transport()
257
        t = self.get_transport()
2306
259
        branch = self.make_branch('bzr.dev')
258
        branch = self.make_branch('bzr.dev')
2308
260
        if not isinstance(branch, _mod_bzrbranch.BzrBranch):
259
        if not branch.repository._format.supports_storing_branch_nick:
2309
261
            raise tests.TestNotApplicable("not a bzr branch format")
260
            raise tests.TestNotApplicable("not a bzr branch format")
2310
262
        # The nick will be 'bzr.dev', because there is no explicit nick set.
261
        # The nick will be 'bzr.dev', because there is no explicit nick set.
2311
263
        self.assertEqual(branch.nick, 'bzr.dev')
262
        self.assertEqual(branch.nick, 'bzr.dev')
2312
264
263
2313
=== modified file 'breezy/tests/per_interrepository/test_fetch.py'
2314
--- breezy/tests/per_interrepository/test_fetch.py	2019-05-29 03:22:34 +0000
2315
+++ breezy/tests/per_interrepository/test_fetch.py	2020-06-11 01:55:28 +0000
2316
@@ -520,7 +520,7 @@
2317
520
            self.assertRaises(errors.RevisionNotPresent, target.fetch, source)
520
            self.assertRaises(errors.RevisionNotPresent, target.fetch, source)
2318
521
        except errors.NoRoundtrippingSupport:
521
        except errors.NoRoundtrippingSupport:
2319
522
            raise TestNotApplicable('roundtripping not supported')
522
            raise TestNotApplicable('roundtripping not supported')
2321
523
        self.assertFalse(target.has_revision('b'))
523
        self.assertFalse(target.has_revision(b'b'))
2322
524
524
2323
525
    def test_fetch_funky_file_id(self):
525
    def test_fetch_funky_file_id(self):
2324
526
        from_tree = self.make_branch_and_tree('tree')
526
        from_tree = self.make_branch_and_tree('tree')
2325
527
527
2326
=== modified file 'breezy/tests/test__static_tuple.py'
2327
--- breezy/tests/test__static_tuple.py	2020-02-07 02:14:30 +0000
2328
+++ breezy/tests/test__static_tuple.py	2020-06-11 01:55:28 +0000
2329
@@ -443,7 +443,15 @@
2330
443
            refs = strs + [self.module.StaticTuple]
443
            refs = strs + [self.module.StaticTuple]
2331
444
        else:
444
        else:
2332
445
            refs = strs
445
            refs = strs
2334
446
        self.assertEqual(sorted(refs), sorted(scanner.get_referents(k)))
446
        def key(k):
2335
447
            if isinstance(k, type):
2336
448
                return (0, k)
2337
449
            if isinstance(k, str):
2338
450
                return (1, k)
2339
451
            raise TypeError(k)
2340
452
        self.assertEqual(
2341
453
            sorted(refs, key=key),
2342
454
            sorted(scanner.get_referents(k), key=key))
2343
447
455
2344
448
    def test_nested_referents(self):
456
    def test_nested_referents(self):
2345
449
        self.requireFeature(features.meliae)
457
        self.requireFeature(features.meliae)
2346
@@ -455,8 +463,15 @@
2347
455
        refs = [k1, k2]
463
        refs = [k1, k2]
2348
456
        if self.module is _static_tuple_py:
464
        if self.module is _static_tuple_py:
2349
457
            refs.append(self.module.StaticTuple)
465
            refs.append(self.module.StaticTuple)
2352
458
        self.assertEqual(sorted(refs),
466
        def key(k):
2353
459
                         sorted(scanner.get_referents(k3)))
467
            if isinstance(k, type):
2354
468
                return (0, k)
2355
469
            if isinstance(k, self.module.StaticTuple):
2356
470
                return (1, k)
2357
471
            raise TypeError(k)
2358
472
2359
473
        self.assertEqual(sorted(refs, key=key),
2360
474
                         sorted(scanner.get_referents(k3), key=key))
2361
460
475
2362
461
    def test_empty_is_singleton(self):
476
    def test_empty_is_singleton(self):
2363
462
        key = self.module.StaticTuple()
477
        key = self.module.StaticTuple()
2364
463
478
2365
=== modified file 'breezy/tests/test_commit.py'
2366
--- breezy/tests/test_commit.py	2019-09-27 02:48:17 +0000
2367
+++ breezy/tests/test_commit.py	2020-06-11 01:55:28 +0000
2368
@@ -529,11 +529,8 @@
2369
529
        bound = master.sprout('bound')
529
        bound = master.sprout('bound')
2370
530
        wt = bound.open_workingtree()
530
        wt = bound.open_workingtree()
2371
531
        wt.branch.set_bound_location(os.path.realpath('master'))
531
        wt.branch.set_bound_location(os.path.realpath('master'))
2374
532
        master_branch.lock_write()
532
        with master_branch.lock_write():
2373
533
        try:
2375
534
            self.assertRaises(LockContention, wt.commit, 'silly')
533
            self.assertRaises(LockContention, wt.commit, 'silly')
2376
535
        finally:
2377
536
            master_branch.unlock()
2378
537
534
2379
538
    def test_commit_bound_merge(self):
535
    def test_commit_bound_merge(self):
2380
539
        # see bug #43959; commit of a merge in a bound branch fails to push
536
        # see bug #43959; commit of a merge in a bound branch fails to push
2381
540
537
2382
=== modified file 'breezy/tests/test_http_response.py'
2383
--- breezy/tests/test_http_response.py	2020-02-07 02:14:30 +0000
2384
+++ breezy/tests/test_http_response.py	2020-06-11 01:55:28 +0000
2385
@@ -88,6 +88,10 @@
2386
88
        f = response.ResponseFile('many', BytesIO(b'0\n1\nboo!\n'))
88
        f = response.ResponseFile('many', BytesIO(b'0\n1\nboo!\n'))
2387
89
        self.assertEqual([b'0\n', b'1\n', b'boo!\n'], list(f))
89
        self.assertEqual([b'0\n', b'1\n', b'boo!\n'], list(f))
2388
90
90
2389
91
    def test_readlines(self):
2390
92
        f = response.ResponseFile('many', BytesIO(b'0\n1\nboo!\n'))
2391
93
        self.assertEqual([b'0\n', b'1\n', b'boo!\n'], f.readlines())
2392
94
2393
91
95
2394
92
class TestHTTPConnection(tests.TestCase):
96
class TestHTTPConnection(tests.TestCase):
2395
93
97
2396
94
98
2397
=== modified file 'breezy/tests/test_lockable_files.py'
2398
--- breezy/tests/test_lockable_files.py	2018-06-22 01:50:22 +0000
2399
+++ breezy/tests/test_lockable_files.py	2020-06-11 01:55:28 +0000
2400
@@ -26,7 +26,7 @@
2401
26
    TestCaseInTempDir,
26
    TestCaseInTempDir,
2402
27
    TestNotApplicable,
27
    TestNotApplicable,
2403
28
    )
28
    )
2405
29
from .test_smart import TestCaseWithSmartMedium
29
from ..bzr.tests.test_smart import TestCaseWithSmartMedium
2406
30
from .test_transactions import DummyWeave
30
from .test_transactions import DummyWeave
2407
31
from ..transactions import (PassThroughTransaction,
31
from ..transactions import (PassThroughTransaction,
2408
32
                            ReadOnlyTransaction,
32
                            ReadOnlyTransaction,
2409
33
33
2410
=== modified file 'breezy/tests/test_matchers.py'
2411
--- breezy/tests/test_matchers.py	2020-02-07 02:14:30 +0000
2412
+++ breezy/tests/test_matchers.py	2020-06-11 01:55:28 +0000
2413
@@ -18,8 +18,6 @@
2414
18
18
2415
19
from testtools.matchers import *
19
from testtools.matchers import *
2416
20
20
2417
21
from ..bzr.smart.client import CallHookParams
2418
22
2419
23
from . import (
21
from . import (
2420
24
    CapturedCall,
22
    CapturedCall,
2421
25
    TestCase,
23
    TestCase,
2422
@@ -177,36 +175,6 @@
2423
177
        self.assertIsNot(None, mismatch)
175
        self.assertIsNot(None, mismatch)
2424
178
176
2425
179
177
2426
180
class TestContainsNoVfsCalls(TestCase):
2427
181
2428
182
    def _make_call(self, method, args):
2429
183
        return CapturedCall(CallHookParams(method, args, None, None, None), 0)
2430
184
2431
185
    def test__str__(self):
2432
186
        self.assertEqual("ContainsNoVfsCalls()", str(ContainsNoVfsCalls()))
2433
187
2434
188
    def test_empty(self):
2435
189
        self.assertIs(None, ContainsNoVfsCalls().match([]))
2436
190
2437
191
    def test_no_vfs_calls(self):
2438
192
        calls = [self._make_call("Branch.get_config_file", [])]
2439
193
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
2440
194
2441
195
    def test_ignores_unknown(self):
2442
196
        calls = [self._make_call("unknown", [])]
2443
197
        self.assertIs(None, ContainsNoVfsCalls().match(calls))
2444
198
2445
199
    def test_match(self):
2446
200
        calls = [self._make_call(b"append", [b"file"]),
2447
201
                 self._make_call(b"Branch.get_config_file", [])]
2448
202
        mismatch = ContainsNoVfsCalls().match(calls)
2449
203
        self.assertIsNot(None, mismatch)
2450
204
        self.assertEqual([calls[0].call], mismatch.vfs_calls)
2451
205
        self.assertIn(mismatch.describe(), [
2452
206
            "no VFS calls expected, got: b'append'(b'file')",
2453
207
            "no VFS calls expected, got: append('file')"])
2454
208
2455
209
2456
210
class TestRevisionHistoryMatches(TestCaseWithTransport):
178
class TestRevisionHistoryMatches(TestCaseWithTransport):
2457
211
179
2458
212
    def test_empty(self):
180
    def test_empty(self):
2459
213
181
2460
=== modified file 'breezy/tests/test_selftest.py'
2461
--- breezy/tests/test_selftest.py	2020-02-07 02:14:30 +0000
2462
+++ breezy/tests/test_selftest.py	2020-06-11 01:55:28 +0000
2463
@@ -541,7 +541,7 @@
2464
541
        self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
541
        self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
2465
542
542
2466
543
    def test_assertEqualStat_equal(self):
543
    def test_assertEqualStat_equal(self):
2468
544
        from .test_dirstate import _FakeStat
544
        from ..bzr.tests.test_dirstate import _FakeStat
2469
545
        self.build_tree(["foo"])
545
        self.build_tree(["foo"])
2470
546
        real = os.lstat("foo")
546
        real = os.lstat("foo")
2471
547
        fake = _FakeStat(real.st_size, real.st_mtime, real.st_ctime,
547
        fake = _FakeStat(real.st_size, real.st_mtime, real.st_ctime,
2472
548
548
2473
=== modified file 'breezy/tests/test_server.py'
2474
--- breezy/tests/test_server.py	2020-02-07 02:14:30 +0000
2475
+++ breezy/tests/test_server.py	2020-06-11 01:55:28 +0000
2476
@@ -246,10 +246,6 @@
2477
246
246
2478
247
class TestThread(cethread.CatchingExceptionThread):
247
class TestThread(cethread.CatchingExceptionThread):
2479
248
248
2480
249
    if not getattr(cethread.CatchingExceptionThread, 'is_alive', None):
2481
250
        def is_alive(self):
2482
251
            return self.isAlive()
2483
252
2484
253
    def join(self, timeout=5):
249
    def join(self, timeout=5):
2485
254
        """Overrides to use a default timeout.
250
        """Overrides to use a default timeout.
2486
255
251
2487
256
252
2488
=== modified file 'breezy/tests/test_tag.py'
2489
--- breezy/tests/test_tag.py	2020-02-18 02:17:28 +0000
2490
+++ breezy/tests/test_tag.py	2020-06-11 01:55:28 +0000
2491
@@ -25,32 +25,12 @@
2492
25
    DisabledTags,
25
    DisabledTags,
2493
26
    MemoryTags,
26
    MemoryTags,
2494
27
    )
27
    )
2495
28
from breezy.bzr.tag import (
2496
29
    BasicTags,
2497
30
    )
2498
31
from breezy.tests import (
28
from breezy.tests import (
2499
32
    TestCase,
29
    TestCase,
2500
33
    TestCaseWithTransport,
30
    TestCaseWithTransport,
2501
34
    )
31
    )
2502
35
32
2503
36
33
2504
37
class TestTagSerialization(TestCase):
2505
38
2506
39
    def test_tag_serialization(self):
2507
40
        """Test the precise representation of tag dicts."""
2508
41
        # Don't change this after we commit to this format, as it checks
2509
42
        # that the format is stable and compatible across releases.
2510
43
        #
2511
44
        # This release stores them in bencode as a dictionary from name to
2512
45
        # target.
2513
46
        store = BasicTags(branch=None)
2514
47
        td = dict(stable=b'stable-revid', boring=b'boring-revid')
2515
48
        packed = store._serialize_tag_dict(td)
2516
49
        expected = br'd6:boring12:boring-revid6:stable12:stable-revide'
2517
50
        self.assertEqualDiff(packed, expected)
2518
51
        self.assertEqual(store._deserialize_tag_dict(packed), td)
2519
52
2520
53
2521
54
class TestTagRevisionRenames(TestCaseWithTransport):
34
class TestTagRevisionRenames(TestCaseWithTransport):
2522
55
35
2523
56
    def make_branch_supporting_tags(self, relpath):
36
    def make_branch_supporting_tags(self, relpath):
2524
57
37
2525
=== modified file 'breezy/tests/test_upstream_import.py'
2526
--- breezy/tests/test_upstream_import.py	2018-11-12 01:41:38 +0000
2527
+++ breezy/tests/test_upstream_import.py	2020-06-11 01:55:28 +0000
2528
@@ -26,7 +26,7 @@
2529
26
    revision as _mod_revision,
26
    revision as _mod_revision,
2530
27
    transform
27
    transform
2531
28
    )
28
    )
2533
29
from ..bzr.bzrdir import BzrDir
29
from ..controldir import ControlDir
2534
30
from ..export import export
30
from ..export import export
2535
31
from ..upstream_import import (
31
from ..upstream_import import (
2536
32
    common_directory,
32
    common_directory,
2537
@@ -222,7 +222,7 @@
2538
222
222
2539
223
    def archive_test(self, builder, importer, subdir=False):
223
    def archive_test(self, builder, importer, subdir=False):
2540
224
        archive_file = self.make_archive(builder, subdir)
224
        archive_file = self.make_archive(builder, subdir)
2542
225
        tree = BzrDir.create_standalone_workingtree('tree')
225
        tree = ControlDir.create_standalone_workingtree('tree')
2543
226
        with tree.lock_write():
226
        with tree.lock_write():
2544
227
            importer(tree, archive_file)
227
            importer(tree, archive_file)
2545
228
            self.assertTrue(tree.is_versioned('README'))
228
            self.assertTrue(tree.is_versioned('README'))
2546
@@ -244,19 +244,19 @@
2547
244
244
2548
245
    def test_untar2(self):
245
    def test_untar2(self):
2549
246
        tar_file = self.make_messed_tar()
246
        tar_file = self.make_messed_tar()
2551
247
        tree = BzrDir.create_standalone_workingtree('tree')
247
        tree = ControlDir.create_standalone_workingtree('tree')
2552
248
        import_tar(tree, tar_file)
248
        import_tar(tree, tar_file)
2553
249
        self.assertTrue(tree.is_versioned('project-0.1/README'))
249
        self.assertTrue(tree.is_versioned('project-0.1/README'))
2554
250
250
2555
251
    def test_untar_gzip(self):
251
    def test_untar_gzip(self):
2556
252
        tar_file = self.make_tar(mode='w:gz')
252
        tar_file = self.make_tar(mode='w:gz')
2558
253
        tree = BzrDir.create_standalone_workingtree('tree')
253
        tree = ControlDir.create_standalone_workingtree('tree')
2559
254
        import_tar(tree, tar_file)
254
        import_tar(tree, tar_file)
2560
255
        self.assertTrue(tree.is_versioned('README'))
255
        self.assertTrue(tree.is_versioned('README'))
2561
256
256
2562
257
    def test_no_crash_with_bzrdir(self):
257
    def test_no_crash_with_bzrdir(self):
2563
258
        tar_file = self.make_tar_with_bzrdir()
258
        tar_file = self.make_tar_with_bzrdir()
2565
259
        tree = BzrDir.create_standalone_workingtree('tree')
259
        tree = ControlDir.create_standalone_workingtree('tree')
2566
260
        import_tar(tree, tar_file)
260
        import_tar(tree, tar_file)
2567
261
        # So long as it did not crash, that should be ok
261
        # So long as it did not crash, that should be ok
2568
262
262
2569
263
263
2570
=== modified file 'breezy/tests/test_wsgi.py'
2571
--- breezy/tests/test_wsgi.py	2020-02-07 02:14:30 +0000
2572
+++ breezy/tests/test_wsgi.py	2020-06-11 01:55:28 +0000
2573
@@ -282,7 +282,7 @@
2574
282
        response_bytes = self.read_response(iterable)
282
        response_bytes = self.read_response(iterable)
2575
283
        self.assertEqual('200 OK', self.status)
283
        self.assertEqual('200 OK', self.status)
2576
284
        # expect a successful response, rather than a jail break error
284
        # expect a successful response, rather than a jail break error
2578
285
        from breezy.tests.test_smart_transport import LoggingMessageHandler
285
        from breezy.bzr.tests.test_smart_transport import LoggingMessageHandler
2579
286
        message_handler = LoggingMessageHandler()
286
        message_handler = LoggingMessageHandler()
2580
287
        decoder = protocol.ProtocolThreeDecoder(
287
        decoder = protocol.ProtocolThreeDecoder(
2581
288
            message_handler, expect_version_marker=True)
288
            message_handler, expect_version_marker=True)
2582
289
289
2583
=== modified file 'breezy/transport/http/__init__.py'
2584
--- breezy/transport/http/__init__.py	2020-06-01 19:35:12 +0000
2585
+++ breezy/transport/http/__init__.py	2020-06-11 01:55:28 +0000
2586
@@ -1700,8 +1700,9 @@
2587
1700
                       403,
1700
                       403,
2588
1701
                       404,  # Not found
1701
                       404,  # Not found
2589
1702
                       405,  # Method not allowed
1702
                       405,  # Method not allowed
2592
1703
                       416,
1703
                       409,  # Conflict
2593
1704
                       422,
1704
                       416,  # Range not satisfiable
2594
1705
                       422,  # Unprocessible entity
2595
1705
                       501,  # Not implemented
1706
                       501,  # Not implemented
2596
1706
                       ]
1707
                       ]
2597
1707
    """The error codes the caller will handle.
1708
    """The error codes the caller will handle.
2598
@@ -1900,9 +1901,14 @@
2599
1900
1901
2600
1901
            @property
1902
            @property
2601
1902
            def text(self):
1903
            def text(self):
2602
1904
                if self.status == 204:
2603
1905
                    return None
2604
1903
                charset = cgi.parse_header(
1906
                charset = cgi.parse_header(
2605
1904
                    self._actual.headers['Content-Type'])[1].get('charset')
1907
                    self._actual.headers['Content-Type'])[1].get('charset')
2607
1905
                return self.data.decode(charset)
1908
                if charset:
2608
1909
                    return self.data.decode(charset)
2609
1910
                else:
2610
1911
                    return self.data.decode()
2611
1906
1912
2612
1907
            def read(self, amt=None):
1913
            def read(self, amt=None):
2613
1908
                return self._actual.read(amt)
1914
                return self._actual.read(amt)
2614
1909
1915
2615
=== modified file 'breezy/transport/http/response.py'
2616
--- breezy/transport/http/response.py	2020-02-18 01:57:45 +0000
2617
+++ breezy/transport/http/response.py	2020-06-11 01:55:28 +0000
2618
@@ -78,6 +78,11 @@
2619
78
        self._pos += len(data)
78
        self._pos += len(data)
2620
79
        return data
79
        return data
2621
80
80
2622
81
    def readlines(self, size=None):
2623
82
        data = self._file.readlines()
2624
83
        self._pos += sum(map(len, data))
2625
84
        return data
2626
85
2627
81
    def __iter__(self):
86
    def __iter__(self):
2628
82
        while True:
87
        while True:
2629
83
            line = self.readline()
88
            line = self.readline()
2630
84
89
2631
=== modified file 'doc/developers/releasing.txt'
2632
--- doc/developers/releasing.txt	2020-06-01 19:35:12 +0000
2633
+++ doc/developers/releasing.txt	2020-06-11 01:55:28 +0000
2634
@@ -180,8 +180,8 @@
2635
180
The process for releasing an alpha release is therefore:
180
The process for releasing an alpha release is therefore:
2636
181
- upload a tarball to launchpad,
181
- upload a tarball to launchpad,
2637
182
- upload a tarball to pypi,
182
- upload a tarball to pypi,
2640
183
- mail bazaar@lists.ubuntu.com,
183
- mail bazaar@lists.ubuntu.com,breezy-vcs@googlegroups.com
2641
184
- post an announcement on the home page.  
184
- post an announcement on the home page.
2642
185
185
2643
186
Uploading tarballs are described below, just use alpha versions (3, 0, 0,
186
Uploading tarballs are described below, just use alpha versions (3, 0, 0,
2644
187
'alpha', 1) in ``./breezy/__init__.py``
187
'alpha', 1) in ``./breezy/__init__.py``
2645
188
188
2646
=== modified file 'setup.py'
2647
--- setup.py	2020-06-01 19:35:12 +0000
2648
+++ setup.py	2020-06-11 01:55:28 +0000
2649
@@ -78,6 +78,8 @@
2650
78
        },
78
        },
2651
79
    'tests_require': [
79
    'tests_require': [
2652
80
        'testtools',
80
        'testtools',
2653
81
        'testtools<=2.4.0;python_version<"3.0"',
2654
82
        'python-subunit',
2655
81
    ],
83
    ],
2656
82
}
84
}
2657
83
85
Status:	Merged
Approved by:	Jelmer Vernooij on 2020-06-11
Approved revision:	no longer in the source branch.
Merge reported by:	The Breezy Bot
Merged at revision:	not available
Proposed branch:	lp:~jelmer/brz/merge-3.1
Merge into:	lp:brz
Diff against target:	2656 lines (+573/-380) 98 files modified breezy/bzr/smart/server.py (+1/-1) breezy/bzr/tests/__init__.py (+85/-0) breezy/bzr/tests/matchers.py (+70/-0) breezy/bzr/tests/per_bzrdir/__init__.py (+1/-1) breezy/bzr/tests/per_bzrdir/test_bzrdir.py (+1/-1) breezy/bzr/tests/per_inventory/__init__.py (+1/-1) breezy/bzr/tests/per_inventory/basics.py (+1/-1) breezy/bzr/tests/per_pack_repository.py (+9/-9) breezy/bzr/tests/per_repository_chk/__init__.py (+2/-2) breezy/bzr/tests/per_repository_chk/test_supported.py (+1/-1) breezy/bzr/tests/per_repository_chk/test_unsupported.py (+1/-1) breezy/bzr/tests/per_repository_vf/helpers.py (+6/-6) breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_check.py (+2/-2) breezy/bzr/tests/per_repository_vf/test_check_reconcile.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_fetch.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_fileid_involved.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_merge_directive.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_reconcile.py (+2/-2) breezy/bzr/tests/per_repository_vf/test_refresh_data.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_repository.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_write_group.py (+1/-1) breezy/bzr/tests/per_versionedfile.py (+12/-12) breezy/bzr/tests/test__btree_serializer.py (+1/-1) breezy/bzr/tests/test__chk_map.py (+4/-4) breezy/bzr/tests/test__dirstate_helpers.py (+33/-33) breezy/bzr/tests/test__groupcompress.py (+5/-5) breezy/bzr/tests/test_btree_index.py (+4/-4) breezy/bzr/tests/test_chk_map.py (+4/-4) breezy/bzr/tests/test_chk_serializer.py (+2/-2) breezy/bzr/tests/test_dirstate.py (+4/-4) breezy/bzr/tests/test_generate_ids.py (+3/-3) breezy/bzr/tests/test_groupcompress.py (+4/-4) breezy/bzr/tests/test_index.py (+2/-2) breezy/bzr/tests/test_inv.py (+4/-4) breezy/bzr/tests/test_inventory_delta.py (+5/-5) breezy/bzr/tests/test_knit.py (+10/-10) breezy/bzr/tests/test_matchers.py (+57/-0) breezy/bzr/tests/test_pack.py (+2/-2) breezy/bzr/tests/test_remote.py (+16/-16) breezy/bzr/tests/test_repository.py (+1/-1) breezy/bzr/tests/test_serializer.py (+1/-1) breezy/bzr/tests/test_smart_transport.py (+8/-6) breezy/bzr/tests/test_tag.py (+45/-0) breezy/bzr/tests/test_versionedfile.py (+2/-2) breezy/bzr/tests/test_weave.py (+4/-4) breezy/bzr/tests/test_workingtree_4.py (+7/-13) breezy/bzr/tests/test_xml.py (+3/-3) breezy/bzr/workingtree_4.py (+1/-1) breezy/git/mapping.py (+2/-0) breezy/git/remote.py (+5/-3) breezy/git/tests/test_mapping.py (+9/-4) breezy/git/tests/test_remote.py (+6/-6) breezy/plugins/weave_fmt/repository.py (+1/-1) breezy/tests/__init__.py (+36/-34) breezy/tests/blackbox/test_annotate.py (+1/-1) breezy/tests/blackbox/test_branch.py (+1/-1) breezy/tests/blackbox/test_break_lock.py (+1/-1) breezy/tests/blackbox/test_cat.py (+1/-1) breezy/tests/blackbox/test_checkout.py (+1/-1) breezy/tests/blackbox/test_commit.py (+1/-1) breezy/tests/blackbox/test_config.py (+1/-1) breezy/tests/blackbox/test_export.py (+1/-1) breezy/tests/blackbox/test_info.py (+1/-1) breezy/tests/blackbox/test_log.py (+1/-1) breezy/tests/blackbox/test_ls.py (+1/-1) breezy/tests/blackbox/test_pack.py (+1/-1) breezy/tests/blackbox/test_push.py (+1/-1) breezy/tests/blackbox/test_reconcile.py (+1/-1) breezy/tests/blackbox/test_revno.py (+1/-1) breezy/tests/blackbox/test_rmbranch.py (+1/-1) breezy/tests/blackbox/test_send.py (+1/-1) breezy/tests/blackbox/test_shared_repository.py (+1/-1) breezy/tests/blackbox/test_sign_my_commits.py (+1/-1) breezy/tests/blackbox/test_switch.py (+1/-1) breezy/tests/blackbox/test_tags.py (+1/-1) breezy/tests/blackbox/test_testament.py (+1/-1) breezy/tests/blackbox/test_uncommit.py (+1/-1) breezy/tests/blackbox/test_verify_signatures.py (+1/-1) breezy/tests/matchers.py (+2/-45) breezy/tests/per_branch/test_branch.py (+1/-2) breezy/tests/per_interrepository/test_fetch.py (+1/-1) breezy/tests/test__static_tuple.py (+18/-3) breezy/tests/test_commit.py (+1/-4) breezy/tests/test_http_response.py (+4/-0) breezy/tests/test_lockable_files.py (+1/-1) breezy/tests/test_matchers.py (+0/-32) breezy/tests/test_selftest.py (+1/-1) breezy/tests/test_server.py (+0/-4) breezy/tests/test_tag.py (+0/-20) breezy/tests/test_upstream_import.py (+5/-5) breezy/tests/test_wsgi.py (+1/-1) breezy/transport/http/__init__.py (+9/-3) breezy/transport/http/response.py (+5/-0) doc/developers/releasing.txt (+2/-2) setup.py (+2/-0)
To merge this branch:	bzr merge lp:~jelmer/brz/merge-3.1
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij			Approve on 2020-06-11
Review via email: mp+385542@code.launchpad.net