diff --git a/test-requirements.txt b/test-requirements.txt index 77d9ee31..7f183d29 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh deleted file mode 100755 index 150d5066..00000000 --- a/tools/pretty_tox.sh +++ /dev/null @@ -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 diff --git a/tox.ini b/tox.ini index 613812c0..2764f1e8 100644 --- a/tox.ini +++ b/tox.ini @@ -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