openstack/charm-ceph-fs
Code Issues Proposed changes

Replace ostestr with stestr in testing framework.

Browse Source 
A system upgrade broke ostestr. We can fix it by just calling stestr
directly.

Change-Id: I8d24df7c6baa225f79501024c1872a07ae022e1a
This commit is contained in:
Pete Vander Giessen 2019-03-07 17:10:16 -05:00
parent e46557ec76
commit bec0cfaff2
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.stestr.conf Normal file
View File

@ -0,0 +1,3 @@
[DEFAULT]
test_path=./unit_tests
top_dir=./

8
.testr.conf
View File

@ -1,8 +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 ./ ./unit_tests $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE
test_list_option=--list

2
src/test-requirements.txt
View File

@ -5,7 +5,7 @@ charm-tools>=2.4.4
coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
stestr>=2.2.0
requests>=2.18.4
# BEGIN: Amulet OpenStack Charm Helper Requirements
# Liberty client lower constraints

2
test-requirements.txt
View File

@ -4,7 +4,7 @@
#
# Lint and unit test requirements
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
stestr>=2.2.0
requests>=2.18.4
charms.reactive
mock>=1.2

6
tox.ini
View File

@ -35,12 +35,12 @@ commands = true
[testenv:py34]
basepython = python3.4
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs}
commands = stestr run {posargs}
[testenv:py35]
basepython = python3.5
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs}
commands = stestr run {posargs}
[testenv:pep8]
basepython = python3.5
@ -58,7 +58,7 @@ setenv =
PYTHON=coverage run
commands =
coverage erase
ostestr {posargs}
stestr run {posargs}
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml