Merge lp:~vila/bzr/563997-selftest-unicode-reporting into lp:bzr

[Vincent Ladeuil]

Stop using ui.note for selftest strings that may be unicode, its not safe enough [yet].

When a test fails and the associated log or output can contain unicode chars.
ui.note() fails to encode them properly.

I don't know why we still use ui.note there and self.stream.write everywhere else but I
suspect a fallout from the transition to testtools.

AFAICS, there is no need to clear the progress bar so I just replace the ui.notes()
calls with self.stream.write() calls.

Robert, Martin, can you have a look and confirm ?

[Vincent Ladeuil (vila)]

bug #563997 for easier reference.

[Robert Collins (lifeless)]

It looks like ui.note is the more appropriate thing, to me.

[Martin Pool (mbp)]

review: Approve

[Robert Collins (lifeless)]

Queued on 2010-04-16 08:10:22.961453+00:00 now submitted to PQM.

=== modified file 'NEWS'
--- NEWS	2010-04-15 15:03:15 +0000
+++ NEWS	2010-04-15 20:47:31 +0000
@@ -40,6 +40,9 @@
 * ``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
   config as in previous versions of bzrlib. (Robert Collins)
 
+* ``bzr selftest`` should not use ui.note() since it's not unicode safe.
+  (Vincent Ladeuil, #563997)
+
 * Fix glitch in the warning about unclean trees display.
   (Vincent Ladeuil, #562665)
 

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2010-04-15 15:03:15 +0000
+++ bzrlib/tests/__init__.py	2010-04-15 20:47:31 +0000
@@ -489,13 +489,13 @@
         return self._shortened_test_description(test)
 
     def report_error(self, test, err):
-        self.ui.note('ERROR: %s\n    %s\n' % (
+        self.stream.write('ERROR: %s\n    %s\n' % (
             self._test_description(test),
             err[1],
             ))
 
     def report_failure(self, test, err):
-        self.ui.note('FAIL: %s\n    %s\n' % (
+        self.stream.write('FAIL: %s\n    %s\n' % (
             self._test_description(test),
             err[1],
             ))