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 | |
| parent | b709a9a80851d3c2c6242da960a318433d1f4aee (diff) | |
| parent | a0c3e67cb5e73db26202f97010d383fc2d6b1278 (diff) | |
| download | nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.tar.gz nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.tar.xz nova-3c6daa9a0bdbacd3dbde3e1f3b7cf72820717879.zip | |
Merge "Use testrepository setuptools support."
| -rw-r--r-- | .coveragerc | 3 | ||||
| -rw-r--r-- | tools/test-requires | 2 | ||||
| -rw-r--r-- | tox.ini | 15 |
3 files changed, 9 insertions, 11 deletions
diff --git a/.coveragerc b/.coveragerc index 82fe47792..902a94349 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,6 +1,7 @@ [run] branch = True -omit = /usr*,setup.py,*egg*,.venv/*,.tox/*,nova/tests/* +source = nova +omit = nova/tests/*,DynamicallyCompiledCheetahTemplate.py [report] ignore-errors = True diff --git a/tools/test-requires b/tools/test-requires index 6ee42d31c..5f195d5c1 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -11,5 +11,5 @@ pep8==1.3.3 pylint==0.25.2 python-subunit sphinx>=1.1.2 -testrepository>=0.0.8 +testrepository>=0.0.13 testtools>=0.9.22 @@ -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} |