openstack/aodh
Code Issues Proposed changes

fix gate

Browse Source 
new ostestr is different and is breaking gate. i don't think we
really need ostestr since we don't use it in any of the projects
under Telemetry. so to remain consistent and simple, just follow
similar pattern.

Change-Id: I742de2107cf56ef8b223fa1431529e706cc52377
This commit is contained in:
gord chung 2017-09-11 17:21:06 +00:00
parent 3227ae9377
commit 6005f80f9b
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
run-tests.sh
View File

@ -1,5 +1,10 @@
#!/bin/bash -x #!/bin/bash -x
set -e set -e
export OS_TEST_PATH=aodh/tests/unit
./tools/pretty_tox.sh $*
export OS_TEST_PATH=aodh/tests/functional
AODH_TEST_DRIVERS=${AODH_TEST_DRIVERS:-postgresql} AODH_TEST_DRIVERS=${AODH_TEST_DRIVERS:-postgresql}
for indexer in ${AODH_TEST_DRIVERS} for indexer in ${AODH_TEST_DRIVERS}
do do

4
tools/pretty_tox.sh
View File

@ -10,7 +10,7 @@ TESTRARGS=$*
# #
# this work around exists until that is addressed # this work around exists until that is addressed
if [[ "$TESTARGS" =~ "until-failure" ]]; then if [[ "$TESTARGS" =~ "until-failure" ]]; then
ostestr --slowest $TESTRARGS python setup.py testr --slowest --testr-args="$TESTRARGS"
else else
ostestr --no-pretty --slowest --subunit $TESTRARGS | subunit-trace -f python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
fi fi

2
tox.ini
View File

@ -17,7 +17,7 @@ setenv =
deps = .[test,{env:AODH_TEST_DEPS}] deps = .[test,{env:AODH_TEST_DEPS}]
passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE AODH_TEST_DRIVERS passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE AODH_TEST_DRIVERS
commands = commands =
{toxinidir}/run-tests.sh --black-regex '^aodh\.tests\.tempest\..*$' {posargs} {toxinidir}/run-tests.sh {posargs}
{toxinidir}/run-functional-tests.sh "{posargs}" {toxinidir}/run-functional-tests.sh "{posargs}"
aodh-config-generator aodh-config-generator