summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2014-07-25 15:10:33 -0700
committerClark Boylan <clark.boylan@gmail.com>2014-07-29 09:31:47 -0700
commite8dc61c3fbd511355514d01c7aec4110dbb680fd (patch)
treef800c6ccb74ad5cc1a6b5d6bdf43db33df72541a
parent8cf481c2f24696f541d27ddfe8dbce708a7d4937 (diff)
downloadheat-e8dc61c3fbd511355514d01c7aec4110dbb680fd.tar.gz
Set python hash seed to 0 in tox.ini
New tox (>=1.7.0) sets a random python hash seed by default. This is generally good for testing because it will help keep projects working regardless of the hash seed, but heat unittests don't currently pass with a random hash seed so set it to the python default seed. This change will allow us to use new tox again and remove the restriction on tox<=1.6.1 to run unittests. Redundant setenvs for specific test envs are removed to prevent them from overriding the PYTHONHASHSEED value. Note this change will need to be backported to the stable branches to keep unittests there working with new tox as well. Conflicts: tox.ini Change-Id: I2370759546adee7bf5e20fa214ed7fa1f31d6bfe (cherry picked from commit 47e4a7e12f2287cd938c652f56e96a108d59bfd5)
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 4573eb7bf..26dfdcfbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,10 @@
envlist = py26,py27,pep8,contrib
[testenv]
+# Note the hash seed is set to 0 until heat can be tested with a
+# random hash seed successfully.
setenv = VIRTUAL_ENV={envdir}
+ PYTHONHASHSEED=0
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands =
@@ -26,7 +29,6 @@ commands =
commands = {posargs}
[testenv:cover]
-setenv = VIRTUAL_ENV={envdir}
commands =
python tools/patch_tox_venv.py
python setup.py testr --coverage