Fix up coverage and jenkins test running.

The docs job wasn't working because of an un-renamed file.
Coverage wasn't running in jenkins with the xml output file.
Remove the .cache.bundle support that we're moving away from.

Change-Id: I1140baa53dee8b14ac4d1f8549425a0fdd7a8425
This commit is contained in:
Monty Taylor
2012-05-21 14:40:18 -04:00
parent fe23db3380
commit 50792c2ff4
5 changed files with 15 additions and 12 deletions

14
tox.ini
View File

@@ -4,9 +4,13 @@ envlist = py26,py27,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1
NOSE_OPENSTACK_RED=0.05
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
deps = -r{toxinidir}/tools/pip-requires
-r{toxinidir}/tools/test-requires
commands = /bin/bash run_tests.sh -N -P
commands = /bin/bash run_tests.sh -N -P {posargs}
[testenv:pep8]
deps = pep8
@@ -16,7 +20,7 @@ commands = pep8 --repeat --show-source cinder setup.py
commands = {posargs}
[testenv:cover]
commands = /bin/bash run_tests.sh -N -P --coverage
commands = /bin/bash run_tests.sh -N -P --coverage-xml
[tox:jenkins]
downloadcache = ~/cache/pip
@@ -24,19 +28,15 @@ downloadcache = ~/cache/pip
[testenv:jenkins26]
basepython = python2.6
setenv = NOSE_WITH_XUNIT=1
deps = file://{toxinidir}/.cache.bundle
[testenv:jenkins27]
basepython = python2.7
setenv = NOSE_WITH_XUNIT=1
deps = file://{toxinidir}/.cache.bundle
[testenv:jenkinscover]
deps = file://{toxinidir}/.cache.bundle
setenv = NOSE_WITH_XUNIT=1
commands = /bin/bash run_tests.sh -N --coverage
commands = /bin/bash run_tests.sh -N --coverage-xml
[testenv:jenkinsvenv]
deps = file://{toxinidir}/.cache.bundle
setenv = NOSE_WITH_XUNIT=1
commands = {posargs}