diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-20 16:04:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-20 16:04:47 +0000 |
| commit | e3eac21382d73aa3c648a36fd51afa7cd25fca0a (patch) | |
| tree | e41c156c96cdcc712707b297383dab30d2ab27b9 | |
| parent | 5e252d1c66c205d395b27e28cda0e6739876762c (diff) | |
| parent | 8e34aece1ae0fefae6c982efe2f1ec442bc028ca (diff) | |
| download | nova-e3eac21382d73aa3c648a36fd51afa7cd25fca0a.tar.gz | |
Merge "More usage of ostestr and cleanup an unused dependency"
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rwxr-xr-x | tools/pretty_tox.sh | 16 | ||||
| -rw-r--r-- | tox.ini | 12 |
3 files changed, 6 insertions, 23 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 98c6c0a0d5..a15776a37c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -25,7 +25,6 @@ testrepository>=0.0.18 # Apache-2.0/BSD testresources>=0.2.4 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT -tempest-lib>=0.14.0 # Apache-2.0 bandit>=1.1.0 # Apache-2.0 openstackdocstheme>=1.5.0 # Apache-2.0 gabbi>=1.26.1 # Apache-2.0 diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh deleted file mode 100755 index 799ac18487..0000000000 --- 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 - python setup.py testr --slowest --testr-args="$TESTRARGS" -else - python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f -fi @@ -20,20 +20,20 @@ commands = find . -type f -name "*.pyc" -delete rm -Rf .testrepository/times.dbm passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_DEBUG GENERATE_HASHES -# there is also secret magic in pretty_tox.sh which lets you run in a fail only +# there is also secret magic in subunit-trace which lets you run in a fail only # mode. To do this define the TRACE_FAILONLY environmental variable. [testenv:py27] commands = {[testenv]commands} - bash tools/pretty_tox.sh '{posargs}' - env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler' + ostestr '{posargs}' + env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler' [testenv:py35] commands = {[testenv]commands} bash tools/pretty_tox3.sh '{posargs}' - env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler' + env TEST_OSPROFILER=1 ostestr 'nova.tests.unit.test_profiler' [testenv:pep8] basepython = python2.7 @@ -63,7 +63,7 @@ setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US commands = find . -type f -name "*.pyc" -delete - bash tools/pretty_tox.sh '{posargs}' + ostestr '{posargs}' # TODO(gcb) Merge this into [testenv:functional] when functional tests are gating # with python 3.5 @@ -86,7 +86,7 @@ setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US commands = find . -type f -name "*.pyc" -delete - bash tools/pretty_tox.sh '{posargs}' + ostestr '{posargs}' [testenv:genconfig] commands = oslo-config-generator --config-file=etc/nova/nova-config-generator.conf |