More usage of ostestr and cleanup an unused dependency
Use ostestr as runner instead of the custome pretty_tox.sh script (pretty much removed everywhere). pretty_tox3.sh is just a wrapper for ostestr but it could be probably removed as well going forward. Also remove the tempest-lib dependency, which originally provided subunit-trace (now from os-testr). Change-Id: I4390964ce83167d634b80f696e82a0e199582ce6
This commit is contained in:
@@ -24,7 +24,6 @@ testrepository>=0.0.18 # Apache-2.0/BSD
|
|||||||
testresources>=0.2.4 # Apache-2.0/BSD
|
testresources>=0.2.4 # Apache-2.0/BSD
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=1.4.0 # MIT
|
testtools>=1.4.0 # MIT
|
||||||
tempest-lib>=0.14.0 # Apache-2.0
|
|
||||||
bandit>=1.1.0 # Apache-2.0
|
bandit>=1.1.0 # Apache-2.0
|
||||||
openstackdocstheme>=1.5.0 # Apache-2.0
|
openstackdocstheme>=1.5.0 # Apache-2.0
|
||||||
gabbi>=1.26.1 # Apache-2.0
|
gabbi>=1.26.1 # Apache-2.0
|
||||||
|
@@ -1,16 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
TESTRARGS=$1
|
|
||||||
|
|
||||||
# --until-failure is not compatible with --subunit see:
|
|
||||||
#
|
|
||||||
# https://bugs.launchpad.net/testrepository/+bug/1411804
|
|
||||||
#
|
|
||||||
# this work around exists until that is addressed
|
|
||||||
if [[ "$TESTARGS" =~ "until-failure" ]]; then
|
|
||||||
python setup.py testr --slowest --testr-args="$TESTRARGS"
|
|
||||||
else
|
|
||||||
python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
|
|
||||||
fi
|
|
12
tox.ini
12
tox.ini
@@ -22,20 +22,20 @@ deps = -r{toxinidir}/test-requirements.txt
|
|||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_DEBUG GENERATE_HASHES
|
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_DEBUG GENERATE_HASHES
|
||||||
# there is also secret magic in pretty_tox.sh which lets you run in a fail only
|
# there is also secret magic in subunit-trace which lets you run in a fail only
|
||||||
# mode. To do this define the TRACE_FAILONLY environmental variable.
|
# mode. To do this define the TRACE_FAILONLY environmental variable.
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
ostestr '{posargs}'
|
||||||
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
|
env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler'
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
bash tools/pretty_tox3.sh '{posargs}'
|
bash tools/pretty_tox3.sh '{posargs}'
|
||||||
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
|
env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler'
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
@@ -54,7 +54,7 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
ostestr '{posargs}'
|
||||||
|
|
||||||
# TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
|
# TODO(gcb) Merge this into [testenv:functional] when functional tests are gating
|
||||||
# with python 3.5
|
# with python 3.5
|
||||||
@@ -77,7 +77,7 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
ostestr '{posargs}'
|
||||||
|
|
||||||
[testenv:genconfig]
|
[testenv:genconfig]
|
||||||
commands = oslo-config-generator --config-file=etc/nova/nova-config-generator.conf
|
commands = oslo-config-generator --config-file=etc/nova/nova-config-generator.conf
|
||||||
|
Reference in New Issue
Block a user