diff --git a/.gitignore b/.gitignore index c71f9eaf..476c0d97 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ cover/ nosetests.xml .testrepository .venv +.stestr/ # Translations *.mo diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 00000000..9aa8d091 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./validations_libs/tests +top_dir=./ diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 6d83b3c4..00000000 --- a/.testr.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/lower-constraints.txt b/lower-constraints.txt index 2728b677..a286a1d5 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -104,6 +104,7 @@ smmap2==2.0.3 snowballstemmer==1.2.1 Sphinx==1.8.0 sphinxcontrib-websupport==1.0.1 +stestr==1.0.0 stevedore==1.28.0 tenacity==5.0.1 testrepository==0.0.18 diff --git a/test-requirements.txt b/test-requirements.txt index 20d9c64b..b843aee7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 python-subunit>=1.0.0 # Apache-2.0/BSD sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=1.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT pre-commit # MIT diff --git a/tox.ini b/tox.ini index 3552c6a2..d6342e9f 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,9 @@ setenv = # paramiko CryptographyDeprecationWarning: https://github.com/ansible/ansible/issues/52598 PYTHONWARNINGS=ignore:DEPRECATION::pip._internal.cli.base_command,ignore::UserWarning PIP_DISABLE_PIP_VERSION_CHECK=1 -commands = python setup.py test --slowest --testr-args='{posargs}' +commands = + stestr run {posargs} + stestr slowest sitepackages = True deps = -c {env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}