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 cinder 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.

Change-Id: Ia55031528d082a1b11da6890447c5584e9e27551

diff --git a/tox.ini b/tox.ini
index 7e4beb99a8ff31314414199488b25c9af30aa886..07c7e66bf1d323bbfff11d7ce3f286413ef5aa72 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@ skipsdist = True
 envlist = py26,py27,py33,pep8
 
 [testenv]
+# Note the hash seed is set to 0 until cinder can be tested with a
+# random hash seed successfully.
 setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
 usedevelop = True
 install_command = pip install {opts} {packages}
 
@@ -26,7 +29,6 @@ commands =
   bash -c "find cinder -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
 
 [testenv:pylint]
-setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        pylint==0.26.0
 commands = bash tools/lintstack.sh
@@ -34,7 +36,6 @@ commands = bash tools/lintstack.sh
 [testenv:cover]
 # Also do not run test_coverage_ext tests while gathering coverage as those
 # tests conflict with coverage.
-setenv = VIRTUAL_ENV={envdir}
 commands =
   python setup.py testr --coverage \
     --testr-args='^(?!.*test.*coverage).*$'