Switch to use stestr for unit tests directly
This commit switches to use stestr command to run unit tests directly. Recently, the latest ostestr command uses stestr instead of testr. However, we should use stestr directly because it's simple and straight forward. There is no reason to use ostestr for unit tests anymore. We still have the other ostestr/testr usage such as tempest run command and documentations. So, that will be changed with following patches. Change-Id: Iff4abef50178bdc83b868eed4a906e22d790762b
This commit is contained in:
parent
f78565d4de
commit
d0b8ebd84a
1
.gitignore
vendored
1
.gitignore
vendored
@ -18,6 +18,7 @@ include/swift_objects/swift_large
|
||||
dist
|
||||
build
|
||||
.testrepository
|
||||
.stestr
|
||||
.idea
|
||||
.project
|
||||
.pydevproject
|
||||
|
4
.stestr.conf
Normal file
4
.stestr.conf
Normal file
@ -0,0 +1,4 @@
|
||||
[DEFAULT]
|
||||
test_path=./tempest/test_discover
|
||||
group_regex=([^\.]*\.)*
|
||||
|
@ -19,7 +19,7 @@ PyYAML>=3.10 # MIT
|
||||
python-subunit>=0.0.18 # Apache-2.0/BSD
|
||||
stevedore>=1.20.0 # Apache-2.0
|
||||
PrettyTable<0.8,>=0.7.1 # BSD
|
||||
os-testr>=0.8.0 # Apache-2.0
|
||||
os-testr>=1.0.0 # Apache-2.0
|
||||
urllib3>=1.21.1 # MIT
|
||||
debtcollector>=1.2.0 # Apache-2.0
|
||||
unittest2 # BSD
|
||||
|
@ -23,12 +23,10 @@ from tempest.tests import base
|
||||
|
||||
class TestTestList(base.TestCase):
|
||||
|
||||
def test_testr_list_tests_no_errors(self):
|
||||
# Remove unit test discover path from env to test tempest tests
|
||||
def test_stestr_list_no_errors(self):
|
||||
test_env = os.environ.copy()
|
||||
test_env.pop('OS_TEST_PATH')
|
||||
import_failures = []
|
||||
p = subprocess.Popen(['testr', 'list-tests'], stdout=subprocess.PIPE,
|
||||
p = subprocess.Popen(['stestr', 'list'], stdout=subprocess.PIPE,
|
||||
env=test_env)
|
||||
ids, err = p.communicate()
|
||||
self.assertEqual(0, p.returncode,
|
||||
|
5
tox.ini
5
tox.ini
@ -16,12 +16,11 @@ deps =
|
||||
[testenv]
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
OS_TEST_PATH=./tempest/tests
|
||||
OS_LOG_CAPTURE=1
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
BRANCH_NAME=master
|
||||
CLIENT_NAME=tempest
|
||||
passenv = OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_TEST_TIMEOUT OS_TEST_LOCK_PATH OS_TEST_PATH TEMPEST_CONFIG TEMPEST_CONFIG_DIR http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY ZUUL_CACHE_DIR REQUIREMENTS_PIP_LOCATION GENERATE_TEMPEST_PLUGIN_LIST
|
||||
passenv = OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_TEST_TIMEOUT OS_TEST_LOCK_PATH TEMPEST_CONFIG TEMPEST_CONFIG_DIR http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY ZUUL_CACHE_DIR REQUIREMENTS_PIP_LOCATION GENERATE_TEMPEST_PLUGIN_LIST
|
||||
usedevelop = True
|
||||
install_command =
|
||||
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
@ -31,7 +30,7 @@ deps =
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
find . -type f -name "*.pyc" -delete
|
||||
ostestr {posargs}
|
||||
stestr --test-path ./tempest/tests run {posargs}
|
||||
|
||||
[testenv:genconfig]
|
||||
commands = oslo-config-generator --config-file tempest/cmd/config-generator.tempest.conf
|
||||
|
Loading…
Reference in New Issue
Block a user