Browse Source

Replace ostestr with stestr in testing framework.

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

Change-Id: Ic04bd20af254018f4466f32933d187a912daa5b9
changes/14/641814/1
Pete Vander Giessen 1 year ago
parent
commit
0ffc020464
5 changed files with 9 additions and 14 deletions
  1. +3
    -0
      .stestr.conf
  2. +0
    -8
      .testr.conf
  3. +1
    -1
      src/test-requirements.txt
  4. +1
    -1
      test-requirements.txt
  5. +4
    -4
      tox.ini

+ 3
- 0
.stestr.conf View File

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

+ 0
- 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

+ 1
- 1
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


+ 1
- 1
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


+ 4
- 4
tox.ini View File

@@ -35,17 +35,17 @@ 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:py36]
basepython = python3.6
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs}
commands = stestr run {posargs}

[testenv:pep8]
basepython = python3.5
@@ -63,7 +63,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


Loading…
Cancel
Save