summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini23
1 files changed, 17 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index ed8d772..26f8767 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,8 +16,8 @@ deps = -r{toxinidir}/requirements.txt
.[keystone]
commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
\( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
- -print0; find . -name "*.dbm*" -print0) | xargs -0 rm -rf'
- python setup.py testr --testr-args="{posargs}"
+ -print0) | xargs -0 rm -rf'
+ stestr run {posargs}
whitelist_externals = sh
passenv = SWIFT_* *_proxy
@@ -32,17 +32,28 @@ commands = {posargs}
[testenv:cover]
basepython = python3
-commands = python setup.py testr --coverage
- coverage report
+setenv =
+ PYTHON=coverage run --source swiftclient --parallel-mode
+commands =
+ stestr run
+ coverage combine
+ coverage html -d cover
+ coverage xml -o cover/coverage.xml
+ coverage report
[testenv:func]
basepython = python3
-setenv = OS_TEST_PATH=tests.functional
+setenv =
+ OS_TEST_PATH=tests.functional
+ PYTHON=coverage run --source swiftclient --parallel-mode
whitelist_externals =
coverage
rm
commands =
- python setup.py testr --coverage --testr-args="--concurrency=1"
+ stestr run --concurrency=1
+ coverage combine
+ coverage html -d cover
+ coverage xml -o cover/coverage.xml
coverage report -m
rm -f .coverage