Use testr setuptools commands.

Replace the embedded shell scripts with setuptools commands provided by
upstream. Cleans up a few warnings that this cause tox to show.

Change-Id: I9eb47142eafb6ed038b358b94984462ca1632542
This commit is contained in:
Monty Taylor 2013-01-11 15:32:25 +01:00
parent acbf4ea118
commit c945b71929
3 changed files with 9 additions and 11 deletions

View File

@ -1,6 +1,7 @@
[run] [run]
branch = True branch = True
omit = /usr*,setup.py,*egg*,.venv/*,.tox/*,nova/tests/* source = nova
omit = nova/tests/*,DynamicallyCompiledCheetahTemplate.py
[report] [report]
ignore-errors = True ignore-errors = True

View File

@ -11,5 +11,5 @@ pep8==1.3.3
pylint==0.25.2 pylint==0.25.2
python-subunit python-subunit
sphinx>=1.1.2 sphinx>=1.1.2
testrepository>=0.0.8 testrepository>=0.0.12
testtools>=0.9.22 testtools>=0.9.22

15
tox.ini
View File

@ -8,8 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
LC_ALL=C LC_ALL=C
deps = -r{toxinidir}/tools/pip-requires deps = -r{toxinidir}/tools/pip-requires
-r{toxinidir}/tools/test-requires -r{toxinidir}/tools/test-requires
commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi' commands = python setup.py testr --slowest --testr-args='{posargs}'
bash -c 'testr run --parallel {posargs} ; RET=$? ; echo "Slowest Tests" ; testr slowest && exit $RET'
[tox:jenkins] [tox:jenkins]
sitepackages = True sitepackages = True
@ -34,13 +33,11 @@ deps = pyflakes
commands = python tools/flakes.py nova commands = python tools/flakes.py nova
[testenv:cover] [testenv:cover]
# Need to omit DynamicallyCompiledCheetahTemplate.py from coverage because # Also do not run test_coverage_ext tests while gathering coverage as those
# it ceases to exist post test run. Also do not run test_coverage_ext tests # tests conflict with coverage.
# while gathering coverage as those tests conflict with coverage. commands =
setenv = OMIT=--omit=DynamicallyCompiledCheetahTemplate.py python setup.py testr --coverage \
PYTHON=coverage run --source nova --parallel-mode --testr-args='^(?!.*test_coverage_ext).*$'
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'
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}