Use oslo_debug_helper and remove our own version
With the latest version of oslotest, we can now take advantage of a common oslo_debug_helper script. We can now remove our own homebrewed version, minor changes to tox.ini were needed. Change-Id: Ide72fb3531f0498dfe289d028049cd432aa08887
This commit is contained in:
parent
e21c70c27f
commit
ac87550a55
|
@ -27,7 +27,7 @@ fixtures>=0.3.14
|
||||||
lxml>=2.3
|
lxml>=2.3
|
||||||
# mock object framework
|
# mock object framework
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
oslotest
|
oslotest>=1.1.0.0a2
|
||||||
# required to build documentation
|
# required to build documentation
|
||||||
sphinx>=1.1.2,!=1.2.0,<1.3
|
sphinx>=1.1.2,!=1.2.0,<1.3
|
||||||
# test wsgi apps without starting an http server
|
# test wsgi apps without starting an http server
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
TMP_DIR=`mktemp -d` || exit 1
|
|
||||||
trap "rm -rf $TMP_DIR" EXIT
|
|
||||||
|
|
||||||
ALL_TESTS=$TMP_DIR/all_tests
|
|
||||||
TESTS_TO_RUN=$TMP_DIR/ks_to_run
|
|
||||||
|
|
||||||
python -m testtools.run discover -t ./ ./keystone/tests --list > $ALL_TESTS
|
|
||||||
|
|
||||||
if [ "$1" ]; then
|
|
||||||
grep "$1" < $ALL_TESTS > $TESTS_TO_RUN
|
|
||||||
else
|
|
||||||
mv $ALL_TESTS $TESTS_TO_RUN
|
|
||||||
fi
|
|
||||||
|
|
||||||
STANDARD_THREADS=1 python -m testtools.run discover --load-list $TESTS_TO_RUN
|
|
6
tox.ini
6
tox.ini
|
@ -48,7 +48,7 @@ commands =
|
||||||
flake8 {posargs}
|
flake8 {posargs}
|
||||||
# Run bash8 during pep8 runs to ensure violations are caught by
|
# Run bash8 during pep8 runs to ensure violations are caught by
|
||||||
# the check and gate queues
|
# the check and gate queues
|
||||||
bashate examples/pki/gen_pki.sh tools/debug_helper.sh
|
bashate examples/pki/gen_pki.sh
|
||||||
# Check that .po and .pot files are valid.
|
# Check that .po and .pot files are valid.
|
||||||
# NOTE(jaegerandi): We search for files ending with '.po' or '.pot'.
|
# NOTE(jaegerandi): We search for files ending with '.po' or '.pot'.
|
||||||
# The regex '.*\.pot?' does not work on OS X and we assume there are no
|
# The regex '.*\.pot?' does not work on OS X and we assume there are no
|
||||||
|
@ -66,9 +66,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
|
commands = oslo_debug_helper.sh {posargs}
|
||||||
commands =
|
|
||||||
{toxinidir}/tools/debug_helper.sh {posargs}
|
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
filename= *.py,keystone-*
|
filename= *.py,keystone-*
|
||||||
|
|
Loading…
Reference in New Issue