Merge "Update tox.ini."

1 files changed, 12 insertions, 26 deletions

diff --git a/tox.ini b/tox.ini
index ae88f54..6362da7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,36 +3,22 @@ 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 = nosetests
+commands = nosetests {posargs}
 
 [testenv:pep8]
-deps = pep8
-commands = pep8 --repeat --show-source openstack tests setup.py
-
-[testenv:pylint]
-deps = pylint
-commands = pylint --rcfile=pylintrc --output-format=parseable openstack
+deps = pep8==1.1
+commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
 
 [testenv:cover]
-commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=openstack
-
-[testenv:sdist]
-commands = python setup.py sdist {posargs}
-
-[testenv:hudson]
-downloadcache = ~/cache/pip
-
-[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 = nosetests --cover-erase --cover-package=openstack --with-xcoverage
+setenv = NOSE_WITH_COVERAGE=1
 
+[testenv:venv]
+commands = {posargs}