openstack/ceilometer
Code Issues Proposed changes

Merge "Remove nose wrapper script"

Browse Source
This commit is contained in:
Jenkins 2013-02-26 10:02:10 +00:00 committed by Gerrit Code Review
commit 1d44a182cb
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.cfg
View File

@ -5,7 +5,6 @@ cover-erase = true
cover-inclusive = true cover-inclusive = true
verbosity=2 verbosity=2
detailed-errors=1 detailed-errors=1
where=tests
[build_sphinx] [build_sphinx]
all_files = 1 all_files = 1

5
tox.ini
View File

@ -10,14 +10,15 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_RED=0.05 NOSE_OPENSTACK_RED=0.05
NOSE_OPENSTACK_YELLOW=0.025 NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1 NOSE_OPENSTACK_SHOW_ELAPSED=1
commands = {toxinidir}/wrap_nosetests.sh --no-path-adjustment [] commands =
nosetests --no-path-adjustment --where=./tests
sitepackages = False sitepackages = False
[testenv:livedb] [testenv:livedb]
setenv=CEILOMETER_TEST_LIVE=1 setenv=CEILOMETER_TEST_LIVE=1
[testenv:cover] [testenv:cover]
commands = {toxinidir}/wrap_nosetests.sh --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive [] commands = nosetests --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive []
[testenv:pep8] [testenv:pep8]
deps = -r{toxinidir}/tools/test-requires deps = -r{toxinidir}/tools/test-requires

13
wrap_nosetests.sh
View File

@ -1,13 +0,0 @@
#!/bin/sh
# Wrap nosetests to force it to enable global site-packages until
# https://bitbucket.org/hpk42/tox/issue/32 is released.
set -x
rm -rf cover
if [ ! -z "$VIRTUAL_ENV" ]
then
rm -f $VIRTUAL_ENV/lib/python*/no-global-site-packages.txt
fi
nosetests "$@"