Fix coverage jobs. Also, clean up the tox.ini.
Change-Id: I85e8f1b190e2c5f598ae76f2920dfbe7c4ed1500
This commit is contained in:
parent
41d285ab02
commit
66108d0e48
|
@ -0,0 +1,6 @@
|
||||||
|
[run]
|
||||||
|
branch = True
|
||||||
|
omit = /usr*,setup.py,*egg*,.venv/*,.tox/*,glance/tests/*
|
||||||
|
|
||||||
|
[report]
|
||||||
|
ignore-errors = True
|
|
@ -4,7 +4,13 @@
|
||||||
.glance-venv
|
.glance-venv
|
||||||
.venv
|
.venv
|
||||||
.tox
|
.tox
|
||||||
|
.coverage
|
||||||
|
cover/*
|
||||||
|
nosetests.xml
|
||||||
|
coverage.xml
|
||||||
|
glance.sqlite
|
||||||
AUTHORS
|
AUTHORS
|
||||||
|
ChangeLog
|
||||||
build
|
build
|
||||||
dist
|
dist
|
||||||
*.egg
|
*.egg
|
||||||
|
|
|
@ -29,8 +29,6 @@ output_file = glance/locale/glance.pot
|
||||||
# openstack-nose https://github.com/jkoelker/openstack-nose
|
# openstack-nose https://github.com/jkoelker/openstack-nose
|
||||||
verbosity=2
|
verbosity=2
|
||||||
detailed-errors=1
|
detailed-errors=1
|
||||||
with-openstack=1
|
cover-package = glance
|
||||||
openstack-red=0.05
|
cover-html = true
|
||||||
openstack-yellow=0.025
|
cover-erase = true
|
||||||
openstack-show-elapsed=1
|
|
||||||
openstack-color=1
|
|
||||||
|
|
|
@ -5,10 +5,10 @@ distribute>=0.6.24
|
||||||
Babel
|
Babel
|
||||||
|
|
||||||
# Needed for testing
|
# Needed for testing
|
||||||
|
coverage
|
||||||
mox
|
mox
|
||||||
nose
|
nose
|
||||||
nose-exclude
|
nose-exclude
|
||||||
nosexcover
|
|
||||||
openstack.nose_plugin
|
openstack.nose_plugin
|
||||||
pep8==1.1
|
pep8==1.1
|
||||||
sphinx>=1.1.2
|
sphinx>=1.1.2
|
||||||
|
|
35
tox.ini
35
tox.ini
|
@ -3,35 +3,24 @@ envlist = py26,py27,pep8
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
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
|
deps = -r{toxinidir}/tools/pip-requires
|
||||||
-r{toxinidir}/tools/test-requires
|
-r{toxinidir}/tools/test-requires
|
||||||
commands = {toxinidir}/run_tests.sh -N
|
commands = nosetests {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
|
||||||
deps = pep8==1.1
|
|
||||||
commands = pep8 --repeat --show-source bin glance setup.py
|
|
||||||
|
|
||||||
[testenv:cover]
|
|
||||||
commands = nosetests --with-coverage --cover-html --cover-erase --cover-package=glance
|
|
||||||
|
|
||||||
[testenv:venv]
|
|
||||||
commands = {posargs}
|
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
|
||||||
[testenv:jenkins26]
|
[testenv:pep8]
|
||||||
basepython = python2.6
|
deps = pep8==1.1
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
|
||||||
|
|
||||||
[testenv:jenkins27]
|
[testenv:cover]
|
||||||
basepython = python2.7
|
setenv = NOSE_WITH_COVERAGE=1
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
|
|
||||||
[testenv:jenkinscover]
|
[testenv:venv]
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = nosetests --cover-erase --cover-package=glance --with-xcoverage
|
|
||||||
|
|
||||||
[testenv:jenkinsvenv]
|
|
||||||
deps = file://{toxinidir}/.cache.bundle
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
Loading…
Reference in New Issue