Merge lp:~jelmer/brz/commit-message-edit-encoding into lp:brz

[Jelmer Vernooij]

Support situations where osutils.get_user_encoding doesn't support encoding unicode string.

This fixes running the testsuite e.g. when LC_ALL=POSIX.

[Martin Packman (gz)]

Seems fine, though that's dumb behaviour on Python's part.

review: Approve

=== modified file 'breezy/tests/test_msgeditor.py'
--- breezy/tests/test_msgeditor.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/test_msgeditor.py	2017-12-09 03:07:49 +0000
@@ -40,6 +40,7 @@
     TestSkipped,
     multiply_tests,
     probe_bad_non_ascii,
+    probe_unicode_in_user_encoding,
     split_suite_by_re,
     )
 from .EncodingAdapter import encoding_scenarios
@@ -204,7 +205,7 @@
             os.chmod('fed.py', 0o755)
             self.overrideEnv('BRZ_EDITOR', './fed.py')
 
-    def test_edit_commit_message(self):
+    def test_edit_commit_message_without_infotext(self):
         working_tree = self.make_uncommitted_tree()
         self.make_fake_editor()
 
@@ -212,13 +213,27 @@
         self.assertEqual('test message from fed\n',
                          msgeditor.edit_commit_message(''))
 
+    def test_edit_commit_message_with_ascii_infotext(self):
+        working_tree = self.make_uncommitted_tree()
+        self.make_fake_editor()
+
         mutter('edit_commit_message with ascii string infotext')
         self.assertEqual('test message from fed\n',
                          msgeditor.edit_commit_message('spam'))
 
+    def test_edit_commit_message_with_unicode_infotext(self):
+        working_tree = self.make_uncommitted_tree()
+        self.make_fake_editor()
+
         mutter('edit_commit_message with unicode infotext')
+        uni_val, ue_val = probe_unicode_in_user_encoding()
+        if ue_val is None:
+            raise TestSkipped(
+                'Cannot find a unicode character that works in encoding %s'
+                % (osutils.get_user_encoding(),))
+
         self.assertEqual('test message from fed\n',
-                         msgeditor.edit_commit_message(u'\u1234'))
+                         msgeditor.edit_commit_message(uni_val))
 
         tmpl = edit_commit_message_encoded(u'\u1234'.encode("utf8"))
         self.assertEqual('test message from fed\n', tmpl)