From 48daa427fadedc962810f44d75103ed138c212ed Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 25 Jan 2012 01:23:12 -0800
Subject: [PATCH] Make tox config work.

Change-Id: Ic81c7bb0fa2fe5c73200a9195630a0d5bb999e7d
---
 tox.ini | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tox.ini b/tox.ini
index 0876fd1bb5b..20f344d22cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,13 +3,16 @@ envlist = py26,py27,pep8
 
 [testenv]
 deps = -r{toxinidir}/tools/pip-requires
-commands = /bin/bash run_tests.sh -N -P
+commands = nosetests --where=quantum/tests/unit
 
 [testenv:pep8]
-commands = /bin/bash run_tests.sh -N --pep8
+commands = pep8 --repeat --show-source bin/* quantum setup.py
 
-[testenv:coverage]
-commands = /bin/bash run_tests.sh -N -P --with-coverage
+[testenv:pylint]
+commands = pylint --rcfile=.pylintrc --output-format=parseable quantum
+
+[testenv:cover]
+commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=quantum
 
 [testenv:hudson]
 downloadcache = ~/cache/pip
@@ -24,8 +27,12 @@ deps = file://{toxinidir}/.cache.bundle
 
 [testenv:jenkinspep8]
 deps = file://{toxinidir}/.cache.bundle
-commands = /bin/bash run_tests.sh -N --pep8
+commands = pep8 --repeat --show-source bin/* quantum setup.py
 
-[testenv:jenkinscoverage]
+[testenv:jenkinspylint]
 deps = file://{toxinidir}/.cache.bundle
-commands = /bin/bash run_tests.sh -N --with-coverage
+commands = pylint -E --rcfile=.pylintrc --output-format=parseable quantum
+
+[testenv:jenkinscover]
+deps = file://{toxinidir}/.cache.bundle
+commands = nosetests --where=quantum/tests/unit --cover-erase --cover-package=quantum --with-xcoverage