Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 10 Feb 2013 01:51:28 +0000
changeset 1213 1a87bd40517c
parent 1211 fa2a1c11ae4b (current diff)
parent 1212 2ea362720f72 (diff)
child 1217 09f857c44abe
Merge with stable
--- a/tests/run-tests.py	Fri Feb 08 12:11:51 2013 +0000
+++ b/tests/run-tests.py	Sun Feb 10 01:51:28 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():