# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360461088 0
# Node ID 1a87bd40517cb119414a132c76faaee45eb54a45
# Parent  fa2a1c11ae4b33e3d9718ad3b7d2019a5a393f6a# Parent  2ea362720f727e886d8292e388427cf716de89f1
Merge with stable

diff -r fa2a1c11ae4b -r 1a87bd40517c tests/run-tests.py
--- 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():