Merge lp:~jelmer/brz/3.0-encoding into lp:brz/3.0

[Jelmer Vernooij]

Fix bb.test_testament.TestTestament.test_testament_non_ascii on systems where the host encoding is ascii.

Fix bb.test_testament.TestTestament.test_testament_non_ascii on systems where the host encoding is ascii.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/tests/blackbox/test_testament.py'
--- breezy/tests/blackbox/test_testament.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_testament.py	2019-10-27 01:00:11 +0000
@@ -35,28 +35,27 @@
         """Testament containing a file and a directory."""
         out, err = self.run_bzr('testament --long')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_2_TESTAMENT.decode('ascii'))
 
     def test_testament_command_2(self):
         """Command getting short testament of previous version."""
         out, err = self.run_bzr('testament -r1')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_1_SHORT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_1_SHORT.decode('ascii'))
 
     def test_testament_command_3(self):
         """Command getting short testament of previous version."""
         out, err = self.run_bzr('testament -r1 --strict')
         self.assertEqualDiff(err, '')
-        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('utf-8'))
+        self.assertEqualDiff(out, REV_1_SHORT_STRICT.decode('ascii'))
 
     def test_testament_non_ascii(self):
         self.wt.commit(u"Non \xe5ssci message")
-        long_out, err = self.run_bzr('testament --long')
-        self.assertEqualDiff(err, '')
-        short_out, err = self.run_bzr('testament')
-        self.assertEqualDiff(err, '')
-        sha1_re = re.compile('sha1: (?P<sha1>[a-f0-9]+)$', re.M)
+        long_out, err = self.run_bzr_raw('testament --long', encoding='utf-8')
+        self.assertEqualDiff(err, b'')
+        long_out, err = self.run_bzr_raw('testament --long', encoding='ascii')
+        short_out, err = self.run_bzr_raw('testament', encoding='ascii')
+        self.assertEqualDiff(err, b'')
+        sha1_re = re.compile(b'sha1: (?P<sha1>[a-f0-9]+)$', re.M)
         sha1 = sha1_re.search(short_out).group('sha1')
-        self.assertEqual(
-            sha1.encode('ascii'),
-            osutils.sha_string(long_out.encode('utf-8') if PY3 else long_out))
+        self.assertEqual(sha1, osutils.sha_string(long_out))

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2019-10-13 16:48:38 +0000
+++ doc/en/release-notes/brz-3.0.txt	2019-10-27 01:00:11 +0000
@@ -60,6 +60,10 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+ * Fix bb.test_testament.TestTestament.test_testament_non_ascii
+   when the host encoding is non-utf8.
+   (Jelmer Vernooij, #1849986)
+
 
 bzr 3.0.1
 #########