summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-12-24 22:01:28 -0600
committerMonty Taylor <mordred@inaugust.com>2013-01-17 14:42:52 -0500
commit02eb985124efa92bf735712db0ed174c40b74d14 (patch)
tree696c45b26c34603aea74d0ca57198d5e194f9c5d /tox.ini
parent06acb0c009ac53777884cf5b0aa8942184d06622 (diff)
downloadpython-cinderclient-02eb985124efa92bf735712db0ed174c40b74d14.tar.gz
Move from nose to testr.
Granted - this takes the test suite from 3 seconds to 1 second... but there are a bunch of other ways (correctness) that testr is better than nose. Removed tests/v1/utils - it was not being used anywhere. Part of blueprint grizzly-testtools. Change-Id: I54d9a0b7dc22305ec60d779d6f19025a0b5dc785
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini29
1 files changed, 6 insertions, 23 deletions
diff --git a/tox.ini b/tox.ini
index c54b596..34ca825 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,14 +3,13 @@ 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
+ LANG=en_US.UTF-8
+ LANGUAGE=en_US:en
+ LC_ALL=C
+
deps = -r{toxinidir}/tools/pip-requires
-r{toxinidir}/tools/test-requires
-commands = nosetests
+commands = python setup.py testr --testr-args='{posargs}'
[testenv:pep8]
deps = pep8
@@ -20,23 +19,7 @@ commands = pep8 --repeat --show-source cinderclient setup.py
commands = {posargs}
[testenv:cover]
-commands = nosetests --cover-erase --cover-package=cinderclient --with-xcoverage
+commands = python setup.py testr --coverage --testr-args='{posargs}'
[tox:jenkins]
downloadcache = ~/cache/pip
-
-[testenv:jenkins26]
-basepython = python2.6
-setenv = NOSE_WITH_XUNIT=1
-
-[testenv:jenkins27]
-basepython = python2.7
-setenv = NOSE_WITH_XUNIT=1
-
-[testenv:jenkinscover]
-setenv = NOSE_WITH_XUNIT=1
-commands = nosetests --cover-erase --cover-package=cinderclient --with-xcoverage
-
-[testenv:jenkinsvenv]
-setenv = NOSE_WITH_XUNIT=1
-commands = {posargs}