diff options
author | Monty Taylor <mordred@inaugust.com> | 2013-01-15 06:40:47 +0000 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2013-01-14 23:17:12 -0800 |
commit | a0c3e67cb5e73db26202f97010d383fc2d6b1278 (patch) | |
tree | de9ef7d1915f739cb022d3b70cbc5332e69f148c /tox.ini | |
parent | 9576c6fdeba252d4548c37aa2cbf699f28d4c14b (diff) | |
download | nova-a0c3e67cb5e73db26202f97010d383fc2d6b1278.tar.gz nova-a0c3e67cb5e73db26202f97010d383fc2d6b1278.tar.xz nova-a0c3e67cb5e73db26202f97010d383fc2d6b1278.zip |
Use testrepository setuptools support.
The previous false-positive bug was fixed upstream in 0.0.13.
Change-Id: Iceb07a511992249c104bbc7c34b7c35e01bd9fbd
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -8,8 +8,7 @@ setenv = VIRTUAL_ENV={envdir} LC_ALL=C deps = -r{toxinidir}/tools/pip-requires -r{toxinidir}/tools/test-requires -commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi' - bash -c 'testr run --parallel {posargs} ; RET=$? ; echo "Slowest Tests" ; testr slowest && exit $RET' +commands = python setup.py testr --slowest --testr-args='{posargs}' [tox:jenkins] sitepackages = True @@ -34,13 +33,11 @@ deps = pyflakes commands = python tools/flakes.py nova [testenv:cover] -# Need to omit DynamicallyCompiledCheetahTemplate.py from coverage because -# it ceases to exist post test run. Also do not run test_coverage_ext tests -# while gathering coverage as those tests conflict with coverage. -setenv = OMIT=--omit=DynamicallyCompiledCheetahTemplate.py - PYTHON=coverage run --source nova --parallel-mode -commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi' - bash -c 'testr run --parallel \^\(\?\!\.\*test_coverage_ext\)\.\*\$ ; RET=$? ; coverage combine ; coverage html -d ./cover $OMIT && exit $RET' +# Also do not run test_coverage_ext tests while gathering coverage as those +# tests conflict with coverage. +commands = + python setup.py testr --coverage \ + --testr-args='^(?!.*test_coverage_ext).*$' [testenv:venv] commands = {posargs} |