Merge "Switch to stestr"
This commit is contained in:
commit
0bf72ba164
|
@ -26,8 +26,7 @@ pip-log.txt
|
||||||
cover
|
cover
|
||||||
cover-master
|
cover-master
|
||||||
.tox
|
.tox
|
||||||
nosetests.xml
|
.stestr/
|
||||||
.testrepository
|
|
||||||
.venv
|
.venv
|
||||||
|
|
||||||
# Functional test
|
# Functional test
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
[DEFAULT]
|
||||||
|
test_path=${OS_TEST_PATH:-./magnum/tests/unit}
|
||||||
|
top_dir=./
|
||||||
|
|
|
@ -153,6 +153,7 @@ taskflow==2.16.0
|
||||||
Tempita==0.5.2
|
Tempita==0.5.2
|
||||||
tenacity==4.9.0
|
tenacity==4.9.0
|
||||||
testrepository==0.0.18
|
testrepository==0.0.18
|
||||||
|
stestr==2.0.0
|
||||||
testresources==2.0.1
|
testresources==2.0.1
|
||||||
testscenarios==0.4
|
testscenarios==0.4
|
||||||
testtools==2.2.0
|
testtools==2.2.0
|
||||||
|
|
|
@ -19,5 +19,6 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||||
pytz>=2013.6 # MIT
|
pytz>=2013.6 # MIT
|
||||||
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
|
||||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||||
|
stestr>=2.0.0 # Apache-2.0
|
||||||
testscenarios>=0.4 # Apache-2.0/BSD
|
testscenarios>=0.4 # Apache-2.0/BSD
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
|
|
|
@ -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
16
tox.ini
|
@ -19,7 +19,7 @@ passenv = TEMPEST_* OS_TEST_*
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
rm -f .testrepository/times.dbm
|
rm -f .testrepository/times.dbm
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:debug]
|
[testenv:debug]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
@ -42,7 +42,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-k8s]
|
[testenv:functional-k8s]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -53,7 +53,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-k8s-ironic]
|
[testenv:functional-k8s-ironic]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -64,7 +64,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-k8s-coreos]
|
[testenv:functional-k8s-coreos]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -75,7 +75,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-swarm]
|
[testenv:functional-swarm]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -86,7 +86,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-swarm-mode]
|
[testenv:functional-swarm-mode]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -97,7 +97,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:functional-mesos]
|
[testenv:functional-mesos]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
|
@ -108,7 +108,7 @@ deps =
|
||||||
{[testenv]deps}
|
{[testenv]deps}
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.py[c|o]" -delete
|
find . -type f -name "*.py[c|o]" -delete
|
||||||
bash tools/pretty_tox.sh '{posargs}'
|
stestr run {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
Loading…
Reference in New Issue