From 2c22d0194d6aa81aff7cda0feea404b96c89cc39 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 10 Feb 2021 11:05:11 +0000 Subject: [PATCH] Fully migrate unit tests from testr to stestr Change-Id: I123134a19b3a6aca7c3574e39b319eeebe163a6a --- .gitignore | 2 ++ test-requirements.txt | 2 +- tox.ini | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8ee6755..630f29f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ *__pycache__* *.pyc .unit-state.db +.coverage +cover/ diff --git a/test-requirements.txt b/test-requirements.txt index ac58161..9326b6f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,6 +1,6 @@ # Lint and unit test requirements flake8 -os-testr>=0.4.1 +stestr>=2.2.0 charms.reactive mock>=1.2 coverage>=3.6 diff --git a/tox.ini b/tox.ini index 2d16f94..4e5c5a1 100644 --- a/tox.ini +++ b/tox.ini @@ -16,22 +16,22 @@ install_command = [testenv:py3] basepython = python3 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:py37] basepython = python3.7 deps = -r{toxinidir}/test-requirements.txt -commands = ostestr {posargs} +commands = stestr run {posargs} [testenv:pep8] basepython = python3 @@ -48,7 +48,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