[PATCH] run-tests: open child-parent pipes in binary mode

Siddharth Agarwal sid0 at fb.com
Sat Nov 10 13:39:46 CST 2012


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1352576261 28800
# Node ID 90710c8d95006d65e3358173588923e3a5a462f9
# Parent  7ae632b7138b814de4ddc070cef7d9ca3cf10c6d
run-tests: open child-parent pipes in binary mode

Python's pickle is a binary format.

diff -r 7ae632b7138b -r 90710c8d9500 tests/run-tests.py
--- a/tests/run-tests.py	Fri Nov 09 14:49:30 2012 -0800
+++ b/tests/run-tests.py	Sat Nov 10 11:37:41 2012 -0800
@@ -1071,7 +1071,7 @@
         childopts += ['--tmpdir', childtmp]
         cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job
         vlog(' '.join(cmdline))
-        fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'r')
+        fps[os.spawnvp(os.P_NOWAIT, cmdline[0], cmdline)] = os.fdopen(rfd, 'rb')
         os.close(wfd)
     signal.signal(signal.SIGINT, signal.SIG_IGN)
     failures = 0
@@ -1155,7 +1155,7 @@
         ignored = len(results['i'])
 
         if options.child:
-            fp = os.fdopen(options.child, 'w')
+            fp = os.fdopen(options.child, 'wb')
             pickle.dump(results, fp, pickle.HIGHEST_PROTOCOL)
             if options.time:
                 pickle.dump(times, fp, pickle.HIGHEST_PROTOCOL)


More information about the Mercurial-devel mailing list