summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-13 14:29:56 +0000
committerGerrit Code Review <review@openstack.org>2014-08-13 14:29:56 +0000
commit8ca6446f412c407ee63b769d85aa1c071c6f931b (patch)
treed054c387f032914a720e021bcc5fafb5836888c9
parente6c39e8370148e0350a8f3cdc3367a7766ef7fa3 (diff)
parent1ae4684f495837449c12bb032f8c9403dd19b03a (diff)
downloadoslo-rootwrap-8ca6446f412c407ee63b769d85aa1c071c6f931b.tar.gz
Merge "Move test requirement coverage into tox.ini"
-rw-r--r--test-requirements.txt5
-rw-r--r--tox.ini3
2 files changed, 3 insertions, 5 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index b639ae4..14a9d7e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,10 +7,5 @@ testrepository>=0.0.17
testscenarios>=0.4
testtools>=0.9.32
-# when we can require tox>= 1.4, this can go into tox.ini:
-# [testenv:cover]
-# deps = {[testenv]deps} coverage
-coverage>=3.6
-
# mocking framework
mock>=1.0
diff --git a/tox.ini b/tox.ini
index 39b563c..4f152c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,10 +15,13 @@ commands = python setup.py testr --slowest --testr-args='{posargs}'
commands = flake8
[testenv:cover]
+deps = {[testenv]deps}
+ coverage
setenv = VIRTUAL_ENV={envdir}
commands =
python setup.py testr --coverage
+
[testenv:venv]
commands = {posargs}