summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-06 20:26:19 +0000
committerGerrit Code Review <review@openstack.org>2018-06-06 20:26:19 +0000
commit53a3f44f16841367dd5fd26e10d38a06aba295b0 (patch)
tree5709307994ebb400c6f5524d818e65667cc098aa
parent0b7d9ae9b4857b86dd58089f20781eaea14047dc (diff)
parente734468fdfcda62b682f5826b5ab69519a9c3303 (diff)
Merge "Switch coverage tox env to stestr"
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini9
2 files changed, 9 insertions, 3 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 75e6bf5..dd72e63 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,10 +13,9 @@ oslotest>=3.2.0 # Apache-2.0
13reno>=2.5.0 # Apache-2.0 13reno>=2.5.0 # Apache-2.0
14requests-mock>=1.2.0 # Apache-2.0 14requests-mock>=1.2.0 # Apache-2.0
15stevedore>=1.20.0 # Apache-2.0 15stevedore>=1.20.0 # Apache-2.0
16testrepository>=0.0.18 # Apache-2.0/BSD 16stestr # Apache-2.0
17testresources>=2.0.0 # Apache-2.0/BSD 17testresources>=2.0.0 # Apache-2.0/BSD
18testtools>=2.2.0 # MIT 18testtools>=2.2.0 # MIT
19os-testr>=1.0.0 # Apache-2.0
20python-memcached>=1.56 # PSF 19python-memcached>=1.56 # PSF
21WebTest>=2.0.27 # MIT 20WebTest>=2.0.27 # MIT
22 21
diff --git a/tox.ini b/tox.ini
index 96b843e..860a0a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,14 @@ commands = bandit -r keystonemiddleware -x tests -n5
33commands = {posargs} 33commands = {posargs}
34 34
35[testenv:cover] 35[testenv:cover]
36commands = python setup.py testr --coverage --testr-args='{posargs}' 36setenv =
37 {[testenv]setenv}
38 PYTHON=coverage run --source keystonemiddleware --parallel-mode
39commands =
40 stestr run {posargs}
41 coverage combine
42 coverage html -d cover
43 coverage xml -o cover/coverage.xml
37 44
38[testenv:debug] 45[testenv:debug]
39 46