diff --git a/test-requirements.txt b/test-requirements.txt index 40daf186..68e7d613 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,6 +14,7 @@ fixtures>=1.3.1 # Apache-2.0/BSD mock>=1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 +os-testr>=0.4.1 # Apache-2.0 psycopg2>=2.5 # LGPL/ZPL pylint==1.4.5 # GNU GPL v2 reno>=0.1.1 # Apache2 diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh deleted file mode 100644 index d1ff91e5..00000000 --- a/tools/pretty_tox.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -ex -set -o pipefail - -TESTRARGS=$1 -python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f diff --git a/tox.ini b/tox.ini index 0f05fe56..b8558a4b 100644 --- a/tox.ini +++ b/tox.ini @@ -12,8 +12,7 @@ setenv = deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = bash tools/pretty_tox.sh '{posargs}' -whitelist_externals = bash +commands = ostestr {posargs} passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:cover]