Merge "Move test requirement coverage into tox.ini"

2014-08-13 14:29:56 +00:00 · 2014-08-13 14:29:56 +00:00 · 8ca6446f41
commit 8ca6446f41
parent e6c39e8370 1ae4684f49
2 changed files with 3 additions and 5 deletions
--- 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
--- 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}