Merge "Use stestr as the test runner for unit tests"
This commit is contained in:
commit
a88d70ea13
@ -12,6 +12,4 @@ testtools>=2.3.0 # MIT
|
|||||||
os-testr>=1.0.0 # Apache-2.0
|
os-testr>=1.0.0 # Apache-2.0
|
||||||
flake8>=3.3.0
|
flake8>=3.3.0
|
||||||
mock
|
mock
|
||||||
pytest==3.2.1
|
|
||||||
pytest-mock
|
|
||||||
responses>=0.8.1
|
responses>=0.8.1
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Script for passing regex filtering of unit tests to py.test conditionally.
|
|
||||||
# Needed because tox currently doesn't support conditional logic like this.
|
|
||||||
|
|
||||||
posargs=$@
|
|
||||||
if [ ${#posargs} -ge 1 ]; then
|
|
||||||
py.test -vvv -s --ignore=hapi -k $1
|
|
||||||
else
|
|
||||||
py.test -vvv -s --ignore=hapi
|
|
||||||
fi
|
|
||||||
TEST_STATUS=$?
|
|
||||||
set -e
|
|
||||||
|
|
||||||
exit $TEST_STATUS
|
|
9
tox.ini
9
tox.ini
@ -18,8 +18,13 @@ whitelist_externals =
|
|||||||
rm
|
rm
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
python -V
|
rm -Rf .testrepository/times.dbm
|
||||||
{toxinidir}/tools/run-unit-tests.sh {posargs}
|
|
||||||
|
[testenv:py35]
|
||||||
|
commands =
|
||||||
|
{[testenv]commands}
|
||||||
|
stestr run {posargs}
|
||||||
|
stestr slowest
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
deps = -r{toxinidir}/doc/requirements.txt
|
deps = -r{toxinidir}/doc/requirements.txt
|
||||||
|
Loading…
Reference in New Issue
Block a user