Merge "Switch to stestr"

This commit is contained in:
Zuul 2018-07-24 08:09:07 +00:00 committed by Gerrit Code Review
commit 0bf72ba164
6 changed files with 15 additions and 26 deletions

3
.gitignore vendored
View File

@ -26,8 +26,7 @@ pip-log.txt
cover
cover-master
.tox
nosetests.xml
.testrepository
.stestr/
.venv
# Functional test

4
.stestr.conf Normal file
View File

@ -0,0 +1,4 @@
[DEFAULT]
test_path=${OS_TEST_PATH:-./magnum/tests/unit}
top_dir=./

View File

@ -153,6 +153,7 @@ taskflow==2.16.0
Tempita==0.5.2
tenacity==4.9.0
testrepository==0.0.18
stestr==2.0.0
testresources==2.0.1
testscenarios==0.4
testtools==2.2.0

View File

@ -19,5 +19,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
pytz>=2013.6 # MIT
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
stestr>=2.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT

View File

@ -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

16
tox.ini
View File

@ -19,7 +19,7 @@ passenv = TEMPEST_* OS_TEST_*
commands =
find . -type f -name "*.py[c|o]" -delete
rm -f .testrepository/times.dbm
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:debug]
basepython = python3
@ -42,7 +42,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-k8s]
sitepackages = True
@ -53,7 +53,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-k8s-ironic]
sitepackages = True
@ -64,7 +64,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-k8s-coreos]
sitepackages = True
@ -75,7 +75,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-swarm]
sitepackages = True
@ -86,7 +86,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-swarm-mode]
sitepackages = True
@ -97,7 +97,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:functional-mesos]
sitepackages = True
@ -108,7 +108,7 @@ deps =
{[testenv]deps}
commands =
find . -type f -name "*.py[c|o]" -delete
bash tools/pretty_tox.sh '{posargs}'
stestr run {posargs}
[testenv:pep8]
basepython = python3