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: I15fd3427485ff26ee936cae622585745ba9281b7
This commit is contained in:
Sean McGinnis 2017-09-19 16:51:09 -05:00
parent 259a32e457
commit 9a741bac21
4 changed files with 16 additions and 8 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
!.gitignore
!.mailmap
!.testr.conf
/.*
*.py[cod]

3
.stestr.conf Normal file
View File

@ -0,0 +1,3 @@
[DEFAULT]
test_path=${OS_TEST_PATH:-./os_brick/tests}
top_dir=./

View File

@ -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

13
tox.ini
View File

@ -10,6 +10,11 @@ setenv =
BRANCH_NAME=master
CLIENT_NAME=os-brick
PYTHONHASHSEED=0
OS_TEST_PATH=./os_brick/tests
OS_TEST_TIMEOUT=60
OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
@ -48,8 +53,14 @@ commands = {posargs}
[testenv:cover]
# To see the report of missing coverage add to commands
# coverage report --show-missing
setenv =
{[testenv]setenv}
PYTHON=coverage run --source os_brick --parallel-mode
commands =
python setup.py test --coverage --coverage-package-name=os_brick --testr-args='{posargs}'
stestr run {posargs}
coverage combine
coverage html -d cover
coverage xml -o cover/coverage/xml
[testenv:docs]
commands = python setup.py build_sphinx