diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-01-16 17:19:37 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-01-16 17:19:37 +0000 |
commit | 3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879 (patch) | |
tree | 162f1ba2b7e5f4d8393598dbb65062fc180c3828 /tox.ini | |
parent | b709a9a80851d3c2c6242da960a318433d1f4aee (diff) | |
parent | a0c3e67cb5e73db26202f97010d383fc2d6b1278 (diff) | |
download | nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.tar.gz nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.tar.xz nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.zip |
Merge "Use testrepository setuptools support."
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 @@ -35,13 +34,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} |