From aa6baae9e03d8cc8c0eed9b15a75e03a77ff3736 Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Mon, 21 May 2018 15:20:27 -0700 Subject: [PATCH] Switch to stestr According to Openstack summit session [1] stestr is maintained project to which all Openstack projects should migrate. Let's switch it then. [1] https://etherpad.openstack.org/p/YVR-python-pti Change-Id: I856024f8b66f5edaf40ae7b798fce21c43d021e7 --- .gitignore | 2 +- .stestr.conf | 3 +++ .testr.conf | 7 ------- test-requirements.txt | 2 +- tox.ini | 14 ++++++++++++-- 5 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 .stestr.conf delete mode 100644 .testr.conf diff --git a/.gitignore b/.gitignore index 963e589a..a678dd2d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,8 +27,8 @@ cover/ !.coveragerc .tox nosetests.xml -.testrepository .venv +.stestr/ # Translations *.mo diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 00000000..7a46f320 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=${OS_TEST_PATH:-./neutron_tempest_plugin} +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/test-requirements.txt b/test-requirements.txt index 84f3c187..c0546cf4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ flake8-import-order==0.12 # LGPLv3 python-subunit>=1.0.0 # Apache-2.0/BSD sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD oslotest>=3.2.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT openstackdocstheme>=1.18.1 # Apache-2.0 # releasenotes diff --git a/tox.ini b/tox.ini index d966308b..bba0a641 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,11 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac 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} deps = -r{toxinidir}/test-requirements.txt -commands = python setup.py test --slowest --testr-args='{posargs}' +commands = stestr run --slowest {posargs} [testenv:pep8] commands = @@ -23,7 +26,14 @@ whitelist_externals = commands = {posargs} [testenv:cover] -commands = python setup.py test --coverage --testr-args='{posargs}' +setenv = + {[testenv]setenv} + PYTHON=coverage run --source neutron_tempest_plugin --parallel-mode +commands = + stestr run --no-subunit-trace {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] commands = python setup.py build_sphinx