From 2b4fdffc5218cc6ea1c9e598b295ac8accb56696 Mon Sep 17 00:00:00 2001 From: James Page Date: Thu, 7 Mar 2019 05:52:01 +0000 Subject: [PATCH] Switch to direct execution of stestr Resolves issues with test execution via os-testr. Change-Id: I03b49c8b13c8d9031651dbfd1984d1bda75476c7 --- .stestr.conf | 3 +++ .testr.conf | 8 -------- test-requirements.txt | 2 +- tox.ini | 4 ++-- 4 files changed, 6 insertions(+), 11 deletions(-) create mode 100644 .stestr.conf delete mode 100644 .testr.conf diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 00000000..5fcccaca --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=./unit_tests +top_dir=./ diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 801646bb..00000000 --- a/.testr.conf +++ /dev/null @@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index 2b2c0e11..627da027 100644 --- a/test-requirements.txt +++ b/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 requests>=2.18.4 # BEGIN: Amulet OpenStack Charm Helper Requirements # Liberty client lower constraints diff --git a/tox.ini b/tox.ini index 74f2c010..63460ab6 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir} AMULET_SETUP_TIMEOUT=5400 install_command = pip install {opts} {packages} -commands = ostestr {posargs} +commands = stestr run {posargs} whitelist_externals = juju passenv = HOME TERM AMULET_* CS_API_* @@ -50,7 +50,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