Clean up test requires a bit.

The main culprit here was prettytable - but because of the way this was
working, it was causing intermittent transient network issues from pypi in
the devstack gates.

Change-Id: I62117116c850361c5e2de7e6485c14ef43007c1d

1 files changed, 8 insertions, 18 deletions

diff --git a/tox.ini b/tox.ini
index 1536bf1e..402f46ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,15 +3,21 @@ envlist = py26,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
+         NOSE_WITH_OPENSTACK=1
+         NOSE_OPENSTACK_COLOR=1
+         NOSE_OPENSTACK_RED=0.05
+         NOSE_OPENSTACK_YELLOW=0.025
+         NOSE_OPENSTACK_SHOW_ELAPSED=1
+         NOSE_OPENSTACK_STDOUT=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
 commands = bash run_tests.sh -N --no-pep8
 
 [testenv:pep8]
-deps = pep8
+deps = pep8==1.1
 commands = pep8 --exclude=vcsversion.py,*.pyc --repeat --show-source bin keystone setup.py
 
-[testenv:hudson]
+[tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:cover]
@@ -19,19 +25,3 @@ commands = /bin/bash run_tests.sh -N -P --with-xcoverage --cover-erase --cover-p
 
 [testenv:venv]
 commands = {posargs}
-
-[testenv:jenkins26]
-basepython = python2.6
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkins27]
-basepython = python2.7
-deps = file://{toxinidir}/.cache.bundle
-
-[testenv:jenkinscover]
-deps = file://{toxinidir}/.cache.bundle
-commands = /bin/bash run_tests.sh -N -P --with-xcover --cover-erase --cover-package=keystone
-
-[testenv:jenkinsvenv]
-deps = file://{toxinidir}/.cache.bundle
-commands = {posargs}