diff --git a/.gitignore b/.gitignore index f9df278..c308643 100755 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ __pycache__ .idea .project .pydevproject -.testrepository .tox .venv .DS_Store diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..9733d68 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./senlin_tempest_plugin/tests/ +top_dir=./ \ No newline at end of file diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 6d83b3c..0000000 --- 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 11b7041..d058f3f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,8 +6,7 @@ coverage!=4.4,>=4.0 # Apache-2.0 hacking>=3.0.0,<3.1.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT # Documentation diff --git a/tox.ini b/tox.ini index c667441..1471b9f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -minversion = 3.1.1 -envlist = py37,pep8,api,functional +minversion = 3.18.0 +envlist = py3,pep8,api,functional skipsdist = True ignore_basepython_conflict = True @@ -12,9 +12,9 @@ deps = usedevelop = True commands = find . -type f -name "*.py[c|o]" -delete - ostestr --slowest --regex 'senlin_tempest_plugin.tests.api.*' {posargs} + stestr run --slowest --test-path ./senlin_tempest_plugin/tests/api {posargs} -whitelist_externals = find +allowlist_externals = find [testenv:api] setenv = VIRTUAL_ENV={envdir} @@ -22,7 +22,7 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=senlin_tempest_plugin/api commands = find . -type f -name "*.py[c|o]" -delete - ostestr --slowest --regex 'senlin_tempest_plugin.tests.api.*' {posargs} + stestr run --slowest --test-path ./senlin_tempest_plugin/tests/api {posargs} [testenv:functional] setenv = VIRTUAL_ENV={envdir} @@ -33,9 +33,9 @@ setenv = VIRTUAL_ENV={envdir} # e.g.: 'tox -efunctional -- --concurrency=4' commands = find . -type f -name "*.py[c|o]" -delete - ostestr --slowest --regex 'senlin_tempest_plugin.tests.functional.*' {posargs} + stestr run --slowest --test-path ./senlin_tempest_plugin/tests/functional {posargs} -whitelist_externals = find +allowlist_externals = find [testenv:pep8] commands =