Rev 5168: (lifeless) Set unbuffered mode in --parallel so that line endings are not mangled on win32. (Gordon Tyler) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5168 [merge]
revision-id: pqm at pqm.ubuntu.com-20100420103030-1jqyxyc47v1btkp2
parent: pqm at pqm.ubuntu.com-20100420041650-t13bfii1es5mh3x9
parent: gordon at doxxx.net-20100420031511-rp247hm0qo9zug25
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-04-20 11:30:30 +0100
message:
  (lifeless) Set unbuffered mode in --parallel so that line endings are not mangled on win32. (Gordon Tyler)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
=== modified file 'NEWS'
--- a/NEWS	2010-04-20 04:16:50 +0000
+++ b/NEWS	2010-04-20 10:30:30 +0000
@@ -129,6 +129,8 @@
 Testing
 *******
 
+* ``bzr selftest --parallel=subprocess`` now works correctly on win32.
+  (Gordon Tyler, #551332)
 
 bzr 2.2.0b1
 ###########

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2010-04-16 13:39:50 +0000
+++ b/bzrlib/tests/__init__.py	2010-04-20 03:00:52 +0000
@@ -3276,7 +3276,9 @@
         bzr_path = [bzr_path]
         if sys.platform == "win32":
             # if we're on windows, we can't execute the bzr script directly
-            bzr_path = [sys.executable] + bzr_path
+            # and we have to enable unbuffered binary stdout/stderr so that
+            # automatic CRLF conversion doesn't corrupt the subunit streams
+            bzr_path = [sys.executable, '-u'] + bzr_path
         fd, test_list_file_name = tempfile.mkstemp()
         test_list_file = os.fdopen(fd, 'wb', 1)
         for test in process_tests: