From fac18726b751a0d7792de44cc65785ccd1808441 Mon Sep 17 00:00:00 2001 From: Pete Vander Giessen Date: Thu, 7 Mar 2019 17:00:54 -0500 Subject: [PATCH] Replace ostestr with stestr in testing framework. A system upgrade broke ostestr. We can fix it by just calling stestr directly. Change-Id: Icface3ab69059083e172a4c16f721f783a5ff5e0 --- src/test-requirements.txt | 2 +- test-requirements.txt | 2 +- tox.ini | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test-requirements.txt b/src/test-requirements.txt index f013863..e56db9a 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index ca62003..14b380e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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 diff --git a/tox.ini b/tox.ini index bd66a69..151a369 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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