Merge "tox: Remove references to testr"

tox.ini

@@ -5,6 +5,11 @@ ignore_basepython_conflict = true
 
 [testenv]
 basepython = python3
+setenv =
+  OS_STDOUT_CAPTURE=1
+  OS_STDERR_CAPTURE=1
+  OS_TEST_TIMEOUT=60
+  PYTHONDONTWRITEBYTECODE=1
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
@@ -13,14 +18,23 @@ commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 deps =
-    pre-commit>=2.6.0 # MIT
+  pre-commit>=2.6.0 # MIT
 commands = pre-commit run -a
 
 [testenv:venv]
 commands = {posargs}
 
 [testenv:cover]
-commands = python setup.py test --coverage --testr-args="{posargs}"
+setenv =
+  {[testenv]setenv}
+  PYTHON=coverage run --source automaton --parallel-mode
+commands =
+  coverage erase
+  stestr run {posargs}
+  coverage combine
+  coverage html -d cover
+  coverage xml -o cover/coverage.xml
+  coverage report
 
 [testenv:docs]
 deps =