--- a/tests/run-tests.py Thu Jan 10 16:25:06 2013 +0000
+++ b/tests/run-tests.py Wed Jan 16 20:56:02 2013 +0000
@@ -1125,8 +1125,8 @@
pid, status, fp = waitq.get()
try:
childresults = pickle.load(fp)
- except pickle.UnpicklingError:
- pass
+ except (pickle.UnpicklingError, EOFError):
+ sys.exit(255)
else:
passed += len(childresults['p'])
skipped += len(childresults['s'])
@@ -1221,7 +1221,8 @@
outputcoverage(options)
except KeyboardInterrupt:
failed = True
- print "\ninterrupted!"
+ if not options.child:
+ print "\ninterrupted!"
if failed:
sys.exit(1)
@@ -1251,6 +1252,7 @@
os.environ['no_proxy'] = ''
os.environ['NO_PROXY'] = ''
os.environ['TERM'] = 'xterm'
+ os.environ['PYTHONHASHSEED'] = 'random'
# unset env related to hooks
for k in os.environ.keys():