From 01ebe84e0f0625a84c187c7f777803b5408b6549 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 25 Jul 2014 14:53:06 -0700
Subject: [PATCH] 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 glance 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: Id0175b7a95c0ad07798b4603b5d1dd8e6d414561
(cherry picked from commit 90c07019350adc301fa5d91239ebfb16fcac775f)
---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 493363ecf9..77289e700f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@ envlist = py26,py27,py33,pep8
 skipsdist = True
 
 [testenv]
+# Note the hash seed is set to 0 until glance can be tested with a
+# random hash seed successfully.
 setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
 usedevelop = True
 install_command = pip install --allow-all-external --allow-insecure netaddr -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
@@ -20,7 +23,6 @@ commands =
   flake8 {posargs}
 
 [testenv:cover]
-setenv = VIRTUAL_ENV={envdir}
 commands = python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$'
 
 [testenv:venv]