From 1be4ff07766e51523be56115bb7df5e0cd82055f Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Wed, 10 Feb 2021 12:11:13 +0000 Subject: [PATCH] Migrate from testr to stestr Change-Id: I6ab87f81b61e41c9b53b7f88912b927ca3ea41de --- .gitignore | 2 ++ test-requirements.txt | 2 +- tox.ini | 15 ++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2da5a7d..50d1059 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ build .unit-state.db *.swp +.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 3fb5307..e957a20 100644 --- a/tox.ini +++ b/tox.ini @@ -14,19 +14,24 @@ install_command = pip install {opts} {packages} [testenv:py35] -basepython = python3 +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:py3] +basepython = python3 +deps = -r{toxinidir}/test-requirements.txt +commands = stestr run {posargs} [testenv:pep8] basepython = python3 @@ -43,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