Merge "Switch to using stestr for tests"

.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 storyboard/tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list

test-requirements.txt

@@ -1,12 +1,9 @@
 hacking>=1.0.0,<1.1.0
 
-coverage>=3.6
+coverage!=4.4,>=4.0 # Apache-2.0
-fixtures>=0.3.14
+fixtures>=3.0.0 # Apache-2.0/BSD
-mock>=1.0
+mock>=2.0 # BSD
-python-subunit
+oslotest>=3.2.0 # Apache-2.0
-oslotest>=1.2.0
+stestr>=1.0.0 # Apache-2.0
-os-testr>=1.0.0
-testrepository>=0.0.18
 testscenarios>=0.4,<0.5
-testtools>=0.9.34
 posix_ipc>=0.9.8

tox.ini

@@ -6,24 +6,23 @@ envlist = py35,py27,pep8
 [testenv]
 usedevelop = True
 install_command = pip install -U {opts} {packages}
+passenv = OS_* STORYBOARD_*
 setenv =
     VIRTUAL_ENV={envdir}
-    OS_STDERR_CAPTURE=1
+    OS_LOG_CAPTURE={env:OS_LOG_CAPTURE:true}
-    OS_STDOUT_CAPTURE=1
+    OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
-passenv =
+    OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
-    OS_TEST_TIMEOUT
-    STORYBOARD_TEST_DB
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = ostestr '{posargs}'
+commands = stestr run {posargs}
+           stestr slowest
 whitelist_externals = bash
 
 [testenv:sqlite]
 basepython = python3
 setenv =
+    {[testenv]setenv}
     STORYBOARD_TEST_DB=sqlite:///{envtmpdir}
-    OS_STDERR_CAPTURE=1
-    OS_STDOUT_CAPTURE=1
 
 [testenv:pep8]
 basepython = python3
@@ -44,7 +43,7 @@ commands =
 [testenv:cover]
 basepython = python3
 setenv =
-    VIRTUAL_ENV={envdir}
+    {[testenv]setenv}
     PYTHON=coverage run --source storyboard --parallel-mode
 commands =
     stestr run {posargs}