Merge "Switch to using stestr"

2018-07-25 16:12:51 +00:00 · 2018-07-25 16:12:51 +00:00 · ea1fbef915
parent d6a39d399d facca8bfad
commit ea1fbef915
4 changed files with 5 additions and 9 deletions
--- a/.stestr.conf
+++ b/.stestr.conf
@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./unit_tests
+top_path=./
--- a/.testr.conf
+++ b/.testr.conf
@ -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
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -21,6 +21,7 @@ python-novaclient>=2.30.1
 python-openstackclient>=1.7.0
 python-swiftclient>=2.6.0
 pika>=0.10.0,<1.0
+stestr>=1.0.0 
 distro-info
 # END: Amulet OpenStack Charm Helper Requirements
 # NOTE: workaround for 14.04 pip/tox
--- 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 --slowest {posargs} 
 whitelist_externals = juju
 passenv = HOME TERM AMULET_* CS_API_*