summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-20 09:06:11 -0400
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-20 09:30:12 -0400
commitcc78b2a2a8c08322a64fa56ce17d06628b18485a (patch)
treeab4609e1045cef47a4575a983cd7638235fa0e68 /tox.ini
parent026db28334c3e1ee38cb9171c4b28735fe748b3b (diff)
downloadpython-barbicanclient-cc78b2a2a8c08322a64fa56ce17d06628b18485a.tar.gz
port tests to testtools, add branch coverage, omit openstack common
Change-Id: I364dcaac1db1922cc815ece455a69734aa6c51f6
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini25
1 files changed, 5 insertions, 20 deletions
diff --git a/tox.ini b/tox.ini
index bafb2be..65edb9a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,24 +7,15 @@
envlist = py26, py27, pep8
[testenv]
-setenv = VIRTUAL_ENV={envdir}
- LANG=en_US.UTF-8
- LANGUAGE=en_US:en
- LC_ALL=C
- OS_STDOUT_NOCAPTURE=False
- OS_STDERR_NOCAPTURE=False
-
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
+commands =
+ python setup.py testr --coverage
+ coverage combine
+ coverage report -m
[testenv:pep8]
-commands = {toxinidir}/tools/hacking.sh
-
-[testenv:venv]
-commands = {posargs}
-
-[testenv:cover]
-commands = nosetests --with-coverage --cover-package=barbicanclient
+commands = {toxinidir}/tools/hacking.sh {posargs}
[tox:jenkins]
downloadcache = ~/cache/pip
@@ -33,9 +24,3 @@ downloadcache = ~/cache/pip
ignore = F,H
show-source = True
exclude = .venv,.tox,dist,doc,*egg
-
-[testenv:py26]
-commands = nosetests {posargs:--with-xcoverage --all-modules --cover-inclusive --traverse-namespace --with-xunit --cover-package=barbicanclient}
-
-[testenv:py27]
-commands = nosetests {posargs:--with-xcoverage --all-modules --cover-inclusive --traverse-namespace --with-xunit --cover-package=barbicanclient}