Merge lp:~jelmer/brz/python3-y into lp:brz

[Jelmer Vernooij]

Various fixes for tests on Python 3.

Various fixes for tests on Python 3.

This gets the number of failing tests down to 197.

[Martin Packman (gz)]

Okay, all seems fair enough, thanks.

review: Approve

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

Merging failed
https://ci.breezy-vcs.org/job/land-brz/441/

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2018-07-03 23:54:50 +0000
+++ breezy/branch.py	2018-09-01 19:52:44 +0000
@@ -779,10 +779,9 @@
         # FIXUP this and get_parent in a future branch format bump:
         # read and rewrite the file. RBC 20060125
         if url is not None:
-            # TODO(jelmer): Clean this up for pad.lv/1696545
-            if isinstance(url, text_type) and sys.version_info[0] == 2:
+            if isinstance(url, text_type):
                 try:
-                    url = url.encode('ascii')
+                    url.encode('ascii')
                 except UnicodeEncodeError:
                     raise urlutils.InvalidURL(url,
                         "Urls must be 7-bit ascii, "
@@ -1074,7 +1073,7 @@
         # This is an old-format absolute path to a local branch
         # turn it into a url
         if parent.startswith('/'):
-            parent = urlutils.local_path_to_url(parent.decode('utf8'))
+            parent = urlutils.local_path_to_url(parent)
         try:
             return urlutils.join(self.base[:-1], parent)
         except urlutils.InvalidURLJoin as e:

=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2018-08-23 01:36:15 +0000
+++ breezy/bzr/remote.py	2018-09-01 19:52:44 +0000
@@ -279,7 +279,7 @@
                 make_working_trees=make_working_trees, shared_repo=shared_repo,
                 vfs_only=True)
         except errors.ErrorFromSmartServer as err:
-            _translate_error(err, path=path)
+            _translate_error(err, path=path.decode('utf-8'))
         repo_path = response[0]
         bzrdir_name = response[6]
         require_stacking = response[7]
@@ -2962,7 +2962,7 @@
             stream = self._stop_stream_if_inventory_delta(stream)
         byte_stream = smart_repo._stream_to_byte_stream(
             stream, src_format)
-        resume_tokens = b' '.join(resume_tokens)
+        resume_tokens = b' '.join([token.encode('utf-8') for token in resume_tokens])
         response = client.call_with_body_stream(
             (verb, path, resume_tokens) + lock_args, byte_stream)
         if response[0][0] not in (b'ok', b'missing-basis'):
@@ -2975,7 +2975,7 @@
             return self._resume_stream_with_vfs(response, src_format)
         if response[0][0] == b'missing-basis':
             tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
-            resume_tokens = tokens
+            resume_tokens = [token.decode('utf-8') for token in tokens]
             return resume_tokens, set((entry[0].decode('utf-8'), ) + entry[1:] for entry in missing_keys)
         else:
             self.target_repo.refresh_data()
@@ -2987,6 +2987,7 @@
         """
         if response[0][0] == b'missing-basis':
             tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
+            tokens = [token.decode('utf-8') for token in tokens]
             # Ignore missing_keys, we haven't finished inserting yet
         else:
             tokens = []
@@ -3947,12 +3948,12 @@
         if medium._is_remote_before((1, 15)):
             return self._vfs_set_parent_location(url)
         try:
-            call_url = url or ''
-            if not isinstance(call_url, str):
-                raise AssertionError('url must be a str or None (%s)' % url)
+            call_url = url or u''
+            if isinstance(call_url, text_type):
+                call_url = call_url.encode('utf-8')
             response = self._call(b'Branch.set_parent_location',
                 self._remote_path(), self._lock_token, self._repo_lock_token,
-                call_url.encode('utf-8'))
+                call_url)
         except errors.UnknownSmartMethod:
             medium._remember_remote_is_before((1, 15))
             return self._vfs_set_parent_location(url)

=== modified file 'breezy/delta.py'
--- breezy/delta.py	2018-08-18 16:29:34 +0000
+++ breezy/delta.py	2018-09-01 19:52:44 +0000
@@ -443,7 +443,7 @@
                 if show_more is not None:
                     show_more(item)
                 if show_ids:
-                    to_file.write(' %s' % file_id)
+                    to_file.write(' %s' % file_id.decode('utf-8'))
                 to_file.write('\n')
 
     show_list(delta.removed, 'removed', 'D')

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-08-12 03:16:53 +0000
+++ breezy/git/tree.py	2018-09-01 19:52:44 +0000
@@ -666,11 +666,11 @@
                 continue
             file_id = new_fileid_map.lookup_file_id(newpath_decoded)
             ret.modified.append(
-                (newpath, file_id, mode_kind(newmode),
+                (newpath_decoded, file_id, mode_kind(newmode),
                 (oldsha != newsha), (oldmode != newmode)))
         else:
             file_id = new_fileid_map.lookup_file_id(newpath_decoded)
-            ret.unchanged.append((newpath, file_id, mode_kind(newmode)))
+            ret.unchanged.append((newpath_decoded, file_id, mode_kind(newmode)))
 
     return ret
 

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2018-08-15 19:35:30 +0000
+++ breezy/git/workingtree.py	2018-09-01 19:52:44 +0000
@@ -495,7 +495,8 @@
                     if kind == "directory":
                         user_dirs.append(subp)
                     else:
-                        if subp in self.index:
+                        (index, subpath) = self._lookup_index(subp.encode('utf-8'))
+                        if subpath in index:
                             # Already present
                             continue
                         if subp in conflicts_related:

=== modified file 'breezy/log.py'
--- breezy/log.py	2018-08-06 01:37:23 +0000
+++ breezy/log.py	2018-09-01 19:52:44 +0000
@@ -1684,7 +1684,7 @@
         self.show_properties(revision.rev, indent+offset)
         if self.show_ids or revision.revno is None:
             to_file.write(indent + offset + 'revision-id:%s\n'
-                          % (revision.rev.revision_id,))
+                          % (revision.rev.revision_id.decode('utf-8'),))
         if not revision.rev.message:
             to_file.write(indent + offset + '(no message)\n')
         else:

=== modified file 'breezy/tests/per_merger.py'
--- breezy/tests/per_merger.py	2018-07-27 00:08:00 +0000
+++ breezy/tests/per_merger.py	2018-09-01 19:52:44 +0000
@@ -100,25 +100,26 @@
             self.expectFailure(
                 "lca merge doesn't conflict for move and change",
                 self.assertFileEqual,
-                b'line 1\n'
-                b'<<<<<<< TREE\n'
-                b'line 3\n'
-                b'line 2\n'
-                b'=======\n'
-                b'line 2 to 2.1\n'
-                b'line 3\n'
-                b'>>>>>>> MERGE-SOURCE\n'
-                b'line 4\n', 'this/file1')
+                'line 1\n'
+                '<<<<<<< TREE\n'
+                'line 3\n'
+                'line 2\n'
+                '=======\n'
+                'line 2 to 2.1\n'
+                'line 3\n'
+                '>>>>>>> MERGE-SOURCE\n'
+                'line 4\n', 'this/file1')
         else:
-            self.assertFileEqual(b'line 1\n'
-                b'<<<<<<< TREE\n'
-                b'line 3\n'
-                b'line 2\n'
-                b'=======\n'
-                b'line 2 to 2.1\n'
-                b'line 3\n'
-                b'>>>>>>> MERGE-SOURCE\n'
-                b'line 4\n', 'this/file1')
+            self.assertFileEqual(
+                'line 1\n'
+                '<<<<<<< TREE\n'
+                'line 3\n'
+                'line 2\n'
+                '=======\n'
+                'line 2 to 2.1\n'
+                'line 3\n'
+                '>>>>>>> MERGE-SOURCE\n'
+                'line 4\n', 'this/file1')
 
     def test_modify_conflicts_with_delete(self):
         # If one side deletes a line, and the other modifies that line, then
@@ -147,15 +148,15 @@
         if self.merge_type is _mod_merge.LCAMerger:
             self.expectFailure("lca merge doesn't track deleted lines",
                 self.assertFileEqual,
-                    b'a\n'
-                    b'<<<<<<< TREE\n'
-                    b'b2\n'
-                    b'=======\n'
-                    b'>>>>>>> MERGE-SOURCE\n'
-                    b'c\n'
-                    b'd\n'
-                    b'X\n'
-                    b'e\n', 'test/foo')
+                    'a\n'
+                    '<<<<<<< TREE\n'
+                    'b2\n'
+                    '=======\n'
+                    '>>>>>>> MERGE-SOURCE\n'
+                    'c\n'
+                    'd\n'
+                    'X\n'
+                    'e\n', 'test/foo')
         else:
             self.assertFileEqual(
                 b'a\n'

=== modified file 'breezy/tests/per_pack_repository.py'
--- breezy/tests/per_pack_repository.py	2018-08-23 01:36:15 +0000
+++ breezy/tests/per_pack_repository.py	2018-09-01 19:52:44 +0000
@@ -1114,9 +1114,9 @@
         tree.commit('commit triggering pack')
         tree.branch.push(remote_branch)
         autopack_calls = len([call for call in self.hpss_calls if call ==
-            'PackRepository.autopack'])
+            b'PackRepository.autopack'])
         streaming_calls = len([call for call in self.hpss_calls if call in
-            ('Repository.insert_stream', 'Repository.insert_stream_1.19')])
+            (b'Repository.insert_stream', b'Repository.insert_stream_1.19')])
         if autopack_calls:
             # Non streaming server
             self.assertEqual(1, autopack_calls)

=== modified file 'breezy/tests/per_repository_reference/test_graph.py'
--- breezy/tests/per_repository_reference/test_graph.py	2018-07-27 18:57:21 +0000
+++ breezy/tests/per_repository_reference/test_graph.py	2018-09-01 19:52:44 +0000
@@ -81,10 +81,10 @@
             # this changes in the future, we can change this to:
             # if c.call.method != 'Repository.get_parent_map':
             #    continue
-            self.assertEqual('Repository.get_parent_map', c.call.method)
+            self.assertEqual(b'Repository.get_parent_map', c.call.method)
             args = c.call.args
             location = args[0]
-            self.assertEqual('include-missing:', args[1])
+            self.assertEqual(b'include-missing:', args[1])
             revisions = sorted(args[2:])
             get_parent_map_calls.append((location, revisions))
         self.assertEqual(expected, get_parent_map_calls)
@@ -106,13 +106,13 @@
         self.assertParentMapCalls([
             # One call to stacked to start, which returns F=>E, and that E
             # itself is missing, so when we step, we won't look for it.
-            ('extra/stacked/', [b'F']),
+            (b'extra/stacked/', [b'F']),
             # One fallback call to extra/master, which will return the rest of
             # the history.
-            ('extra/master/', [b'E']),
+            (b'extra/master/', [b'E']),
             # And then one get_parent_map call to the target, to see if it
             # already has any of these revisions.
-            ('extra/target_repo/branch/', [b'A', b'B', b'C', b'D', b'E', b'F']),
+            (b'extra/target_repo/branch/', [b'A', b'B', b'C', b'D', b'E', b'F']),
             ])
         # Before bug #388269 was fixed, there would be a bunch of extra calls
         # to 'extra/stacked', ['D'] then ['C'], then ['B'], then ['A'].

=== modified file 'breezy/tests/test_annotate.py'
--- breezy/tests/test_annotate.py	2018-07-17 17:23:13 +0000
+++ breezy/tests/test_annotate.py	2018-09-01 19:52:44 +0000
@@ -17,6 +17,7 @@
 """Whitebox tests for annotate functionality."""
 
 import codecs
+from io import BytesIO
 
 from .. import (
     annotate,
@@ -422,11 +423,11 @@
         annotate.annotate_file_tree(revtree_1, 'a',
             to_file=to_file, branch=tree1.branch)
 
-        sio = StringIO()
+        sio = BytesIO()
         to_file = codecs.getwriter('ascii')(sio, 'replace')
         annotate.annotate_file_tree(revtree_2, 'b',
             to_file=to_file, branch=tree1.branch)
-        self.assertEqualDiff('2   p?rez   | bye\n', sio.getvalue())
+        self.assertEqualDiff(b'2   p?rez   | bye\n', sio.getvalue())
 
         # test now with unicode file-like
         to_file = StringIOWithEncoding()

=== modified file 'breezy/tests/test_bad_files.py'
--- breezy/tests/test_bad_files.py	2018-06-29 15:36:29 +0000
+++ breezy/tests/test_bad_files.py	2018-09-01 19:52:44 +0000
@@ -23,7 +23,7 @@
     errors,
     )
 from ..sixish import (
-    BytesIO,
+    StringIO,
     )
 from ..status import show_tree_status
 from . import TestCaseWithTransport
@@ -34,7 +34,7 @@
 
 def verify_status(tester, tree, value):
     """Verify the output of show_tree_status"""
-    tof = BytesIO()
+    tof = StringIO()
     show_tree_status(tree, to_file=tof)
     tof.seek(0)
     tester.assertEqual(value, tof.readlines())
@@ -65,9 +65,9 @@
         self.build_tree(['six'])
 
         verify_status(self, wt,
-                          [b'unknown:\n',
-                           b'  a-fifo\n',
-                           b'  six\n'
+                          ['unknown:\n',
+                           '  a-fifo\n',
+                           '  six\n'
                            ])
 
         # We should raise an error if we are adding a bogus file
@@ -75,23 +75,23 @@
 
         # And the list of files shouldn't have been modified
         verify_status(self, wt,
-                          [b'unknown:\n',
-                           b'  a-fifo\n',
-                           b'  six\n'
+                          ['unknown:\n',
+                           '  a-fifo\n',
+                           '  six\n'
                            ])
 
         # Make sure smart_add can handle having a bogus
         # file in the way
         wt.smart_add([])
         verify_status(self, wt,
-                          [b'added:\n',
-                           b'  six\n',
-                           b'unknown:\n',
-                           b'  a-fifo\n',
+                          ['added:\n',
+                           '  six\n',
+                           'unknown:\n',
+                           '  a-fifo\n',
                            ])
         wt.commit("Commit four", rev_id=b"a@u-0-3")
 
         verify_status(self, wt,
-                          [b'unknown:\n',
-                           b'  a-fifo\n',
+                          ['unknown:\n',
+                           '  a-fifo\n',
                            ])

=== modified file 'breezy/tests/test_cache_utf8.py'
--- breezy/tests/test_cache_utf8.py	2018-08-14 22:19:49 +0000
+++ breezy/tests/test_cache_utf8.py	2018-09-01 19:52:44 +0000
@@ -93,9 +93,9 @@
         self.assertIs(xp, yp)
 
     def test_cached_ascii(self):
-        x = '%s %s' % ('simple', 'text')
-        y = '%s %s' % ('simple', 'text')
-        self.assertFalse(x is y)
+        x = b'%s %s' % (b'simple', b'text')
+        y = b'%s %s' % (b'simple', b'text')
+        self.assertIsNot(x, y)
         xp = cache_utf8.get_cached_ascii(x)
         yp = cache_utf8.get_cached_ascii(y)
 

=== modified file 'breezy/tests/test_delta.py'
--- breezy/tests/test_delta.py	2018-06-29 15:36:29 +0000
+++ breezy/tests/test_delta.py	2018-09-01 19:52:44 +0000
@@ -22,6 +22,7 @@
     tests,
     )
 from ..sixish import (
+    PY3,
     StringIO,
     )
 
@@ -39,7 +40,7 @@
 class TestReportChanges(tests.TestCase):
     """Test the new change reporting infrastructure"""
 
-    def assertReport(self, expected, file_id='fid', path='path',
+    def assertReport(self, expected, file_id=b'fid', path='path',
                      versioned_change='unchanged', renamed=False,
                      modified='unchanged', exe_change=False,
                      kind=('file', 'file'), old_path=None,
@@ -54,7 +55,7 @@
                      kind, old_path,
                      unversioned_filter, view_info)
 
-    def assertReportLines(self, expected_lines, file_id='fid', path='path',
+    def assertReportLines(self, expected_lines, file_id=b'fid', path='path',
                      versioned_change='unchanged', renamed=False,
                      modified='unchanged', exe_change=False,
                      kind=('file', 'file'), old_path=None,
@@ -144,7 +145,7 @@
             path="foo", view_info=('my', ['path']))
 
     def assertChangesEqual(self,
-                           file_id='fid',
+                           file_id=b'fid',
                            paths=('path', 'path'),
                            content_change=False,
                            versioned=(True, True),
@@ -259,9 +260,15 @@
         other_delta.kind_changed = [('filename', b'file-id', 'file',
                                      'directory')]
         self.assertEqual(other_delta, delta)
-        self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
-            " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
-            " modified=[], unchanged=[], unversioned=[])", repr(delta))
+        if PY3:
+            self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
+                " kind_changed=[('filename', b'file-id', 'file', 'directory')],"
+                " modified=[], unchanged=[], unversioned=[])", repr(delta))
+        else:
+            self.assertEqualDiff("TreeDelta(added=[], removed=[], renamed=[],"
+                " kind_changed=[(u'filename', 'file-id', 'file', 'directory')],"
+                " modified=[], unchanged=[], unversioned=[])", repr(delta))
+
         self.assertEqual('K  filename (file => directory) file-id\n',
                          self.show_string(delta, show_ids=True,
                          short_status=True))

=== modified file 'breezy/tests/test_log.py'
--- breezy/tests/test_log.py	2018-07-24 21:44:05 +0000
+++ breezy/tests/test_log.py	2018-09-01 19:52:44 +0000
@@ -742,7 +742,7 @@
 
         revision = wt.branch.repository.get_revision(wt.branch.last_revision())
         formatter.show_properties(revision, '')
-        self.assertEqualDiff('''custom_prop_name: test_value\n''',
+        self.assertEqualDiff(b'''custom_prop_name: test_value\n''',
                              sio.getvalue())
 
     def test_show_ids(self):

=== modified file 'python3.passing'
--- python3.passing	2018-08-31 10:23:32 +0000
+++ python3.passing	2018-09-01 19:52:44 +0000
@@ -4999,6 +4999,16 @@
 breezy.tests.per_branch.test_parent.TestParent.test_no_default_parent(RemoteBranchFormat-default)
 breezy.tests.per_branch.test_parent.TestParent.test_no_default_parent(RemoteBranchFormat-v2)
 breezy.tests.per_branch.test_parent.TestParent.test_no_default_parent(RemoteGitBranchFormat)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BranchReferenceFormat)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BzrBranchFormat4)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BzrBranchFormat5)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BzrBranchFormat6)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BzrBranchFormat7)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(BzrBranchFormat8)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(LocalGitBranchFormat)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(RemoteBranchFormat-default)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(RemoteBranchFormat-v2)
+breezy.tests.per_branch.test_parent.TestParent.test_set_get_parent(RemoteGitBranchFormat)
 breezy.tests.per_branch.test_parent.TestParent.test_win32_set_parent_on_another_drive(BranchReferenceFormat)
 breezy.tests.per_branch.test_parent.TestParent.test_win32_set_parent_on_another_drive(BzrBranchFormat4)
 breezy.tests.per_branch.test_parent.TestParent.test_win32_set_parent_on_another_drive(BzrBranchFormat5)
@@ -8298,6 +8308,9 @@
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart(InterRepository,RepositoryFormatKnit1,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart(InterSameDataRepository,RepositoryFormatKnit3,RepositoryFormatKnit3)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart(InterToLocalGitRepository,RepositoryFormat2a,GitRepositoryFormat)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterDifferingSerializer+get_known_graph_ancestry,RepositoryFormatKnitPack1,RepositoryFormatKnitPack6RichRoot)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterDifferingSerializer,RepositoryFormat2a,RepositoryFormatKnitPack6RichRoot)
+breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterDifferingSerializer,RepositoryFormatKnitPack1,RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnit1)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterKnitRepo,RepositoryFormatKnit1,RepositoryFormatKnitPack1)
 breezy.tests.per_interrepository.test_fetch.TestInterRepository.test_fetch_parent_inventories_at_stacking_boundary_smart_old(InterKnitRepo,RepositoryFormatKnit3,RepositoryFormatKnitPack3)
@@ -9575,6 +9588,8 @@
 breezy.tests.per_repository_reference.test_get_rev_id_for_revno.TestGetRevIdForRevno.test_uses_fallback(RepositoryFormatKnitPack6)
 breezy.tests.per_repository_reference.test_get_rev_id_for_revno.TestGetRevIdForRevno.test_uses_fallback(RepositoryFormatKnitPack6RichRoot)
 breezy.tests.per_repository_reference.test_get_rev_id_for_revno.TestGetRevIdForRevno.test_uses_fallback(RepositoryFormatPackDevelopment2Subtree)
+breezy.tests.per_repository_reference.test_graph.TestGraph.test_doesnt_call_get_parent_map_on_all_fallback_revs(RemoteRepositoryFormat-default)
+breezy.tests.per_repository_reference.test_graph.TestGraph.test_doesnt_call_get_parent_map_on_all_fallback_revs(RemoteRepositoryFormat-v2)
 breezy.tests.per_repository_reference.test_graph.TestGraph.test_doesnt_call_get_parent_map_on_all_fallback_revs(RepositoryFormat2a)
 breezy.tests.per_repository_reference.test_graph.TestGraph.test_doesnt_call_get_parent_map_on_all_fallback_revs(RepositoryFormat2aSubtree)
 breezy.tests.per_repository_reference.test_graph.TestGraph.test_doesnt_call_get_parent_map_on_all_fallback_revs(RepositoryFormatKnitPack5)
@@ -21625,6 +21640,7 @@
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat5)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat6)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_can_add_generated_files_explicitly(WorkingTreeFormat6,remote)
+breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_cant_add_generated_files_implicitly(GitWorkingTreeFormat)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_cant_add_generated_files_implicitly(WorkingTreeFormat2)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_cant_add_generated_files_implicitly(WorkingTreeFormat3)
 breezy.tests.per_workingtree.test_smart_add.TestSmartAddConflictRelatedFiles.test_cant_add_generated_files_implicitly(WorkingTreeFormat4)
@@ -22521,6 +22537,7 @@
 breezy.tests.test_annotate.TestAnnotate.test_annotate_limits_dotted_revnos
 breezy.tests.test_annotate.TestAnnotate.test_annotate_show_ids
 breezy.tests.test_annotate.TestAnnotate.test_annotate_shows_dotted_revnos
+breezy.tests.test_annotate.TestAnnotate.test_annotate_unicode_author
 breezy.tests.test_annotate.TestAnnotate.test_annotate_uses_branch_context
 breezy.tests.test_annotate.TestReannotate.test_reannotate
 breezy.tests.test_annotate.TestReannotate.test_reannotate_left_matching_blocks
@@ -22570,6 +22587,7 @@
 breezy.tests.test_atomicfile.TestAtomicFile.test_mode_0666
 breezy.tests.test_atomicfile.TestAtomicFile.test_no_mode
 breezy.tests.test_atomicfile.TestAtomicFile.test_text_mode
+breezy.tests.test_bad_files.TestBadFiles.test_bad_files
 breezy.tests.test__bencode.TestBencodeDecode.test_decoder_type_error(C)
 breezy.tests.test__bencode.TestBencodeDecode.test_decoder_type_error(python)
 breezy.tests.test__bencode.TestBencodeDecode.test_dict(C)
@@ -24337,6 +24355,7 @@
 breezy.tests.test_debug.TestDebugFlags.test_set_single_debug_flags_from_config
 breezy.tests.test_decorators.TestOnlyRaisesDecorator.test_quietly_logs_unapproved_errors
 breezy.tests.test_decorators.TestOnlyRaisesDecorator.test_raises_approved_error
+breezy.tests.test_delta.TestChangesFrom.test_kind_change
 breezy.tests.test_delta.TestDeltaShow.test_long_status
 breezy.tests.test_delta.TestDeltaShow.test_long_status_id_predicate
 breezy.tests.test_delta.TestDeltaShow.test_long_status_path_predicate
@@ -27148,6 +27167,7 @@
 breezy.tests.test_log.TestLongLogFormatter.test_author_in_log
 breezy.tests.test_log.TestLongLogFormatter.test_error_in_properties_handler
 breezy.tests.test_log.TestLongLogFormatter.test_merges_are_indented_by_level
+breezy.tests.test_log.TestLongLogFormatter.test_properties_handler_bad_argument
 breezy.tests.test_log.TestLongLogFormatter.test_properties_in_log
 breezy.tests.test_log.TestLongLogFormatter.test_properties_in_short_log
 breezy.tests.test_log.TestLongLogFormatter.test_show_ids
@@ -27167,11 +27187,13 @@
 breezy.tests.test_log.TestRevisionNotInBranch.test_long_format
 breezy.tests.test_log.TestRevisionNotInBranch.test_many_revisions
 breezy.tests.test_log.TestRevisionNotInBranch.test_one_revision
+breezy.tests.test_log.TestRevisionNotInBranch.test_short_format
 breezy.tests.test_log.TestShortLogFormatter.test_short_log_single_merge_revision
 breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges
 breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges_and_advice
 breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_merges_and_range
 breezy.tests.test_log.TestShortLogFormatter.test_short_log_with_tags
+breezy.tests.test_log.TestShortLogFormatter.test_show_ids
 breezy.tests.test_log.TestShortLogFormatter.test_trailing_newlines
 breezy.tests.test_log.TestShortLogFormatterWithMergeRevisions.test_short_merge_revs_log_single_merge_revision
 breezy.tests.test_log.TestShortLogFormatterWithMergeRevisions.test_short_merge_revs_log_with_merges