Merge lp:~jelmer/brz/merge-3.1 into lp:brz

[Jelmer Vernooij]

Merge lp:brz/3.1.

Merge lp:brz/3.1.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/759/

=== modified file 'breezy/bzr/smart/server.py'
--- breezy/bzr/smart/server.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/smart/server.py	2020-06-11 01:55:28 +0000
@@ -265,7 +265,7 @@
         still_active = []
         for handler, thread in self._active_connections:
             thread.join(timeout)
-            if thread.isAlive():
+            if thread.is_alive():
                 still_active.append((handler, thread))
         self._active_connections = still_active
 

=== added directory 'breezy/bzr/tests'
=== added file 'breezy/bzr/tests/__init__.py'
--- breezy/bzr/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ breezy/bzr/tests/__init__.py	2020-06-11 01:55:28 +0000
@@ -0,0 +1,85 @@
+# Copyright (C) 2007-2020 Jelmer Vernoij <[e-mail]>
+# Copyright (C) 2006, 2007 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""The basic test suite for bzr."""
+
+from __future__ import absolute_import
+
+from io import BytesIO
+
+import time
+
+from ... import (
+    errors as bzr_errors,
+    tests,
+    )
+from ...tests.features import (
+    Feature,
+    ModuleAvailableFeature,
+    )
+
+TestCase = tests.TestCase
+TestCaseInTempDir = tests.TestCaseInTempDir
+TestCaseWithTransport = tests.TestCaseWithTransport
+TestCaseWithMemoryTransport = tests.TestCaseWithMemoryTransport
+
+
+def test_suite():
+    loader = tests.TestUtil.TestLoader()
+
+    suite = tests.TestUtil.TestSuite()
+
+    testmod_names = [
+        'test_dirstate',
+        'per_bzrdir',
+        'per_inventory',
+        'per_pack_repository',
+        'per_repository_chk',
+        'per_repository_vf',
+        'per_versionedfile',
+        'test__btree_serializer',
+        'test__chk_map',
+        'test__dirstate_helpers',
+        'test__groupcompress',
+        'test_btree_index',
+        'test_chk_map',
+        'test_chk_serializer',
+        'test_generate_ids',
+        'test_groupcompress',
+        'test_index',
+        'test_inv',
+        'test_inventory_delta',
+        'test_knit',
+        'test_matchers',
+        'test_pack',
+        'test_remote',
+        'test_smart',
+        'test_smart_request',
+        'test_smart_signals',
+        'test_smart_transport',
+        'test_serializer',
+        'test_tags',
+        'test_testament',
+        'test_versionedfile',
+        'test_workingtree_4',
+        'test_weave',
+        'test_xml',
+        ]
+    testmod_names = ['%s.%s' % (__name__, t) for t in testmod_names]
+    suite.addTests(loader.loadTestsFromModuleNames(testmod_names))
+
+    return suite

=== added file 'breezy/bzr/tests/matchers.py'
--- breezy/bzr/tests/matchers.py	1970-01-01 00:00:00 +0000
+++ breezy/bzr/tests/matchers.py	2020-06-11 01:55:28 +0000
@@ -0,0 +1,70 @@
+# Copyright (C) 2010 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Matchers for breezy.
+
+Primarily test support, Matchers are used by self.assertThat in the breezy
+test suite. A matcher is a stateful test helper which can be used to determine
+if a passed object 'matches', much like a regex. If the object does not match
+the mismatch can be described in a human readable fashion. assertThat then
+raises if a mismatch occurs, showing the description as the assertion error.
+
+Matchers are designed to be more reusable and composable than layered
+assertions in Test Case objects, so they are recommended for new testing work.
+"""
+
+__all__ = [
+    'ContainsNoVfsCalls',
+    ]
+
+from breezy.bzr.smart.request import request_handlers as smart_request_handlers
+from breezy.bzr.smart import vfs
+
+from testtools.matchers import Mismatch, Matcher
+
+
+class _NoVfsCallsMismatch(Mismatch):
+    """Mismatch describing a list of HPSS calls which includes VFS requests."""
+
+    def __init__(self, vfs_calls):
+        self.vfs_calls = vfs_calls
+
+    def describe(self):
+        return "no VFS calls expected, got: %s" % ",".join([
+            "%s(%s)" % (c.method,
+                        ", ".join([repr(a) for a in c.args])) for c in self.vfs_calls])
+
+
+class ContainsNoVfsCalls(Matcher):
+    """Ensure that none of the specified calls are HPSS calls."""
+
+    def __str__(self):
+        return 'ContainsNoVfsCalls()'
+
+    @classmethod
+    def match(cls, hpss_calls):
+        vfs_calls = []
+        for call in hpss_calls:
+            try:
+                request_method = smart_request_handlers.get(call.call.method)
+            except KeyError:
+                # A method we don't know about doesn't count as a VFS method.
+                continue
+            if issubclass(request_method, vfs.VfsRequest):
+                vfs_calls.append(call.call)
+        if len(vfs_calls) == 0:
+            return None
+        return _NoVfsCallsMismatch(vfs_calls)

=== renamed directory 'breezy/tests/per_bzrdir' => 'breezy/bzr/tests/per_bzrdir'
=== modified file 'breezy/bzr/tests/per_bzrdir/__init__.py'
--- breezy/tests/per_bzrdir/__init__.py	2017-06-11 14:07:05 +0000
+++ breezy/bzr/tests/per_bzrdir/__init__.py	2020-06-11 01:55:28 +0000
@@ -55,7 +55,7 @@
 
 def load_tests(loader, standard_tests, pattern):
     test_per_bzrdir = [
-        'breezy.tests.per_bzrdir.test_bzrdir',
+        'breezy.bzr.tests.per_bzrdir.test_bzrdir',
         ]
     submod_tests = loader.loadTestsFromModuleNames(test_per_bzrdir)
     formats = [format for format in ControlDirFormat.known_formats()

=== modified file 'breezy/bzr/tests/per_bzrdir/test_bzrdir.py'
--- breezy/tests/per_bzrdir/test_bzrdir.py	2020-03-22 18:52:18 +0000
+++ breezy/bzr/tests/per_bzrdir/test_bzrdir.py	2020-06-11 01:55:28 +0000
@@ -36,7 +36,7 @@
     TestNotApplicable,
     TestSkipped,
     )
-from breezy.tests.per_bzrdir import TestCaseWithBzrDir
+from breezy.bzr.tests.per_bzrdir import TestCaseWithBzrDir
 from breezy.transport.local import (
     LocalTransport,
     )

=== renamed directory 'breezy/tests/per_inventory' => 'breezy/bzr/tests/per_inventory'
=== modified file 'breezy/bzr/tests/per_inventory/__init__.py'
--- breezy/tests/per_inventory/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/per_inventory/__init__.py	2020-06-11 01:55:28 +0000
@@ -27,7 +27,7 @@
 def load_tests(loader, basic_tests, pattern):
     """Generate suite containing all parameterized tests"""
     modules_to_test = [
-        'breezy.tests.per_inventory.basics',
+        'breezy.bzr.tests.per_inventory.basics',
         ]
     from breezy.bzr.inventory import Inventory, CHKInventory
 

=== modified file 'breezy/bzr/tests/per_inventory/basics.py'
--- breezy/tests/per_inventory/basics.py	2019-10-06 11:30:57 +0000
+++ breezy/bzr/tests/per_inventory/basics.py	2020-06-11 01:55:28 +0000
@@ -35,7 +35,7 @@
     TreeReference,
     )
 
-from breezy.tests.per_inventory import TestCaseWithInventory
+from breezy.bzr.tests.per_inventory import TestCaseWithInventory
 
 
 class TestInventory(TestCaseWithInventory):

=== renamed file 'breezy/tests/per_pack_repository.py' => 'breezy/bzr/tests/per_pack_repository.py'
--- breezy/tests/per_pack_repository.py	2020-01-30 16:13:31 +0000
+++ breezy/bzr/tests/per_pack_repository.py	2020-06-11 01:55:28 +0000
@@ -21,9 +21,9 @@
 
 from stat import S_ISDIR
 
-from ..bzr.btree_index import BTreeGraphIndex
-from ..bzr.index import GraphIndex
-from .. import (
+from ..btree_index import BTreeGraphIndex
+from ..index import GraphIndex
+from ... import (
     controldir,
     errors,
     gpg,
@@ -34,21 +34,21 @@
     transport,
     ui,
     )
-from ..bzr import (
+from .. import (
     inventory,
     )
-from ..bzr.groupcompress_repo import RepositoryFormat2a
-from ..bzr.smart import (
+from ..groupcompress_repo import RepositoryFormat2a
+from ..smart import (
     client,
     )
-from . import (
+from ...tests import (
     TestCaseWithTransport,
     TestNotApplicable,
     )
-from ..transport import (
+from ...transport import (
     memory,
     )
-from . import test_server
+from ...tests import test_server
 
 
 class TestPackRepository(TestCaseWithTransport):

=== renamed directory 'breezy/tests/per_repository_chk' => 'breezy/bzr/tests/per_repository_chk'
=== modified file 'breezy/bzr/tests/per_repository_chk/__init__.py'
--- breezy/tests/per_repository_chk/__init__.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/per_repository_chk/__init__.py	2020-06-11 01:55:28 +0000
@@ -76,9 +76,9 @@
             unsupported_scenarios.append((test_name, scenario_info))
     result = loader.suiteClass()
     supported_tests = loader.loadTestsFromModuleNames([
-        'breezy.tests.per_repository_chk.test_supported'])
+        'breezy.bzr.tests.per_repository_chk.test_supported'])
     unsupported_tests = loader.loadTestsFromModuleNames([
-        'breezy.tests.per_repository_chk.test_unsupported'])
+        'breezy.bzr.tests.per_repository_chk.test_unsupported'])
     multiply_tests(supported_tests, supported_scenarios, result)
     multiply_tests(unsupported_tests, unsupported_scenarios, result)
     return result

=== modified file 'breezy/bzr/tests/per_repository_chk/test_supported.py'
--- breezy/tests/per_repository_chk/test_supported.py	2019-05-29 03:22:34 +0000
+++ breezy/bzr/tests/per_repository_chk/test_supported.py	2020-06-11 01:55:28 +0000
@@ -27,7 +27,7 @@
 from breezy.bzr.versionedfile import VersionedFiles
 from breezy.bzr.remote import RemoteRepository
 from breezy.tests import TestNotApplicable
-from breezy.tests.per_repository_chk import TestCaseWithRepositoryCHK
+from breezy.bzr.tests.per_repository_chk import TestCaseWithRepositoryCHK
 
 
 class TestCHKSupport(TestCaseWithRepositoryCHK):

=== modified file 'breezy/bzr/tests/per_repository_chk/test_unsupported.py'
--- breezy/tests/per_repository_chk/test_unsupported.py	2017-05-21 18:10:28 +0000
+++ breezy/bzr/tests/per_repository_chk/test_unsupported.py	2020-06-11 01:55:28 +0000
@@ -20,7 +20,7 @@
 attributes CHK support added should fail in known ways.
 """
 
-from breezy.tests.per_repository_chk import TestCaseWithRepositoryCHK
+from breezy.bzr.tests.per_repository_chk import TestCaseWithRepositoryCHK
 
 
 class TestNoCHKSupport(TestCaseWithRepositoryCHK):

=== renamed directory 'breezy/tests/per_repository_vf' => 'breezy/bzr/tests/per_repository_vf'
=== modified file 'breezy/bzr/tests/per_repository_vf/helpers.py'
--- breezy/tests/per_repository_vf/helpers.py	2020-01-31 10:39:02 +0000
+++ breezy/bzr/tests/per_repository_vf/helpers.py	2020-06-11 01:55:28 +0000
@@ -16,17 +16,17 @@
 
 """Helper classes for repository implementation tests."""
 
-from ... import (
+from .... import (
     osutils,
     revision as _mod_revision,
     )
-from ...repository import WriteGroup
-from ...bzr import (
+from ....repository import WriteGroup
+from ... import (
     inventory,
     )
-from ...bzr.knitrepo import RepositoryFormatKnit
-from ..per_repository import TestCaseWithRepository
-from .. import TestNotApplicable
+from ...knitrepo import RepositoryFormatKnit
+from ....tests.per_repository import TestCaseWithRepository
+from ....tests import TestNotApplicable
 
 
 class TestCaseWithBrokenRevisionIndex(TestCaseWithRepository):

=== modified file 'breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py'
--- breezy/tests/per_repository_vf/test__generate_text_key_index.py	2017-05-21 18:10:28 +0000
+++ breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py	2020-06-11 01:55:28 +0000
@@ -19,7 +19,7 @@
 
 
 from breezy.tests.scenarios import load_tests_apply_scenarios
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py'
--- breezy/tests/per_repository_vf/test_add_inventory_by_delta.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py	2020-06-11 01:55:28 +0000
@@ -17,7 +17,7 @@
 """Tests for Repository.add_inventory_by_delta."""
 
 from breezy import errors, revision
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     all_repository_vf_format_scenarios,
     TestCaseWithRepository
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_check.py'
--- breezy/tests/per_repository_vf/test_check.py	2019-06-29 19:54:32 +0000
+++ breezy/bzr/tests/per_repository_vf/test_check.py	2020-06-11 01:55:28 +0000
@@ -24,11 +24,11 @@
     TestNotApplicable,
     )
 from breezy.tests.scenarios import load_tests_apply_scenarios
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )
-from breezy.tests.per_repository_vf.helpers import (
+from breezy.bzr.tests.per_repository_vf.helpers import (
     TestCaseWithBrokenRevisionIndex,
     )
 

=== modified file 'breezy/bzr/tests/per_repository_vf/test_check_reconcile.py'
--- breezy/tests/per_repository_vf/test_check_reconcile.py	2019-05-29 03:22:34 +0000
+++ breezy/bzr/tests/per_repository_vf/test_check_reconcile.py	2020-06-11 01:55:28 +0000
@@ -34,7 +34,7 @@
     TestNotApplicable,
     multiply_scenarios,
     )
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_fetch.py'
--- breezy/tests/per_repository_vf/test_fetch.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/per_repository_vf/test_fetch.py	2020-06-11 01:55:28 +0000
@@ -19,7 +19,7 @@
 from breezy.bzr import (
     vf_search,
     )
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_fileid_involved.py'
--- breezy/tests/per_repository_vf/test_fileid_involved.py	2019-09-21 19:27:04 +0000
+++ breezy/bzr/tests/per_repository_vf/test_fileid_involved.py	2020-06-11 01:55:28 +0000
@@ -28,7 +28,7 @@
     remote,
     )
 from breezy.tests.scenarios import load_tests_apply_scenarios
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py'
--- breezy/tests/per_repository_vf/test_find_text_key_references.py	2017-05-21 18:10:28 +0000
+++ breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py	2020-06-11 01:55:28 +0000
@@ -18,7 +18,7 @@
 """Test the find_text_key_references API."""
 
 
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_merge_directive.py'
--- breezy/tests/per_repository_vf/test_merge_directive.py	2018-11-16 18:33:17 +0000
+++ breezy/bzr/tests/per_repository_vf/test_merge_directive.py	2020-06-11 01:55:28 +0000
@@ -28,7 +28,7 @@
     )
 
 from breezy.tests.scenarios import load_tests_apply_scenarios
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_reconcile.py'
--- breezy/tests/per_repository_vf/test_reconcile.py	2019-06-29 19:54:32 +0000
+++ breezy/bzr/tests/per_repository_vf/test_reconcile.py	2020-06-11 01:55:28 +0000
@@ -26,10 +26,10 @@
 from breezy.revision import Revision
 from breezy.tests import TestSkipped
 
-from breezy.tests.per_repository_vf.helpers import (
+from breezy.bzr.tests.per_repository_vf.helpers import (
     TestCaseWithBrokenRevisionIndex,
     )
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_refresh_data.py'
--- breezy/tests/per_repository_vf/test_refresh_data.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/per_repository_vf/test_refresh_data.py	2020-06-11 01:55:28 +0000
@@ -21,7 +21,7 @@
     repository,
     )
 
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_repository.py'
--- breezy/tests/per_repository_vf/test_repository.py	2019-06-29 13:16:26 +0000
+++ breezy/bzr/tests/per_repository_vf/test_repository.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,7 @@
     )
 
 from breezy.tests.matchers import MatchesAncestry
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== modified file 'breezy/bzr/tests/per_repository_vf/test_write_group.py'
--- breezy/tests/per_repository_vf/test_write_group.py	2018-11-18 01:02:16 +0000
+++ breezy/bzr/tests/per_repository_vf/test_write_group.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,7 @@
     remote,
     versionedfile,
     )
-from breezy.tests.per_repository_vf import (
+from breezy.bzr.tests.per_repository_vf import (
     TestCaseWithRepository,
     all_repository_vf_format_scenarios,
     )

=== renamed file 'breezy/tests/per_versionedfile.py' => 'breezy/bzr/tests/per_versionedfile.py'
--- breezy/tests/per_versionedfile.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/per_versionedfile.py	2020-06-11 01:55:28 +0000
@@ -25,7 +25,7 @@
 from io import BytesIO
 import itertools
 
-from .. import (
+from ... import (
     errors,
     graph as _mod_graph,
     osutils,
@@ -33,29 +33,29 @@
     transport,
     ui,
     )
-from ..bzr import (
+from .. import (
     groupcompress,
     knit as _mod_knit,
     )
-from ..errors import (
+from ...errors import (
     RevisionNotPresent,
     RevisionAlreadyPresent,
     )
-from ..bzr.knit import (
+from ..knit import (
     cleanup_pack_knit,
     make_file_factory,
     make_pack_factory,
     )
-from . import (
+from ...tests import (
     TestCase,
     TestCaseWithMemoryTransport,
     TestNotApplicable,
     TestSkipped,
     )
-from .http_utils import TestCaseWithWebserver
-from ..transport.memory import MemoryTransport
-from ..bzr import versionedfile as versionedfile
-from ..bzr.versionedfile import (
+from ...tests.http_utils import TestCaseWithWebserver
+from ...transport.memory import MemoryTransport
+from .. import versionedfile as versionedfile
+from ..versionedfile import (
     ChunkedContentFactory,
     ConstantMapper,
     HashEscapedPrefixMapper,
@@ -63,12 +63,12 @@
     VirtualVersionedFiles,
     make_versioned_files_factory,
     )
-from ..bzr.weave import (
+from ..weave import (
     WeaveFile,
     WeaveInvalidChecksum,
     )
-from ..bzr.weavefile import write_weave
-from .scenarios import load_tests_apply_scenarios
+from ..weavefile import write_weave
+from ...tests.scenarios import load_tests_apply_scenarios
 
 
 load_tests = load_tests_apply_scenarios

=== renamed file 'breezy/tests/test__btree_serializer.py' => 'breezy/bzr/tests/test__btree_serializer.py'
--- breezy/tests/test__btree_serializer.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test__btree_serializer.py	2020-06-11 01:55:28 +0000
@@ -20,7 +20,7 @@
 import binascii
 import bisect
 
-from .. import tests
+from ... import tests
 
 from .test_btree_index import compiled_btreeparser_feature
 

=== renamed file 'breezy/tests/test__chk_map.py' => 'breezy/bzr/tests/test__chk_map.py'
--- breezy/tests/test__chk_map.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test__chk_map.py	2020-06-11 01:55:28 +0000
@@ -16,13 +16,13 @@
 
 """Tests for _chk_map_*."""
 
+from ... import (
+    tests,
+    )
 from .. import (
-    tests,
-    )
-from ..bzr import (
     chk_map,
     )
-from ..static_tuple import StaticTuple
+from ...static_tuple import StaticTuple
 stuple = StaticTuple
 
 

=== renamed file 'breezy/tests/test__dirstate_helpers.py' => 'breezy/bzr/tests/test__dirstate_helpers.py'
--- breezy/tests/test__dirstate_helpers.py	2019-06-29 13:16:26 +0000
+++ breezy/bzr/tests/test__dirstate_helpers.py	2020-06-11 01:55:28 +0000
@@ -20,23 +20,23 @@
 import os
 import time
 
-from .. import (
+from ... import (
     osutils,
     tests,
     )
-from ..bzr import (
+from .. import (
     dirstate,
     _dirstate_helpers_py,
     )
 from . import (
     test_dirstate,
     )
-from .test_osutils import dir_reader_scenarios
-from .scenarios import (
+from ...tests.test_osutils import dir_reader_scenarios
+from ...tests.scenarios import (
     load_tests_apply_scenarios,
     multiply_scenarios,
     )
-from . import (
+from ...tests import (
     features,
     )
 
@@ -227,7 +227,7 @@
     """Run all Bisect Path tests against _bisect_path_left."""
 
     def get_bisect_path(self):
-        from breezy.bzr._dirstate_helpers_py import _bisect_path_left
+        from .._dirstate_helpers_py import _bisect_path_left
         return _bisect_path_left
 
     def get_bisect(self):
@@ -240,7 +240,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_bisect_path(self):
-        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
+        from .._dirstate_helpers_pyx import _bisect_path_left
         return _bisect_path_left
 
 
@@ -248,7 +248,7 @@
     """Run all Bisect Path tests against _bisect_path_right"""
 
     def get_bisect_path(self):
-        from breezy.bzr._dirstate_helpers_py import _bisect_path_right
+        from .._dirstate_helpers_py import _bisect_path_right
         return _bisect_path_right
 
     def get_bisect(self):
@@ -261,7 +261,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_bisect_path(self):
-        from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
+        from .._dirstate_helpers_pyx import _bisect_path_right
         return _bisect_path_right
 
 
@@ -279,7 +279,7 @@
 
     def get_bisect_dirblock(self):
         """Return an implementation of bisect_dirblock"""
-        from breezy.bzr._dirstate_helpers_py import bisect_dirblock
+        from .._dirstate_helpers_py import bisect_dirblock
         return bisect_dirblock
 
     def assertBisect(self, dirblocks, split_dirblocks, path, *args, **kwargs):
@@ -373,7 +373,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_bisect_dirblock(self):
-        from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
+        from .._dirstate_helpers_pyx import bisect_dirblock
         return bisect_dirblock
 
 
@@ -389,7 +389,7 @@
 
     def get_lt_by_dirs(self):
         """Get a specific implementation of lt_by_dirs."""
-        from ..bzr._dirstate_helpers_py import lt_by_dirs
+        from .._dirstate_helpers_py import lt_by_dirs
         return lt_by_dirs
 
     def assertCmpByDirs(self, expected, str1, str2):
@@ -496,7 +496,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_lt_by_dirs(self):
-        from ..bzr._dirstate_helpers_pyx import lt_by_dirs
+        from .._dirstate_helpers_pyx import lt_by_dirs
         return lt_by_dirs
 
 
@@ -512,7 +512,7 @@
 
     def get_lt_path_by_dirblock(self):
         """Get a specific implementation of _lt_path_by_dirblock."""
-        from ..bzr._dirstate_helpers_py import _lt_path_by_dirblock
+        from .._dirstate_helpers_py import _lt_path_by_dirblock
         return _lt_path_by_dirblock
 
     def assertLtPathByDirblock(self, paths):
@@ -637,7 +637,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_lt_path_by_dirblock(self):
-        from ..bzr._dirstate_helpers_pyx import _lt_path_by_dirblock
+        from .._dirstate_helpers_pyx import _lt_path_by_dirblock
         return _lt_path_by_dirblock
 
 
@@ -647,7 +647,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def assertMemRChr(self, expected, s, c):
-        from breezy.bzr._dirstate_helpers_pyx import _py_memrchr
+        from .._dirstate_helpers_pyx import _py_memrchr
         self.assertEqual(expected, _py_memrchr(s, c))
 
     def test_missing(self):
@@ -697,7 +697,7 @@
     # inherits scenarios from test_dirstate
 
     def get_read_dirblocks(self):
-        from breezy.bzr._dirstate_helpers_py import _read_dirblocks
+        from .._dirstate_helpers_py import _read_dirblocks
         return _read_dirblocks
 
     def test_smoketest(self):
@@ -737,7 +737,7 @@
     _test_needs_features = [compiled_dirstate_helpers_feature]
 
     def get_read_dirblocks(self):
-        from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
+        from .._dirstate_helpers_pyx import _read_dirblocks
         return _read_dirblocks
 
 
@@ -751,52 +751,52 @@
 
     def test_bisect_dirblock(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import bisect_dirblock
+            from .._dirstate_helpers_pyx import bisect_dirblock
         else:
-            from breezy.bzr._dirstate_helpers_py import bisect_dirblock
+            from .._dirstate_helpers_py import bisect_dirblock
         self.assertIs(bisect_dirblock, dirstate.bisect_dirblock)
 
     def test__bisect_path_left(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_left
+            from .._dirstate_helpers_pyx import _bisect_path_left
         else:
-            from breezy.bzr._dirstate_helpers_py import _bisect_path_left
+            from .._dirstate_helpers_py import _bisect_path_left
         self.assertIs(_bisect_path_left, dirstate._bisect_path_left)
 
     def test__bisect_path_right(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import _bisect_path_right
+            from .._dirstate_helpers_pyx import _bisect_path_right
         else:
-            from breezy.bzr._dirstate_helpers_py import _bisect_path_right
+            from .._dirstate_helpers_py import _bisect_path_right
         self.assertIs(_bisect_path_right, dirstate._bisect_path_right)
 
     def test_lt_by_dirs(self):
         if compiled_dirstate_helpers_feature.available():
-            from ..bzr._dirstate_helpers_pyx import lt_by_dirs
+            from .._dirstate_helpers_pyx import lt_by_dirs
         else:
-            from ..bzr._dirstate_helpers_py import lt_by_dirs
+            from .._dirstate_helpers_py import lt_by_dirs
         self.assertIs(lt_by_dirs, dirstate.lt_by_dirs)
 
     def test__read_dirblocks(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import _read_dirblocks
+            from .._dirstate_helpers_pyx import _read_dirblocks
         else:
-            from breezy.bzr._dirstate_helpers_py import _read_dirblocks
+            from .._dirstate_helpers_py import _read_dirblocks
         self.assertIs(_read_dirblocks, dirstate._read_dirblocks)
 
     def test_update_entry(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import update_entry
+            from .._dirstate_helpers_pyx import update_entry
         else:
-            from breezy.bzr.dirstate import update_entry
+            from ..dirstate import update_entry
         self.assertIs(update_entry, dirstate.update_entry)
 
     def test_process_entry(self):
         if compiled_dirstate_helpers_feature.available():
-            from breezy.bzr._dirstate_helpers_pyx import ProcessEntryC
+            from .._dirstate_helpers_pyx import ProcessEntryC
             self.assertIs(ProcessEntryC, dirstate._process_entry)
         else:
-            from breezy.bzr.dirstate import ProcessEntryPython
+            from ..dirstate import ProcessEntryPython
             self.assertIs(ProcessEntryPython, dirstate._process_entry)
 
 
@@ -1313,7 +1313,7 @@
             raise RuntimeError('stop this')
         self.overrideAttr(dirstate, 'is_inside', is_inside_raises)
         try:
-            from breezy.bzr import _dirstate_helpers_pyx
+            from .. import _dirstate_helpers_pyx
         except ImportError:
             pass
         else:

=== renamed file 'breezy/tests/test__groupcompress.py' => 'breezy/bzr/tests/test__groupcompress.py'
--- breezy/tests/test__groupcompress.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test__groupcompress.py	2020-06-11 01:55:28 +0000
@@ -18,16 +18,16 @@
 
 import sys
 
+from ... import (
+    tests,
+    )
 from .. import (
-    tests,
-    )
-from ..bzr import (
     _groupcompress_py,
     )
-from .scenarios import (
+from ...tests.scenarios import (
     load_tests_apply_scenarios,
     )
-from . import (
+from ...tests import (
     features,
     )
 

=== renamed file 'breezy/tests/test_btree_index.py' => 'breezy/bzr/tests/test_btree_index.py'
--- breezy/tests/test_btree_index.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/test_btree_index.py	2020-06-11 01:55:28 +0000
@@ -20,7 +20,7 @@
 import pprint
 import zlib
 
-from .. import (
+from ... import (
     errors,
     fifo_cache,
     lru_cache,
@@ -28,15 +28,15 @@
     tests,
     transport,
     )
-from ..bzr import (
+from .. import (
     btree_index,
     index as _mod_index,
     )
-from ..tests import (
+from ...tests import (
     TestCaseWithTransport,
     scenarios,
     )
-from ..tests import (
+from ...tests import (
     features,
     )
 

=== renamed file 'breezy/tests/test_chk_map.py' => 'breezy/bzr/tests/test_chk_map.py'
--- breezy/tests/test_chk_map.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/test_chk_map.py	2020-06-11 01:55:28 +0000
@@ -16,22 +16,22 @@
 
 """Tests for maps built on a CHK versionedfiles facility."""
 
-from .. import (
+from ... import (
     errors,
     osutils,
     tests,
     )
-from ..bzr import (
+from .. import (
     chk_map,
     groupcompress,
     )
-from ..bzr.chk_map import (
+from ..chk_map import (
     CHKMap,
     InternalNode,
     LeafNode,
     Node,
     )
-from ..static_tuple import StaticTuple
+from ...static_tuple import StaticTuple
 
 
 class TestNode(tests.TestCase):

=== renamed file 'breezy/tests/test_chk_serializer.py' => 'breezy/bzr/tests/test_chk_serializer.py'
--- breezy/tests/test_chk_serializer.py	2020-01-31 02:56:40 +0000
+++ breezy/bzr/tests/test_chk_serializer.py	2020-06-11 01:55:28 +0000
@@ -14,10 +14,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-from ..bzr.chk_serializer import (
+from ..chk_serializer import (
     chk_bencode_serializer,
     )
-from ..revision import (
+from ...revision import (
     Revision,
     )
 from . import TestCase

=== renamed file 'breezy/tests/test_dirstate.py' => 'breezy/bzr/tests/test_dirstate.py'
--- breezy/tests/test_dirstate.py	2020-01-11 02:39:17 +0000
+++ breezy/bzr/tests/test_dirstate.py	2020-06-11 01:55:28 +0000
@@ -19,7 +19,7 @@
 import os
 import tempfile
 
-from .. import (
+from ... import (
     controldir,
     errors,
     memorytree,
@@ -28,17 +28,17 @@
     revisiontree,
     tests,
     )
-from ..bzr import (
+from .. import (
     dirstate,
     inventory,
     inventorytree,
     workingtree_4,
     )
-from . import (
+from ...tests import (
     features,
     test_osutils,
     )
-from .scenarios import load_tests_apply_scenarios
+from ...tests.scenarios import load_tests_apply_scenarios
 
 
 # TODO:

=== renamed file 'breezy/tests/test_generate_ids.py' => 'breezy/bzr/tests/test_generate_ids.py'
--- breezy/tests/test_generate_ids.py	2019-02-04 19:39:30 +0000
+++ breezy/bzr/tests/test_generate_ids.py	2020-06-11 01:55:28 +0000
@@ -16,10 +16,10 @@
 
 """Tests for breezy/generate_ids.py"""
 
+from ... import (
+    tests,
+    )
 from .. import (
-    tests,
-    )
-from ..bzr import (
     generate_ids,
     )
 

=== renamed file 'breezy/tests/test_groupcompress.py' => 'breezy/bzr/tests/test_groupcompress.py'
--- breezy/tests/test_groupcompress.py	2020-02-09 02:20:11 +0000
+++ breezy/bzr/tests/test_groupcompress.py	2020-06-11 01:55:28 +0000
@@ -18,23 +18,23 @@
 
 import zlib
 
-from .. import (
+from ... import (
     config,
     errors,
     osutils,
     tests,
     trace,
     )
-from ..bzr import (
+from .. import (
     btree_index,
     groupcompress,
     knit,
     index as _mod_index,
     versionedfile,
     )
-from ..osutils import sha_string
+from ...osutils import sha_string
 from .test__groupcompress import compiled_groupcompress_feature
-from .scenarios import load_tests_apply_scenarios
+from ...tests.scenarios import load_tests_apply_scenarios
 
 
 def group_compress_implementation_scenarios():

=== renamed file 'breezy/tests/test_index.py' => 'breezy/bzr/tests/test_index.py'
--- breezy/tests/test_index.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_index.py	2020-06-11 01:55:28 +0000
@@ -16,12 +16,12 @@
 
 """Tests for indices."""
 
-from .. import (
+from ... import (
     errors,
     tests,
     transport,
     )
-from ..bzr import (
+from .. import (
     index as _mod_index,
     )
 

=== renamed file 'breezy/tests/test_inv.py' => 'breezy/bzr/tests/test_inv.py'
--- breezy/tests/test_inv.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_inv.py	2020-06-11 01:55:28 +0000
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-from .. import (
+from ... import (
     errors,
     osutils,
     repository,
@@ -23,12 +23,12 @@
     tests,
     workingtree,
     )
-from ..bzr import (
+from .. import (
     chk_map,
     groupcompress,
     inventory,
     )
-from ..bzr.inventory import (
+from ..inventory import (
     CHKInventory,
     Inventory,
     ROOT_ID,
@@ -43,7 +43,7 @@
     TestCase,
     TestCaseWithTransport,
     )
-from .scenarios import load_tests_apply_scenarios
+from ...tests.scenarios import load_tests_apply_scenarios
 
 
 load_tests = load_tests_apply_scenarios

=== renamed file 'breezy/tests/test_inventory_delta.py' => 'breezy/bzr/tests/test_inventory_delta.py'
--- breezy/tests/test_inventory_delta.py	2020-02-13 23:57:28 +0000
+++ breezy/bzr/tests/test_inventory_delta.py	2020-06-11 01:55:28 +0000
@@ -22,14 +22,14 @@
 from io import (
     BytesIO,
     )
-from .. import osutils
-from ..bzr import (
+from ... import osutils
+from .. import (
     inventory,
     inventory_delta,
     )
-from ..bzr.inventory_delta import InventoryDeltaError
-from ..bzr.inventory import Inventory
-from ..revision import NULL_REVISION
+from ..inventory_delta import InventoryDeltaError
+from ..inventory import Inventory
+from ...revision import NULL_REVISION
 from . import TestCase
 
 ### DO NOT REFLOW THESE TEXTS. NEW LINES ARE SIGNIFICANT. ###

=== renamed file 'breezy/tests/test_knit.py' => 'breezy/bzr/tests/test_knit.py'
--- breezy/tests/test_knit.py	2020-01-26 15:23:23 +0000
+++ breezy/bzr/tests/test_knit.py	2020-06-11 01:55:28 +0000
@@ -21,19 +21,19 @@
 from patiencediff import PatienceSequenceMatcher
 import sys
 
-from .. import (
+from ... import (
     errors,
     multiparent,
     osutils,
     tests,
     transport,
     )
-from ..bzr import (
+from .. import (
     knit,
     pack,
     )
-from ..bzr.index import *
-from ..bzr.knit import (
+from ..index import *
+from ..knit import (
     AnnotatedKnitContent,
     KnitContent,
     KnitCorrupt,
@@ -49,23 +49,23 @@
     _KnitKeyAccess,
     make_file_factory,
     )
-from ..bzr import (
+from .. import (
     knitpack_repo,
     pack_repo,
     )
-from . import (
+from ...tests import (
     TestCase,
     TestCaseWithMemoryTransport,
     TestCaseWithTransport,
     TestNotApplicable,
     )
-from ..bzr.versionedfile import (
+from ..versionedfile import (
     AbsentContentFactory,
     ConstantMapper,
     network_bytes_to_kind_and_offset,
     RecordingVersionedFilesDecorator,
     )
-from . import (
+from ...tests import (
     features,
     )
 
@@ -938,7 +938,7 @@
 
     @property
     def _load_data(self):
-        from ..bzr._knit_load_data_py import _load_data_py
+        from .._knit_load_data_py import _load_data_py
         return _load_data_py
 
     def get_knit_index(self, transport, name, mode):
@@ -1331,7 +1331,7 @@
 
     @property
     def _load_data(self):
-        from ..bzr._knit_load_data_pyx import _load_data_c
+        from .._knit_load_data_pyx import _load_data_c
         return _load_data_c
 
 

=== added file 'breezy/bzr/tests/test_matchers.py'
--- breezy/bzr/tests/test_matchers.py	1970-01-01 00:00:00 +0000
+++ breezy/bzr/tests/test_matchers.py	2020-06-11 01:55:28 +0000
@@ -0,0 +1,57 @@
+# Copyright (C) 2010, 2011, 2012, 2016 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Tests of breezy test matchers."""
+
+from testtools.matchers import *
+
+from ..smart.client import CallHookParams
+
+from ...tests import (
+    CapturedCall,
+    TestCase,
+    )
+from .matchers import *
+
+
+class TestContainsNoVfsCalls(TestCase):
+
+    def _make_call(self, method, args):
+        return CapturedCall(CallHookParams(method, args, None, None, None), 0)
+
+    def test__str__(self):
+        self.assertEqual("ContainsNoVfsCalls()", str(ContainsNoVfsCalls()))
+
+    def test_empty(self):
+        self.assertIs(None, ContainsNoVfsCalls().match([]))
+
+    def test_no_vfs_calls(self):
+        calls = [self._make_call("Branch.get_config_file", [])]
+        self.assertIs(None, ContainsNoVfsCalls().match(calls))
+
+    def test_ignores_unknown(self):
+        calls = [self._make_call("unknown", [])]
+        self.assertIs(None, ContainsNoVfsCalls().match(calls))
+
+    def test_match(self):
+        calls = [self._make_call(b"append", [b"file"]),
+                 self._make_call(b"Branch.get_config_file", [])]
+        mismatch = ContainsNoVfsCalls().match(calls)
+        self.assertIsNot(None, mismatch)
+        self.assertEqual([calls[0].call], mismatch.vfs_calls)
+        self.assertIn(mismatch.describe(), [
+            "no VFS calls expected, got: b'append'(b'file')",
+            "no VFS calls expected, got: append('file')"])

=== renamed file 'breezy/tests/test_pack.py' => 'breezy/bzr/tests/test_pack.py'
--- breezy/tests/test_pack.py	2020-02-13 23:57:28 +0000
+++ breezy/bzr/tests/test_pack.py	2020-06-11 01:55:28 +0000
@@ -18,8 +18,8 @@
 
 from io import BytesIO
 
-from .. import errors, tests
-from ..bzr import (
+from ... import errors, tests
+from .. import (
     pack,
     )
 

=== renamed file 'breezy/tests/test_remote.py' => 'breezy/bzr/tests/test_remote.py'
--- breezy/tests/test_remote.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_remote.py	2020-06-11 01:55:28 +0000
@@ -29,7 +29,7 @@
 import tarfile
 import zlib
 
-from .. import (
+from ... import (
     bencode,
     branch,
     config,
@@ -40,8 +40,8 @@
     transport,
     treebuilder,
     )
-from ..branch import Branch
-from ..bzr import (
+from ...branch import Branch
+from .. import (
     bzrdir,
     inventory,
     inventory_delta,
@@ -49,15 +49,15 @@
     versionedfile,
     vf_search,
     )
-from ..bzr.bzrdir import (
+from ..bzrdir import (
     BzrDir,
     BzrDirFormat,
     )
-from ..bzr import (
+from .. import (
     RemoteBzrProber,
     )
-from ..bzr.chk_serializer import chk_bencode_serializer
-from ..bzr.remote import (
+from ..chk_serializer import chk_bencode_serializer
+from ..remote import (
     RemoteBranch,
     RemoteBranchFormat,
     RemoteBzrDir,
@@ -65,24 +65,24 @@
     RemoteRepository,
     RemoteRepositoryFormat,
     )
-from ..bzr import groupcompress_repo, knitpack_repo
-from ..revision import (
+from .. import groupcompress_repo, knitpack_repo
+from ...revision import (
     NULL_REVISION,
     Revision,
     )
-from ..bzr.smart import medium, request
-from ..bzr.smart.client import _SmartClient
-from ..bzr.smart.repository import (
+from ..smart import medium, request
+from ..smart.client import _SmartClient
+from ..smart.repository import (
     SmartServerRepositoryGetParentMap,
     SmartServerRepositoryGetStream_1_19,
     _stream_to_byte_stream,
     )
-from . import (
+from ...tests import (
     test_server,
     )
-from .scenarios import load_tests_apply_scenarios
-from ..transport.memory import MemoryTransport
-from ..transport.remote import (
+from ...tests.scenarios import load_tests_apply_scenarios
+from ...transport.memory import MemoryTransport
+from ...transport.remote import (
     RemoteTransport,
     RemoteSSHTransport,
     RemoteTCPTransport,

=== renamed file 'breezy/tests/test_repository.py' => 'breezy/bzr/tests/test_repository.py'
--- breezy/tests/test_repository.py	2020-01-30 16:13:31 +0000
+++ breezy/bzr/tests/test_repository.py	2020-06-11 01:55:28 +0000
@@ -213,7 +213,7 @@
 
     def test_register_extra_lazy(self):
         self.assertEqual([], self.registry._get_all())
-        self.registry.register_extra_lazy("breezy.tests.test_repository",
+        self.registry.register_extra_lazy(__name__,
                                           "SampleExtraRepositoryFormat")
         formats = self.registry._get_all()
         self.assertEqual(1, len(formats))

=== renamed file 'breezy/tests/test_serializer.py' => 'breezy/bzr/tests/test_serializer.py'
--- breezy/tests/test_serializer.py	2017-06-10 21:59:15 +0000
+++ breezy/bzr/tests/test_serializer.py	2020-06-11 01:55:28 +0000
@@ -18,7 +18,7 @@
 """Tests for the revision/inventory Serializers."""
 
 
-from ..bzr import (
+from .. import (
     chk_serializer,
     serializer,
     xml5,

=== renamed file 'breezy/tests/test_smart.py' => 'breezy/bzr/tests/test_smart.py'
=== renamed file 'breezy/tests/test_smart_request.py' => 'breezy/bzr/tests/test_smart_request.py'
=== renamed file 'breezy/tests/test_smart_signals.py' => 'breezy/bzr/tests/test_smart_signals.py'
=== renamed file 'breezy/tests/test_smart_transport.py' => 'breezy/bzr/tests/test_smart_transport.py'
--- breezy/tests/test_smart_transport.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_smart_transport.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,7 @@
 from testtools.matchers import DocTestMatches
 
 import breezy
-from .. import (
+from ... import (
     controldir,
     debug,
     errors,
@@ -39,10 +39,10 @@
     transport as _mod_transport,
     urlutils,
     )
-from ..bzr import (
+from .. import (
     bzrdir,
     )
-from ..bzr.smart import (
+from ..smart import (
     client,
     medium,
     message,
@@ -51,18 +51,20 @@
     server as _mod_server,
     vfs,
     )
-from . import (
+from ...tests import (
     features,
-    test_smart,
     test_server,
     )
-from ..transport import (
+from ...transport import (
     http,
     local,
     memory,
     remote,
     ssh,
     )
+from . import (
+    test_smart,
+    )
 
 
 def create_file_pipes():

=== added file 'breezy/bzr/tests/test_tag.py'
--- breezy/bzr/tests/test_tag.py	1970-01-01 00:00:00 +0000
+++ breezy/bzr/tests/test_tag.py	2020-06-11 01:55:28 +0000
@@ -0,0 +1,45 @@
+# Copyright (C) 2007, 2009-2012, 2016 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Tests for breezy.bzr.tag."""
+
+
+from breezy.bzr.tag import (
+    BasicTags,
+    )
+from breezy.tests import (
+    TestCase,
+    )
+
+
+class TestTagSerialization(TestCase):
+
+    def test_tag_serialization(self):
+        """Test the precise representation of tag dicts."""
+        # Don't change this after we commit to this format, as it checks
+        # that the format is stable and compatible across releases.
+        #
+        # This release stores them in bencode as a dictionary from name to
+        # target.
+        store = BasicTags(branch=None)
+        td = dict(stable=b'stable-revid', boring=b'boring-revid')
+        packed = store._serialize_tag_dict(td)
+        expected = br'd6:boring12:boring-revid6:stable12:stable-revide'
+        self.assertEqualDiff(packed, expected)
+        self.assertEqual(store._deserialize_tag_dict(packed), td)
+
+
+

=== renamed file 'breezy/tests/test_testament.py' => 'breezy/bzr/tests/test_testament.py'
=== renamed file 'breezy/tests/test_versionedfile.py' => 'breezy/bzr/tests/test_versionedfile.py'
--- breezy/tests/test_versionedfile.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/tests/test_versionedfile.py	2020-06-11 01:55:28 +0000
@@ -16,12 +16,12 @@
 
 """Tests for VersionedFile classes"""
 
-from .. import (
+from ... import (
     errors,
     multiparent,
     tests,
     )
-from ..bzr import (
+from .. import (
     groupcompress,
     versionedfile,
     )

=== renamed file 'breezy/tests/test_weave.py' => 'breezy/bzr/tests/test_weave.py'
--- breezy/tests/test_weave.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_weave.py	2020-06-11 01:55:28 +0000
@@ -24,13 +24,13 @@
 from io import BytesIO
 from pprint import pformat
 
-from .. import (
+from ... import (
     errors,
     )
-from ..osutils import sha_string
+from ...osutils import sha_string
 from . import TestCase, TestCaseInTempDir
-from ..bzr.weave import Weave, WeaveFormatError, WeaveInvalidChecksum
-from ..bzr.weavefile import write_weave, read_weave
+from ..weave import Weave, WeaveFormatError, WeaveInvalidChecksum
+from ..weavefile import write_weave, read_weave
 
 
 # texts for use in testing

=== renamed file 'breezy/tests/test_workingtree_4.py' => 'breezy/bzr/tests/test_workingtree_4.py'
--- breezy/tests/test_workingtree_4.py	2019-09-21 23:05:12 +0000
+++ breezy/bzr/tests/test_workingtree_4.py	2020-06-11 01:55:28 +0000
@@ -20,19 +20,19 @@
 import os
 import time
 
-from .. import (
+from ... import (
     errors,
     osutils,
     )
-from ..bzr import (
+from .. import (
     bzrdir,
     dirstate,
     inventory,
     workingtree_4,
     )
-from ..lockdir import LockDir
-from . import TestCaseWithTransport, TestSkipped, features
-from ..tree import InterTree
+from ...lockdir import LockDir
+from ...tests import TestCaseWithTransport, TestSkipped, features
+from ...tree import InterTree
 
 
 class TestWorkingTreeFormat4(TestCaseWithTransport):
@@ -63,16 +63,10 @@
         # Only the last unlock call will actually reset the
         # ignores. (bug #785671)
         tree = self.make_workingtree()
-        tree.lock_read()
-        try:
-            tree.lock_read()
-            try:
+        with tree.lock_read():
+            with tree.lock_read():
                 tree.is_ignored("foo")
-            finally:
-                tree.unlock()
             self.assertIsNot(None, tree._ignoreglobster)
-        finally:
-            tree.unlock()
         self.assertIs(None, tree._ignoreglobster)
 
     def test_uses_lockdir(self):

=== renamed file 'breezy/tests/test_xml.py' => 'breezy/bzr/tests/test_xml.py'
--- breezy/tests/test_xml.py	2020-02-07 02:14:30 +0000
+++ breezy/bzr/tests/test_xml.py	2020-06-11 01:55:28 +0000
@@ -16,17 +16,17 @@
 
 from io import BytesIO
 
-from .. import (
+from ... import (
     errors,
     fifo_cache,
     )
-from ..bzr import (
+from .. import (
     inventory,
     xml6,
     xml7,
     xml8,
     )
-from ..bzr.inventory import Inventory
+from ..inventory import Inventory
 from . import TestCase
 import breezy.bzr.xml5
 

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2020-02-18 01:57:45 +0000
+++ breezy/bzr/workingtree_4.py	2020-06-11 01:55:28 +0000
@@ -2201,7 +2201,7 @@
     @classmethod
     def make_source_parent_tree_compiled_dirstate(klass, test_case, source,
                                                   target):
-        from ..tests.test__dirstate_helpers import \
+        from .tests.test__dirstate_helpers import \
             compiled_dirstate_helpers_feature
         test_case.requireFeature(compiled_dirstate_helpers_feature)
         from ._dirstate_helpers_pyx import ProcessEntryC

=== modified file 'breezy/git/mapping.py'
--- breezy/git/mapping.py	2020-05-06 02:13:25 +0000
+++ breezy/git/mapping.py	2020-06-11 01:55:28 +0000
@@ -114,6 +114,8 @@
     if b"<" not in text and b">" not in text:
         username = text
         email = text
+    elif b">" not in text:
+        return text + b">"
     else:
         if text.rindex(b">") < text.rindex(b"<"):
             raise ValueError(text)

=== modified file 'breezy/git/remote.py'
--- breezy/git/remote.py	2020-06-01 23:15:18 +0000
+++ breezy/git/remote.py	2020-06-11 01:55:28 +0000
@@ -222,11 +222,13 @@
         return e
     interesting_lines = [
         line for line in stderr_lines
-        if line and line.replace('=', '')]
+        if line and line.replace(b'=', b'')]
     if len(interesting_lines) == 1:
         interesting_line = interesting_lines[0]
-        return parse_git_error(url, interesting_line)
-    return RemoteGitError('\n'.join(stderr_lines))
+        return parse_git_error(
+            url, interesting_line.decode('utf-8', 'surrogateescape'))
+    return RemoteGitError(
+        b'\n'.join(stderr_lines).decode('utf-8', 'surrogateescape'))
 
 
 class GitSmartTransport(Transport):

=== modified file 'breezy/git/tests/test_mapping.py'
--- breezy/git/tests/test_mapping.py	2020-02-18 01:57:45 +0000
+++ breezy/git/tests/test_mapping.py	2020-06-11 01:55:28 +0000
@@ -441,9 +441,14 @@
                          fix_person_identifier(b"[e-mail]"))
 
     def test_fix(self):
-        self.assertEqual(b"person <[e-mail]>",
-                         fix_person_identifier(b"somebody <person <[e-mail]>>"))
-        self.assertEqual(b"person <[e-mail]>",
-                         fix_person_identifier(b"person<[e-mail]>"))
+        self.assertEqual(
+            b"person <[e-mail]>",
+            fix_person_identifier(b"somebody <person <[e-mail]>>"))
+        self.assertEqual(
+            b"person <[e-mail]>",
+            fix_person_identifier(b"person<[e-mail]>"))
+        self.assertEqual(
+            b'Rohan Garg <[e-mail]>',
+            fix_person_identifier(b'Rohan Garg <[e-mail]'))
         self.assertRaises(ValueError,
                           fix_person_identifier, b"person >[e-mail]<")

=== modified file 'breezy/git/tests/test_remote.py'
--- breezy/git/tests/test_remote.py	2020-06-01 23:15:18 +0000
+++ breezy/git/tests/test_remote.py	2020-06-11 01:55:28 +0000
@@ -149,7 +149,7 @@
     def setUp(self):
         super(ParseHangupTests, self).setUp()
         try:
-            HangupException(['foo'])
+            HangupException([b'foo'])
         except TypeError:
             self.skipTest('dulwich version too old')
 
@@ -160,18 +160,18 @@
     def test_single_line(self):
         self.assertEqual(
             RemoteGitError('foo bar'),
-            parse_git_hangup('http://', HangupException(['foo bar'])))
+            parse_git_hangup('http://', HangupException([b'foo bar'])))
 
     def test_multi_lines(self):
         self.assertEqual(
             RemoteGitError('foo bar\nbla bla'),
             parse_git_hangup(
-                'http://', HangupException(['foo bar', 'bla bla'])))
+                'http://', HangupException([b'foo bar', b'bla bla'])))
 
     def test_filter_boring(self):
         self.assertEqual(
             RemoteGitError('foo bar'), parse_git_hangup('http://', HangupException(
-                ['=======', 'foo bar', '======'])))
+                [b'=======', b'foo bar', b'======'])))
 
     def test_permission_denied(self):
         self.assertEqual(
@@ -179,8 +179,8 @@
             parse_git_hangup(
                 'http://',
                 HangupException(
-                    ['=======',
-                     'You are not allowed to push code to this project.', '', '======'])))
+                    [b'=======',
+                     b'You are not allowed to push code to this project.', b'', b'======'])))
 
 
 class TestRemoteGitBranchFormat(TestCase):

=== modified file 'breezy/plugins/weave_fmt/repository.py'
--- breezy/plugins/weave_fmt/repository.py	2020-02-18 01:57:45 +0000
+++ breezy/plugins/weave_fmt/repository.py	2020-06-11 01:55:28 +0000
@@ -863,7 +863,7 @@
                     self.source._eliminate_revisions_not_present(
                         required_revisions))
             if limit is not None:
-                topo_ordered = self.get_graph().iter_topo_order(result_set)
+                topo_ordered = self.source.get_graph().iter_topo_order(result_set)
                 result_set = set(itertools.islice(topo_ordered, limit))
             return self.source.revision_ids_to_search_result(result_set)
 

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2020-02-18 01:57:45 +0000
+++ breezy/tests/__init__.py	2020-06-11 01:55:28 +0000
@@ -3962,6 +3962,41 @@
 def _test_suite_testmod_names():
     """Return the standard list of test module names to test."""
     return [
+        'breezy.bzr.tests.test_dirstate',
+        'breezy.bzr.tests.per_bzrdir',
+        'breezy.bzr.tests.per_inventory',
+        'breezy.bzr.tests.per_pack_repository',
+        'breezy.bzr.tests.per_repository_chk',
+        'breezy.bzr.tests.per_repository_vf',
+        'breezy.bzr.tests.per_versionedfile',
+        'breezy.bzr.tests.test_groupcompress',
+        'breezy.bzr.tests.test_btree_index',
+        'breezy.bzr.tests.test_chk_map',
+        'breezy.bzr.tests.test_chk_serializer',
+        'breezy.bzr.tests.test_generate_ids',
+        'breezy.bzr.tests.test_index',
+        'breezy.bzr.tests.test_inv',
+        'breezy.bzr.tests.test_inventory_delta',
+        'breezy.bzr.tests.test_knit',
+        'breezy.bzr.tests.test_matchers',
+        'breezy.bzr.tests.test_pack',
+        'breezy.bzr.tests.test_remote',
+        'breezy.bzr.tests.test_repository',
+        'breezy.bzr.tests.test_smart',
+        'breezy.bzr.tests.test_smart_request',
+        'breezy.bzr.tests.test_smart_signals',
+        'breezy.bzr.tests.test_smart_transport',
+        'breezy.bzr.tests.test_versionedfile',
+        'breezy.bzr.tests.test_serializer',
+        'breezy.bzr.tests.test_tag',
+        'breezy.bzr.tests.test_testament',
+        'breezy.bzr.tests.test_weave',
+        'breezy.bzr.tests.test_workingtree_4',
+        'breezy.bzr.tests.test_xml',
+        'breezy.bzr.tests.test__btree_serializer',
+        'breezy.bzr.tests.test__chk_map',
+        'breezy.bzr.tests.test__dirstate_helpers',
+        'breezy.bzr.tests.test__groupcompress',
         'breezy.git.tests.test_blackbox',
         'breezy.git.tests.test_builder',
         'breezy.git.tests.test_branch',
@@ -3987,34 +4022,23 @@
         'breezy.tests.blackbox',
         'breezy.tests.commands',
         'breezy.tests.per_branch',
-        'breezy.tests.per_bzrdir',
         'breezy.tests.per_controldir',
         'breezy.tests.per_controldir_colo',
         'breezy.tests.per_foreign_vcs',
         'breezy.tests.per_interrepository',
         'breezy.tests.per_intertree',
-        'breezy.tests.per_inventory',
         'breezy.tests.per_interbranch',
         'breezy.tests.per_lock',
         'breezy.tests.per_merger',
         'breezy.tests.per_transport',
         'breezy.tests.per_tree',
-        'breezy.tests.per_pack_repository',
         'breezy.tests.per_repository',
-        'breezy.tests.per_repository_chk',
         'breezy.tests.per_repository_reference',
-        'breezy.tests.per_repository_vf',
         'breezy.tests.per_uifactory',
-        'breezy.tests.per_versionedfile',
         'breezy.tests.per_workingtree',
         'breezy.tests.test__annotator',
         'breezy.tests.test__bencode',
-        'breezy.tests.test__btree_serializer',
-        'breezy.tests.test__chk_map',
-        'breezy.tests.test__dirstate_helpers',
-        'breezy.tests.test__groupcompress',
         'breezy.tests.test__known_graph',
-        'breezy.tests.test__rio',
         'breezy.tests.test__simple_set',
         'breezy.tests.test__static_tuple',
         'breezy.tests.test__walkdirs_win32',
@@ -4026,14 +4050,11 @@
         'breezy.tests.test_bisect_multi',
         'breezy.tests.test_branch',
         'breezy.tests.test_branchbuilder',
-        'breezy.tests.test_btree_index',
         'breezy.tests.test_bugtracker',
         'breezy.tests.test_bundle',
         'breezy.tests.test_bzrdir',
         'breezy.tests.test__chunks_to_lines',
         'breezy.tests.test_cache_utf8',
-        'breezy.tests.test_chk_map',
-        'breezy.tests.test_chk_serializer',
         'breezy.tests.test_chunk_writer',
         'breezy.tests.test_clean_tree',
         'breezy.tests.test_cmdline',
@@ -4051,7 +4072,6 @@
         'breezy.tests.test_debug',
         'breezy.tests.test_diff',
         'breezy.tests.test_directory_service',
-        'breezy.tests.test_dirstate',
         'breezy.tests.test_email_message',
         'breezy.tests.test_eol_filters',
         'breezy.tests.test_errors',
@@ -4068,12 +4088,10 @@
         'breezy.tests.test_filter_tree',
         'breezy.tests.test_foreign',
         'breezy.tests.test_generate_docs',
-        'breezy.tests.test_generate_ids',
         'breezy.tests.test_globbing',
         'breezy.tests.test_gpg',
         'breezy.tests.test_graph',
         'breezy.tests.test_grep',
-        'breezy.tests.test_groupcompress',
         'breezy.tests.test_hashcache',
         'breezy.tests.test_help',
         'breezy.tests.test_hooks',
@@ -4084,12 +4102,8 @@
         'breezy.tests.test_i18n',
         'breezy.tests.test_identitymap',
         'breezy.tests.test_ignores',
-        'breezy.tests.test_index',
         'breezy.tests.test_import_tariff',
         'breezy.tests.test_info',
-        'breezy.tests.test_inv',
-        'breezy.tests.test_inventory_delta',
-        'breezy.tests.test_knit',
         'breezy.tests.test_lazy_import',
         'breezy.tests.test_lazy_regex',
         'breezy.tests.test_library_state',
@@ -4118,7 +4132,6 @@
         'breezy.tests.test_options',
         'breezy.tests.test_osutils',
         'breezy.tests.test_osutils_encodings',
-        'breezy.tests.test_pack',
         'breezy.tests.test_patch',
         'breezy.tests.test_patches',
         'breezy.tests.test_permissions',
@@ -4130,30 +4143,24 @@
         'breezy.tests.test_reconcile',
         'breezy.tests.test_reconfigure',
         'breezy.tests.test_registry',
-        'breezy.tests.test_remote',
         'breezy.tests.test_rename_map',
-        'breezy.tests.test_repository',
         'breezy.tests.test_revert',
         'breezy.tests.test_revision',
         'breezy.tests.test_revisionspec',
         'breezy.tests.test_revisiontree',
         'breezy.tests.test_rio',
+        'breezy.tests.test__rio',
         'breezy.tests.test_rules',
         'breezy.tests.test_url_policy_open',
         'breezy.tests.test_sampler',
         'breezy.tests.test_scenarios',
         'breezy.tests.test_script',
         'breezy.tests.test_selftest',
-        'breezy.tests.test_serializer',
         'breezy.tests.test_setup',
         'breezy.tests.test_sftp_transport',
         'breezy.tests.test_shelf',
         'breezy.tests.test_shelf_ui',
-        'breezy.tests.test_smart',
         'breezy.tests.test_smart_add',
-        'breezy.tests.test_smart_request',
-        'breezy.tests.test_smart_signals',
-        'breezy.tests.test_smart_transport',
         'breezy.tests.test_smtp_connection',
         'breezy.tests.test_source',
         'breezy.tests.test_ssh_transport',
@@ -4164,7 +4171,6 @@
         'breezy.tests.test_symbol_versioning',
         'breezy.tests.test_tag',
         'breezy.tests.test_test_server',
-        'breezy.tests.test_testament',
         'breezy.tests.test_textfile',
         'breezy.tests.test_textmerge',
         'breezy.tests.test_cethread',
@@ -4188,16 +4194,12 @@
         'breezy.tests.test_utextwrap',
         'breezy.tests.test_version',
         'breezy.tests.test_version_info',
-        'breezy.tests.test_versionedfile',
         'breezy.tests.test_vf_search',
         'breezy.tests.test_views',
-        'breezy.tests.test_weave',
         'breezy.tests.test_whitebox',
         'breezy.tests.test_win32utils',
         'breezy.tests.test_workingtree',
-        'breezy.tests.test_workingtree_4',
         'breezy.tests.test_wsgi',
-        'breezy.tests.test_xml',
         ]
 
 

=== modified file 'breezy/tests/blackbox/test_annotate.py'
--- breezy/tests/blackbox/test_annotate.py	2019-06-16 17:36:59 +0000
+++ breezy/tests/blackbox/test_annotate.py	2020-06-11 01:55:28 +0000
@@ -29,7 +29,7 @@
     tests,
     )
 
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.urlutils import joinpath
 
 from ..test_bedding import override_whoami

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2020-04-02 01:37:43 +0000
+++ breezy/tests/blackbox/test_branch.py	2020-06-11 01:55:28 +0000
@@ -38,7 +38,7 @@
     HardlinkFeature,
     )
 from breezy.tests.blackbox import test_switch
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.tests.test_sftp_transport import TestCaseWithSFTPServer
 from breezy.tests.script import run_script
 from breezy.urlutils import local_path_to_url, strip_trailing_slash

=== modified file 'breezy/tests/blackbox/test_break_lock.py'
--- breezy/tests/blackbox/test_break_lock.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_break_lock.py	2020-06-11 01:55:28 +0000
@@ -24,7 +24,7 @@
     osutils,
     tests,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.tests.script import (
     run_script,
     )

=== modified file 'breezy/tests/blackbox/test_cat.py'
--- breezy/tests/blackbox/test_cat.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_cat.py	2020-06-11 01:55:28 +0000
@@ -19,7 +19,7 @@
 """
 
 from ... import tests
-from ..matchers import ContainsNoVfsCalls
+from ...bzr.tests.matchers import ContainsNoVfsCalls
 from ...transport import memory
 
 

=== modified file 'breezy/tests/blackbox/test_checkout.py'
--- breezy/tests/blackbox/test_checkout.py	2020-01-19 13:07:15 +0000
+++ breezy/tests/blackbox/test_checkout.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,7 @@
 from breezy.tests import (
     TestCaseWithTransport,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.tests.features import (
     HardlinkFeature,
     )

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/blackbox/test_commit.py	2020-06-11 01:55:28 +0000
@@ -36,7 +36,7 @@
     features,
     )
 from .. import TestCaseWithTransport
-from ..matchers import ContainsNoVfsCalls
+from ...bzr.tests.matchers import ContainsNoVfsCalls
 from ..test_bedding import override_whoami
 
 

=== modified file 'breezy/tests/blackbox/test_config.py'
--- breezy/tests/blackbox/test_config.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_config.py	2020-06-11 01:55:28 +0000
@@ -25,7 +25,7 @@
     script,
     test_config as _t_config,
     )
-from ..matchers import ContainsNoVfsCalls
+from ...bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestWithoutConfig(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_export.py'
--- breezy/tests/blackbox/test_export.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/blackbox/test_export.py	2020-06-11 01:55:28 +0000
@@ -35,7 +35,7 @@
     features,
     TestCaseWithTransport,
     )
-from ..matchers import ContainsNoVfsCalls
+from ...bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestExport(TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_info.py'
--- breezy/tests/blackbox/test_info.py	2019-09-21 19:27:04 +0000
+++ breezy/tests/blackbox/test_info.py	2020-06-11 01:55:28 +0000
@@ -33,7 +33,7 @@
 from breezy.bzr import (
     bzrdir,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.transport import memory
 
 

=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2020-02-18 01:57:45 +0000
+++ breezy/tests/blackbox/test_log.py	2020-06-11 01:55:28 +0000
@@ -31,7 +31,7 @@
     test_log,
     features,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):

=== modified file 'breezy/tests/blackbox/test_ls.py'
--- breezy/tests/blackbox/test_ls.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_ls.py	2020-06-11 01:55:28 +0000
@@ -20,7 +20,7 @@
     ignores,
     tests,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestLS(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_pack.py'
--- breezy/tests/blackbox/test_pack.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_pack.py	2020-06-11 01:55:28 +0000
@@ -19,7 +19,7 @@
 import os
 
 from breezy import tests
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestPack(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2019-09-01 15:33:59 +0000
+++ breezy/tests/blackbox/test_push.py	2020-06-11 01:55:28 +0000
@@ -41,7 +41,7 @@
     script,
     test_foreign,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.transport import memory
 
 

=== modified file 'breezy/tests/blackbox/test_reconcile.py'
--- breezy/tests/blackbox/test_reconcile.py	2019-05-29 03:22:34 +0000
+++ breezy/tests/blackbox/test_reconcile.py	2020-06-11 01:55:28 +0000
@@ -25,7 +25,7 @@
 from breezy.bzr import (
     inventory,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TrivialTest(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_revno.py'
--- breezy/tests/blackbox/test_revno.py	2018-11-16 11:37:47 +0000
+++ breezy/tests/blackbox/test_revno.py	2020-06-11 01:55:28 +0000
@@ -22,7 +22,7 @@
 
 from breezy import tests
 from breezy.errors import NoSuchRevision
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestRevno(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_rmbranch.py'
--- breezy/tests/blackbox/test_rmbranch.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_rmbranch.py	2020-06-11 01:55:28 +0000
@@ -23,7 +23,7 @@
 from breezy.tests import (
     TestCaseWithTransport,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestRemoveBranch(TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_send.py'
--- breezy/tests/blackbox/test_send.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/blackbox/test_send.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,7 @@
 from .. import (
     scenarios,
     )
-from ..matchers import ContainsNoVfsCalls
+from ...bzr.tests.matchers import ContainsNoVfsCalls
 
 
 load_tests = scenarios.load_tests_apply_scenarios

=== modified file 'breezy/tests/blackbox/test_shared_repository.py'
--- breezy/tests/blackbox/test_shared_repository.py	2019-09-01 15:33:59 +0000
+++ breezy/tests/blackbox/test_shared_repository.py	2020-06-11 01:55:28 +0000
@@ -22,7 +22,7 @@
 from breezy.controldir import ControlDir
 import breezy.errors as errors
 from breezy.tests import TestCaseInTempDir
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestSharedRepo(TestCaseInTempDir):

=== modified file 'breezy/tests/blackbox/test_sign_my_commits.py'
--- breezy/tests/blackbox/test_sign_my_commits.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_sign_my_commits.py	2020-06-11 01:55:28 +0000
@@ -21,7 +21,7 @@
     gpg,
     tests,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class SignMyCommits(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2020-03-22 18:52:18 +0000
+++ breezy/tests/blackbox/test_switch.py	2020-06-11 01:55:28 +0000
@@ -34,7 +34,7 @@
 from breezy.tests.features import UnicodeFilenameFeature
 from breezy.directory_service import directories
 
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestSwitch(TestCaseWithTransport):

=== modified file 'breezy/tests/blackbox/test_tags.py'
--- breezy/tests/blackbox/test_tags.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/blackbox/test_tags.py	2020-06-11 01:55:28 +0000
@@ -35,7 +35,7 @@
     script,
     TestCaseWithTransport,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.workingtree import WorkingTree
 
 

=== modified file 'breezy/tests/blackbox/test_testament.py'
--- breezy/tests/blackbox/test_testament.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/blackbox/test_testament.py	2020-06-11 01:55:28 +0000
@@ -18,7 +18,7 @@
 
 import re
 
-from breezy.tests.test_testament import (
+from breezy.bzr.tests.test_testament import (
     osutils,
     REV_1_SHORT,
     REV_1_SHORT_STRICT,

=== modified file 'breezy/tests/blackbox/test_uncommit.py'
--- breezy/tests/blackbox/test_uncommit.py	2019-02-16 17:54:34 +0000
+++ breezy/tests/blackbox/test_uncommit.py	2020-06-11 01:55:28 +0000
@@ -22,7 +22,7 @@
 from breezy.bzr.bzrdir import BzrDirMetaFormat1
 from breezy.errors import BoundBranchOutOfDate
 from breezy.tests import TestCaseWithTransport
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 from breezy.tests.script import (
     run_script,
     ScriptRunner,

=== modified file 'breezy/tests/blackbox/test_verify_signatures.py'
--- breezy/tests/blackbox/test_verify_signatures.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_verify_signatures.py	2020-06-11 01:55:28 +0000
@@ -21,7 +21,7 @@
     gpg,
     tests,
     )
-from breezy.tests.matchers import ContainsNoVfsCalls
+from breezy.bzr.tests.matchers import ContainsNoVfsCalls
 
 
 class TestVerifySignatures(tests.TestCaseWithTransport):

=== modified file 'breezy/tests/matchers.py'
--- breezy/tests/matchers.py	2020-02-13 23:57:28 +0000
+++ breezy/tests/matchers.py	2020-06-11 01:55:28 +0000
@@ -30,7 +30,6 @@
     'HasLayout',
     'HasPathRelations',
     'MatchesAncestry',
-    'ContainsNoVfsCalls',
     'ReturnsUnlockable',
     'RevisionHistoryMatches',
     ]
@@ -39,16 +38,8 @@
     osutils,
     revision as _mod_revision,
     )
-from .. import lazy_import
-lazy_import.lazy_import(globals(),
-                        """
-from breezy.bzr.smart.request import request_handlers as smart_request_handlers
-from breezy.bzr.smart import vfs
-""")
-from ..tree import (
-    find_previous_path,
-    InterTree,
-    )
+
+from ..tree import InterTree
 
 from testtools.matchers import Equals, Mismatch, Matcher
 
@@ -278,37 +269,3 @@
                 branch.last_revision(), [_mod_revision.NULL_REVISION]))
             history.reverse()
         return Equals(self.expected).match(history)
-
-
-class _NoVfsCallsMismatch(Mismatch):
-    """Mismatch describing a list of HPSS calls which includes VFS requests."""
-
-    def __init__(self, vfs_calls):
-        self.vfs_calls = vfs_calls
-
-    def describe(self):
-        return "no VFS calls expected, got: %s" % ",".join([
-            "%s(%s)" % (c.method,
-                        ", ".join([repr(a) for a in c.args])) for c in self.vfs_calls])
-
-
-class ContainsNoVfsCalls(Matcher):
-    """Ensure that none of the specified calls are HPSS calls."""
-
-    def __str__(self):
-        return 'ContainsNoVfsCalls()'
-
-    @classmethod
-    def match(cls, hpss_calls):
-        vfs_calls = []
-        for call in hpss_calls:
-            try:
-                request_method = smart_request_handlers.get(call.call.method)
-            except KeyError:
-                # A method we don't know about doesn't count as a VFS method.
-                continue
-            if issubclass(request_method, vfs.VfsRequest):
-                vfs_calls.append(call.call)
-        if len(vfs_calls) == 0:
-            return None
-        return _NoVfsCallsMismatch(vfs_calls)

=== modified file 'breezy/tests/per_branch/test_branch.py'
--- breezy/tests/per_branch/test_branch.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/per_branch/test_branch.py	2020-06-11 01:55:28 +0000
@@ -37,7 +37,6 @@
     tree as _mod_tree,
     )
 from breezy.bzr import (
-    branch as _mod_bzrbranch,
     remote,
     )
 from breezy.tests import (
@@ -257,7 +256,7 @@
         """
         t = self.get_transport()
         branch = self.make_branch('bzr.dev')
-        if not isinstance(branch, _mod_bzrbranch.BzrBranch):
+        if not branch.repository._format.supports_storing_branch_nick:
             raise tests.TestNotApplicable("not a bzr branch format")
         # The nick will be 'bzr.dev', because there is no explicit nick set.
         self.assertEqual(branch.nick, 'bzr.dev')

=== modified file 'breezy/tests/per_interrepository/test_fetch.py'
--- breezy/tests/per_interrepository/test_fetch.py	2019-05-29 03:22:34 +0000
+++ breezy/tests/per_interrepository/test_fetch.py	2020-06-11 01:55:28 +0000
@@ -520,7 +520,7 @@
             self.assertRaises(errors.RevisionNotPresent, target.fetch, source)
         except errors.NoRoundtrippingSupport:
             raise TestNotApplicable('roundtripping not supported')
-        self.assertFalse(target.has_revision('b'))
+        self.assertFalse(target.has_revision(b'b'))
 
     def test_fetch_funky_file_id(self):
         from_tree = self.make_branch_and_tree('tree')

=== modified file 'breezy/tests/test__static_tuple.py'
--- breezy/tests/test__static_tuple.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test__static_tuple.py	2020-06-11 01:55:28 +0000
@@ -443,7 +443,15 @@
             refs = strs + [self.module.StaticTuple]
         else:
             refs = strs
-        self.assertEqual(sorted(refs), sorted(scanner.get_referents(k)))
+        def key(k):
+            if isinstance(k, type):
+                return (0, k)
+            if isinstance(k, str):
+                return (1, k)
+            raise TypeError(k)
+        self.assertEqual(
+            sorted(refs, key=key),
+            sorted(scanner.get_referents(k), key=key))
 
     def test_nested_referents(self):
         self.requireFeature(features.meliae)
@@ -455,8 +463,15 @@
         refs = [k1, k2]
         if self.module is _static_tuple_py:
             refs.append(self.module.StaticTuple)
-        self.assertEqual(sorted(refs),
-                         sorted(scanner.get_referents(k3)))
+        def key(k):
+            if isinstance(k, type):
+                return (0, k)
+            if isinstance(k, self.module.StaticTuple):
+                return (1, k)
+            raise TypeError(k)
+
+        self.assertEqual(sorted(refs, key=key),
+                         sorted(scanner.get_referents(k3), key=key))
 
     def test_empty_is_singleton(self):
         key = self.module.StaticTuple()

=== modified file 'breezy/tests/test_commit.py'
--- breezy/tests/test_commit.py	2019-09-27 02:48:17 +0000
+++ breezy/tests/test_commit.py	2020-06-11 01:55:28 +0000
@@ -529,11 +529,8 @@
         bound = master.sprout('bound')
         wt = bound.open_workingtree()
         wt.branch.set_bound_location(os.path.realpath('master'))
-        master_branch.lock_write()
-        try:
+        with master_branch.lock_write():
             self.assertRaises(LockContention, wt.commit, 'silly')
-        finally:
-            master_branch.unlock()
 
     def test_commit_bound_merge(self):
         # see bug #43959; commit of a merge in a bound branch fails to push

=== modified file 'breezy/tests/test_http_response.py'
--- breezy/tests/test_http_response.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_http_response.py	2020-06-11 01:55:28 +0000
@@ -88,6 +88,10 @@
         f = response.ResponseFile('many', BytesIO(b'0\n1\nboo!\n'))
         self.assertEqual([b'0\n', b'1\n', b'boo!\n'], list(f))
 
+    def test_readlines(self):
+        f = response.ResponseFile('many', BytesIO(b'0\n1\nboo!\n'))
+        self.assertEqual([b'0\n', b'1\n', b'boo!\n'], f.readlines())
+
 
 class TestHTTPConnection(tests.TestCase):
 

=== modified file 'breezy/tests/test_lockable_files.py'
--- breezy/tests/test_lockable_files.py	2018-06-22 01:50:22 +0000
+++ breezy/tests/test_lockable_files.py	2020-06-11 01:55:28 +0000
@@ -26,7 +26,7 @@
     TestCaseInTempDir,
     TestNotApplicable,
     )
-from .test_smart import TestCaseWithSmartMedium
+from ..bzr.tests.test_smart import TestCaseWithSmartMedium
 from .test_transactions import DummyWeave
 from ..transactions import (PassThroughTransaction,
                             ReadOnlyTransaction,

=== modified file 'breezy/tests/test_matchers.py'
--- breezy/tests/test_matchers.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_matchers.py	2020-06-11 01:55:28 +0000
@@ -18,8 +18,6 @@
 
 from testtools.matchers import *
 
-from ..bzr.smart.client import CallHookParams
-
 from . import (
     CapturedCall,
     TestCase,
@@ -177,36 +175,6 @@
         self.assertIsNot(None, mismatch)
 
 
-class TestContainsNoVfsCalls(TestCase):
-
-    def _make_call(self, method, args):
-        return CapturedCall(CallHookParams(method, args, None, None, None), 0)
-
-    def test__str__(self):
-        self.assertEqual("ContainsNoVfsCalls()", str(ContainsNoVfsCalls()))
-
-    def test_empty(self):
-        self.assertIs(None, ContainsNoVfsCalls().match([]))
-
-    def test_no_vfs_calls(self):
-        calls = [self._make_call("Branch.get_config_file", [])]
-        self.assertIs(None, ContainsNoVfsCalls().match(calls))
-
-    def test_ignores_unknown(self):
-        calls = [self._make_call("unknown", [])]
-        self.assertIs(None, ContainsNoVfsCalls().match(calls))
-
-    def test_match(self):
-        calls = [self._make_call(b"append", [b"file"]),
-                 self._make_call(b"Branch.get_config_file", [])]
-        mismatch = ContainsNoVfsCalls().match(calls)
-        self.assertIsNot(None, mismatch)
-        self.assertEqual([calls[0].call], mismatch.vfs_calls)
-        self.assertIn(mismatch.describe(), [
-            "no VFS calls expected, got: b'append'(b'file')",
-            "no VFS calls expected, got: append('file')"])
-
-
 class TestRevisionHistoryMatches(TestCaseWithTransport):
 
     def test_empty(self):

=== modified file 'breezy/tests/test_selftest.py'
--- breezy/tests/test_selftest.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_selftest.py	2020-06-11 01:55:28 +0000
@@ -541,7 +541,7 @@
         self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
 
     def test_assertEqualStat_equal(self):
-        from .test_dirstate import _FakeStat
+        from ..bzr.tests.test_dirstate import _FakeStat
         self.build_tree(["foo"])
         real = os.lstat("foo")
         fake = _FakeStat(real.st_size, real.st_mtime, real.st_ctime,

=== modified file 'breezy/tests/test_server.py'
--- breezy/tests/test_server.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_server.py	2020-06-11 01:55:28 +0000
@@ -246,10 +246,6 @@
 
 class TestThread(cethread.CatchingExceptionThread):
 
-    if not getattr(cethread.CatchingExceptionThread, 'is_alive', None):
-        def is_alive(self):
-            return self.isAlive()
-
     def join(self, timeout=5):
         """Overrides to use a default timeout.
 

=== modified file 'breezy/tests/test_tag.py'
--- breezy/tests/test_tag.py	2020-02-18 02:17:28 +0000
+++ breezy/tests/test_tag.py	2020-06-11 01:55:28 +0000
@@ -25,32 +25,12 @@
     DisabledTags,
     MemoryTags,
     )
-from breezy.bzr.tag import (
-    BasicTags,
-    )
 from breezy.tests import (
     TestCase,
     TestCaseWithTransport,
     )
 
 
-class TestTagSerialization(TestCase):
-
-    def test_tag_serialization(self):
-        """Test the precise representation of tag dicts."""
-        # Don't change this after we commit to this format, as it checks
-        # that the format is stable and compatible across releases.
-        #
-        # This release stores them in bencode as a dictionary from name to
-        # target.
-        store = BasicTags(branch=None)
-        td = dict(stable=b'stable-revid', boring=b'boring-revid')
-        packed = store._serialize_tag_dict(td)
-        expected = br'd6:boring12:boring-revid6:stable12:stable-revide'
-        self.assertEqualDiff(packed, expected)
-        self.assertEqual(store._deserialize_tag_dict(packed), td)
-
-
 class TestTagRevisionRenames(TestCaseWithTransport):
 
     def make_branch_supporting_tags(self, relpath):

=== modified file 'breezy/tests/test_upstream_import.py'
--- breezy/tests/test_upstream_import.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_upstream_import.py	2020-06-11 01:55:28 +0000
@@ -26,7 +26,7 @@
     revision as _mod_revision,
     transform
     )
-from ..bzr.bzrdir import BzrDir
+from ..controldir import ControlDir
 from ..export import export
 from ..upstream_import import (
     common_directory,
@@ -222,7 +222,7 @@
 
     def archive_test(self, builder, importer, subdir=False):
         archive_file = self.make_archive(builder, subdir)
-        tree = BzrDir.create_standalone_workingtree('tree')
+        tree = ControlDir.create_standalone_workingtree('tree')
         with tree.lock_write():
             importer(tree, archive_file)
             self.assertTrue(tree.is_versioned('README'))
@@ -244,19 +244,19 @@
 
     def test_untar2(self):
         tar_file = self.make_messed_tar()
-        tree = BzrDir.create_standalone_workingtree('tree')
+        tree = ControlDir.create_standalone_workingtree('tree')
         import_tar(tree, tar_file)
         self.assertTrue(tree.is_versioned('project-0.1/README'))
 
     def test_untar_gzip(self):
         tar_file = self.make_tar(mode='w:gz')
-        tree = BzrDir.create_standalone_workingtree('tree')
+        tree = ControlDir.create_standalone_workingtree('tree')
         import_tar(tree, tar_file)
         self.assertTrue(tree.is_versioned('README'))
 
     def test_no_crash_with_bzrdir(self):
         tar_file = self.make_tar_with_bzrdir()
-        tree = BzrDir.create_standalone_workingtree('tree')
+        tree = ControlDir.create_standalone_workingtree('tree')
         import_tar(tree, tar_file)
         # So long as it did not crash, that should be ok
 

=== modified file 'breezy/tests/test_wsgi.py'
--- breezy/tests/test_wsgi.py	2020-02-07 02:14:30 +0000
+++ breezy/tests/test_wsgi.py	2020-06-11 01:55:28 +0000
@@ -282,7 +282,7 @@
         response_bytes = self.read_response(iterable)
         self.assertEqual('200 OK', self.status)
         # expect a successful response, rather than a jail break error
-        from breezy.tests.test_smart_transport import LoggingMessageHandler
+        from breezy.bzr.tests.test_smart_transport import LoggingMessageHandler
         message_handler = LoggingMessageHandler()
         decoder = protocol.ProtocolThreeDecoder(
             message_handler, expect_version_marker=True)

=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2020-06-01 19:35:12 +0000
+++ breezy/transport/http/__init__.py	2020-06-11 01:55:28 +0000
@@ -1700,8 +1700,9 @@
                        403,
                        404,  # Not found
                        405,  # Method not allowed
-                       416,
-                       422,
+                       409,  # Conflict
+                       416,  # Range not satisfiable
+                       422,  # Unprocessible entity
                        501,  # Not implemented
                        ]
     """The error codes the caller will handle.
@@ -1900,9 +1901,14 @@
 
             @property
             def text(self):
+                if self.status == 204:
+                    return None
                 charset = cgi.parse_header(
                     self._actual.headers['Content-Type'])[1].get('charset')
-                return self.data.decode(charset)
+                if charset:
+                    return self.data.decode(charset)
+                else:
+                    return self.data.decode()
 
             def read(self, amt=None):
                 return self._actual.read(amt)

=== modified file 'breezy/transport/http/response.py'
--- breezy/transport/http/response.py	2020-02-18 01:57:45 +0000
+++ breezy/transport/http/response.py	2020-06-11 01:55:28 +0000
@@ -78,6 +78,11 @@
         self._pos += len(data)
         return data
 
+    def readlines(self, size=None):
+        data = self._file.readlines()
+        self._pos += sum(map(len, data))
+        return data
+
     def __iter__(self):
         while True:
             line = self.readline()

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2020-06-01 19:35:12 +0000
+++ doc/developers/releasing.txt	2020-06-11 01:55:28 +0000
@@ -180,8 +180,8 @@
 The process for releasing an alpha release is therefore:
 - upload a tarball to launchpad,
 - upload a tarball to pypi,
-- mail [e-mail],
-- post an announcement on the home page.  
+- mail [e-mail],[e-mail]
+- post an announcement on the home page.
 
 Uploading tarballs are described below, just use alpha versions (3, 0, 0,
 'alpha', 1) in ``./breezy/__init__.py``

=== modified file 'setup.py'
--- setup.py	2020-06-01 19:35:12 +0000
+++ setup.py	2020-06-11 01:55:28 +0000
@@ -78,6 +78,8 @@
         },
     'tests_require': [
         'testtools',
+        'testtools<=2.4.0;python_version<"3.0"',
+        'python-subunit',
     ],
 }