Align tox.ini with standards.

Change-Id: Iab112bae0187d025b9b0b6c88208d6706093a184

tools/pip-requires

@@ -1,9 +1,4 @@
 argparse
-coverage
 httplib2
-mock
-nose
 prettytable
 simplejson
-pep8==0.6.1
-unittest2

tools/test-requires

@@ -0,0 +1,10 @@
+distribute>=0.6.24
+
+mock
+nose
+nose-exclude
+nosexcover
+openstack.nose_plugin
+pep8>=1.0
+sphinx>=1.1.2
+unittest2

tox.ini

@@ -1,14 +1,46 @@
 [tox]
-envlist = py26,py27
+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
 deps = -r{toxinidir}/tools/pip-requires
-commands = /bin/bash run_tests.sh -N
+       -r{toxinidir}/tools/test-requires
+commands = nosetests
 
 [testenv:pep8]
 deps = pep8
-commands = /bin/bash run_tests.sh -N --pep8
+commands = pep8 --repeat --show-source novaclient setup.py
 
-[testenv:coverage]
-deps = coverage
-commands = /bin/bash run_tests.sh -N --coverage
+[testenv:venv]
+commands = {posargs}
+
+[testenv:cover]
+commands = nosetests --cover-erase --cover-package=novaclient --with-xcoverage
+
+[tox:jenkins]
+downloadcache = ~/cache/pip
+
+[testenv:jenkins26]
+basepython = python2.6
+setenv = NOSE_WITH_XUNIT=1
+deps = file://{toxinidir}/.cache.bundle
+
+[testenv:jenkins27]
+basepython = python2.7
+setenv = NOSE_WITH_XUNIT=1
+deps = file://{toxinidir}/.cache.bundle
+
+[testenv:jenkinscover]
+deps = file://{toxinidir}/.cache.bundle
+setenv = NOSE_WITH_XUNIT=1
+commands = nosetests --cover-erase --cover-package=novaclient --with-xcoverage
+
+[testenv:jenkinsvenv]
+deps = file://{toxinidir}/.cache.bundle
+setenv = NOSE_WITH_XUNIT=1
+commands = {posargs}