Add .stestr.conf configuration
os-testr has moved over to use stestr instead of testr. While this is usually compaible with existing settings, there is a warning that is emitted when .stestr.conf is not present. It is usually able to fall back to parsing the .testr.conf file, but to be more correct and to prevent future problems we should update the config. Change-Id: I95a6d1135fb4861bd3fb2086ae7a63e486130db0 Closes-Bug: #1809062
This commit is contained in:
parent
37fc134d11
commit
7681ed7c72
1
.gitignore
vendored
1
.gitignore
vendored
@ -27,3 +27,4 @@ etc/zaqar.conf.sample
|
|||||||
.idea
|
.idea
|
||||||
# Files created by releasenotes build
|
# Files created by releasenotes build
|
||||||
releasenotes/build
|
releasenotes/build
|
||||||
|
.stestr/
|
||||||
|
3
.stestr.conf
Normal file
3
.stestr.conf
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
test_path=${OS_TEST_PATH:-./zaqar/tests/unit}
|
||||||
|
top_dir=${OS_TOP_LEVEL:-./}
|
@ -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} $JIT_FLAG -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./zaqar/tests/unit} $LISTOPT $IDOPTION
|
|
||||||
test_id_option=--load-list $IDFILE
|
|
||||||
test_list_option=--list
|
|
14
tox.ini
14
tox.ini
@ -10,6 +10,10 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/
|
ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/
|
||||||
ZAQAR_TEST_MONGODB=1
|
ZAQAR_TEST_MONGODB=1
|
||||||
ZAQAR_TEST_SLOW=1
|
ZAQAR_TEST_SLOW=1
|
||||||
|
OS_STDOUT_CAPTURE=1
|
||||||
|
OS_STDERR_CAPTURE=1
|
||||||
|
OS_TEST_TIMEOUT=60
|
||||||
|
OS_TEST_PATH=./zaqar/tests/unit
|
||||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
@ -43,10 +47,14 @@ commands =
|
|||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
setenv =
|
||||||
|
{[testenv]setenv}
|
||||||
|
PYTHON=coverage run --source zaqar --parallel-mode
|
||||||
commands =
|
commands =
|
||||||
python setup.py testr --coverage \
|
stestr run {posargs}
|
||||||
--testr-args='^(?!.*test.*coverage).*$'
|
coverage combine
|
||||||
coverage report
|
coverage html -d cover
|
||||||
|
coverage xml -o cover/coverage.xml
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
|
Loading…
Reference in New Issue
Block a user