openstack/tooz
Code Issues Proposed changes

Drop os-testr test-requirement and pretty_tox.sh

Browse Source 
os-testr is only needed to provide the "subunit-trace" command which
is used in the tools/pretty_tox.sh script. And pretty_tox.sh is not
needed. "stestr" can be used directly in tox.ini. So drop
tools/pretty_tox.sh .

Change-Id: I6a18183f092689c8c9d283c19914da9baa59cc32
This commit is contained in:
Thomas Bechtold 2019-09-24 10:25:47 +02:00
parent 5b280a85c5
commit 4492bbaea8
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt
View File

@ -8,5 +8,4 @@ testtools>=1.4.0 # MIT
coverage>=3.6 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
pifpaf>=0.10.0 # Apache-2.0
os-testr>=0.8.0 # Apache-2.0
stestr>=2.0.0

16
tools/pretty_tox.sh
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
stestr run --slowest "$TESTRARGS"
else
stestr run --slowest --subunit "$TESTRARGS" | subunit-trace -f
fi

4
tox.ini
View File

@ -33,7 +33,7 @@ setenv =
consul: TOOZ_TEST_DRIVERS = consul
# NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
commands =
{toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
{toxinidir}/run-tests.sh stestr run "{posargs}"
{toxinidir}/run-examples.sh
[testenv:py27]
@ -51,7 +51,7 @@ deps = {[testenv]deps}
setenv = {[testenv]setenv}
PYTHON=coverage run --source tooz --parallel-mode
commands =
{toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}"
{toxinidir}/run-tests.sh stestr run "{posargs}"
{toxinidir}/run-examples.sh
coverage combine
coverage html -d cover