merge crew heads
authorKevin Bullock <kbullock@ringworld.org>
Sat, 09 Feb 2013 22:27:13 +0000
changeset 18619 c768e3da3cc2
parent 18618 43ffd0279876 (current diff)
parent 18616 35b4affe6fdd (diff)
child 18620 7da487b0256a
merge crew heads
--- a/tests/run-tests.py	Sat Feb 09 22:25:58 2013 +0000
+++ b/tests/run-tests.py	Sat Feb 09 22:27:13 2013 +0000
@@ -52,6 +52,7 @@
 import sys
 import tempfile
 import time
+import random
 import re
 import threading
 import killdaemons as killmod
@@ -1253,7 +1254,11 @@
     os.environ['no_proxy'] = ''
     os.environ['NO_PROXY'] = ''
     os.environ['TERM'] = 'xterm'
-    os.environ['PYTHONHASHSEED'] = os.environ.get('PYTHONHASHSEED', 'random')
+    if 'PYTHONHASHSEED' not in os.environ:
+        # use a random python hash seed all the time
+        # we do the randomness ourself to know what seed is used
+        os.environ['PYTHONHASHSEED'] = str(random.getrandbits(32))
+        print 'python hash seed:', os.environ['PYTHONHASHSEED']
 
     # unset env related to hooks
     for k in os.environ.keys():