Merge lp:~allenap/launchpad/zope-test-in-subprocess-unicode-issue into lp:launchpad

[Gavin Panella]

[testfix][r=jml][ui=none][no-qa] Pass a UTF8 decoded stream reader to subunit.TestProtocolServer.readFrom().

Pass a decoded stream reader to subunit.TestProtocolServer. See the thread containing https://lists.launchpad.net/launchpad-dev/msg05732.html for more information.

[Jonathan Lange (jml)]

Looks good. Maybe a good idea to run a test subclass of ZTIS before submitting.

review: Approve

[Robert Collins (lifeless)]

Uhm, this is probably a terrible idea. subunit is a byte protocol,
throwing unicode at it you should expect to keep both pieces.

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-11-25 14:15:30 +0000
+++ lib/lp/testing/__init__.py	2010-11-25 16:58:55 +0000
@@ -46,6 +46,7 @@
     'ZopeTestInSubProcess',
     ]
 
+import codecs
 from contextlib import contextmanager
 from datetime import (
     datetime,
@@ -864,7 +865,7 @@
             result = super(ZopeTestResult, result)
             # Accept the result from the child process.
             protocol = subunit.TestProtocolServer(result)
-            protocol.readFrom(fdread)
+            protocol.readFrom(codecs.getreader("utf8")(fdread))
             fdread.close()
             os.waitpid(pid, 0)