Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 29 Jan 2013 22:19:10 +0000
changeset 1209 49ca5f6f1a95
parent 1207 c762ba67e444 (current diff)
parent 1208 9bd54c35af97 (diff)
child 1211 fa2a1c11ae4b
Merge with stable
--- a/tests/run-tests.py	Wed Jan 23 22:30:58 2013 +0000
+++ b/tests/run-tests.py	Tue Jan 29 22:19:10 2013 +0000
@@ -1252,7 +1252,7 @@
     os.environ['no_proxy'] = ''
     os.environ['NO_PROXY'] = ''
     os.environ['TERM'] = 'xterm'
-    os.environ['PYTHONHASHSEED'] = 'random'
+    os.environ['PYTHONHASHSEED'] = os.environ.get('PYTHONHASHSEED', 'random')
 
     # unset env related to hooks
     for k in os.environ.keys():