diff --git a/test-requirements.txt b/test-requirements.txt index f0dd00b..5e1c9ce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,9 @@ +pep8==1.4.5 +pyflakes==0.7.2 +flake8==2.0 hacking>=0.5.6,<0.8 + +coverage +python-subunit +testrepository>=0.0.17 +testtools>=0.9.32 diff --git a/tox.ini b/tox.ini index 9a63364..bbba87d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = pep8 +envlist = py27,pep8 skipsdist = True [testenv] @@ -14,13 +14,25 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = - python setup.py test --slowest --testr-args='{posargs}' + python setup.py testr --slowest --testr-args='{posargs}' + +[tox:jenkins] +sitepackages = True +downloadcache = ~/cache/pip [testenv:pep8] sitepackages = False commands = flake8 {posargs} +[testenv:cover] +# Also do not run test_coverage_ext tests while gathering coverage as those +# tests conflict with coverage. +setenv = VIRTUAL_ENV={envdir} +commands = + python setup.py testr --coverage \ + --testr-args='^(?!.*test.*coverage).*$' + [testenv:venv] commands = {posargs}