diff -Nru bzr-2.7.0+bzr6622/debian/changelog bzr-2.7.0+bzr6622/debian/changelog --- bzr-2.7.0+bzr6622/debian/changelog 2017-11-09 00:23:05.000000000 +0000 +++ bzr-2.7.0+bzr6622/debian/changelog 2017-12-09 02:52:47.000000000 +0000 @@ -1,3 +1,12 @@ +bzr (2.7.0+bzr6622-10) unstable; urgency=medium + + * Add patch 29_commit_message_encoding_test: Fix running of + test_edit_commit_message when locale doesn't support non-ascii + characters. Closes: #883743 + * Bump standard sversion to 4.1.2 (no changes). + + -- Jelmer Vernooij Sat, 09 Dec 2017 02:52:47 +0000 + bzr (2.7.0+bzr6622-9) unstable; urgency=medium * Add patch 28_fix_matchers: fix order of got/expected for matchers to diff -Nru bzr-2.7.0+bzr6622/debian/control bzr-2.7.0+bzr6622/debian/control --- bzr-2.7.0+bzr6622/debian/control 2017-11-09 00:23:05.000000000 +0000 +++ bzr-2.7.0+bzr6622/debian/control 2017-12-09 02:52:47.000000000 +0000 @@ -25,7 +25,7 @@ python-sphinx (>= 1.0.7+dfsg), python-subunit, python-testtools (>= 2.3.0~) -Standards-Version: 4.0.0 +Standards-Version: 4.1.2 X-Python-Version: >= 2.6 Vcs-Bzr: https://anonscm.debian.org/bzr/pkg-bazaar/bzr/2.7/ Vcs-Browser: https://bzr.debian.org/loggerhead/pkg-bazaar/bzr/2.7/ diff -Nru bzr-2.7.0+bzr6622/debian/patches/29_commit_message_encoding_test bzr-2.7.0+bzr6622/debian/patches/29_commit_message_encoding_test --- bzr-2.7.0+bzr6622/debian/patches/29_commit_message_encoding_test 1970-01-01 00:00:00.000000000 +0000 +++ bzr-2.7.0+bzr6622/debian/patches/29_commit_message_encoding_test 2017-12-09 02:52:47.000000000 +0000 @@ -0,0 +1,51 @@ +=== modified file 'bzrlib/tests/test_msgeditor.py' +Index: unstable/bzrlib/tests/test_msgeditor.py +=================================================================== +--- unstable.orig/bzrlib/tests/test_msgeditor.py ++++ unstable/bzrlib/tests/test_msgeditor.py +@@ -40,6 +40,7 @@ from bzrlib.tests import ( + TestSkipped, + multiply_tests, + probe_bad_non_ascii, ++ probe_unicode_in_user_encoding, + split_suite_by_re, + ) + from bzrlib.tests.EncodingAdapter import encoding_scenarios +@@ -204,7 +205,7 @@ if len(sys.argv) == 2: + os.chmod('fed.py', 0755) + self.overrideEnv('BZR_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 @@ if len(sys.argv) == 2: + 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) diff -Nru bzr-2.7.0+bzr6622/debian/patches/series bzr-2.7.0+bzr6622/debian/patches/series --- bzr-2.7.0+bzr6622/debian/patches/series 2017-11-09 00:23:05.000000000 +0000 +++ bzr-2.7.0+bzr6622/debian/patches/series 2017-12-09 02:52:47.000000000 +0000 @@ -10,3 +10,4 @@ 26_refresh_test_keys 27_fix_sec_ssh 28_fix_matchers +29_commit_message_encoding_test