diff options
| author | Luigi Toscano <ltoscano@redhat.com> | 2016-02-26 18:56:18 +0100 |
|---|---|---|
| committer | Luigi Toscano <ltoscano@redhat.com> | 2016-02-29 14:02:18 +0100 |
| commit | f362f233dd3f61b0112962a0dc2a8147ba65813c (patch) | |
| tree | 0971029df4c4bb70cb577865c07f5dd3ca84417f | |
| parent | 84af8c666ab9a5865c6f4f25a0bbad6b7ff9be37 (diff) | |
| download | python-saharaclient-f362f233dd3f61b0112962a0dc2a8147ba65813c.tar.gz | |
Use ostestr instead of the custom pretty_tox.sh
Switch to os-testr as wrapper for testr, instead of the custom
script pretty_tox.sh.
Change-Id: I2b4671659b7db69c2d83c6f4bb7a210d092a584d
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rwxr-xr-x | tools/pretty_tox.sh | 6 | ||||
| -rw-r--r-- | tox.ini | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 61a29f8..a9c5ba3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,6 +10,7 @@ mock>=1.2 # BSD oslo.config>=3.7.0 # Apache-2.0 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 python-neutronclient>=2.6.0 # Apache-2.0 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 python-swiftclient>=2.2.0 # Apache-2.0 diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh deleted file mode 100755 index ac76045..0000000 --- a/tools/pretty_tox.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail - -TESTRARGS=$1 -python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f @@ -14,16 +14,15 @@ deps = -r{toxinidir}/test-requirements.txt sphinx-argparse commands = find . -type f -name "*.pyc" -delete - bash tools/pretty_tox.sh "{posargs}" + ostestr {posargs} whitelist_externals = find - bash passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:integration] setenv = VIRTUAL_ENV={envdir} DISCOVER_DIRECTORY=saharaclient/tests/integration/ -commands = bash tools/pretty_tox.sh "{posargs}" +commands = ostestr {posargs} [testenv:debug] commands = oslo_debug_helper -t saharaclient/tests/unit {posargs} @@ -40,7 +39,7 @@ commands = oslo_debug_helper -t saharaclient/tests/unit {posargs} passenv = OS_* setenv = DISCOVER_DIRECTORY=saharaclient/tests/functional/ -commands = bash tools/pretty_tox.sh "{posargs}" +commands = ostestr {posargs} [testenv:cover] commands = python setup.py test --coverage --testr-args='{posargs}' |