diff --git a/.gitignore b/.gitignore index 3a53f0494..15da71cf2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ subunit.log !/.gitreview !/.mailmap !/.pylintrc -!/.testr.conf !/.zuul.yaml !/.stestr.conf diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 149ff134e..000000000 --- a/.testr.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron_fwaas/tests/unit} $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/lower-constraints.txt b/lower-constraints.txt index ab00cdab8..80cedb19a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -58,7 +58,6 @@ openstacksdk==0.11.2 os-client-config==1.28.0 os-ken==0.3.0 os-service-types==1.2.0 -os-testr==1.0.0 os-xenapi==0.3.1 osc-lib==1.8.0 oslo.cache==1.26.0 diff --git a/test-requirements.txt b/test-requirements.txt index e0f78bf03..524587a8d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,6 @@ mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD requests-mock>=1.2.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT diff --git a/tools/ostestr_compat_shim.sh b/tools/ostestr_compat_shim.sh deleted file mode 100755 index a483ed1a1..000000000 --- a/tools/ostestr_compat_shim.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# preserve old behavior of using an arg as a regex when '--' is not present -case $@ in - (*--*) ostestr $@;; - ('') ostestr;; - (*) ostestr --regex "$@" -esac diff --git a/tox.ini b/tox.ini index 93f58f2f5..90dc1661b 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,9 @@ skipsdist = True [testenv] setenv = VIRTUAL_ENV={envdir} PYTHONWARNINGS=default::DeprecationWarning + OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true} + OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true} + OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true} usedevelop = True deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt