Merge "Add .stestr.conf configuration"

.gitignore

@@ -27,3 +27,4 @@ etc/zaqar.conf.sample
 .idea
 # Files created by releasenotes build
 releasenotes/build
+.stestr/

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./zaqar/tests/unit}
+top_dir=${OS_TOP_LEVEL:-./}

.testr.conf

@@ -1,7 +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} $JIT_FLAG -m subunit.run discover -t ${OS_TOP_LEVEL:-./} ${OS_TEST_PATH:-./zaqar/tests/unit} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list

tox.ini

@@ -10,6 +10,10 @@ setenv = VIRTUAL_ENV={envdir}
          ZAQAR_TESTS_CONFIGS_DIR={toxinidir}/zaqar/tests/etc/
          ZAQAR_TEST_MONGODB=1
          ZAQAR_TEST_SLOW=1
+         OS_STDOUT_CAPTURE=1
+         OS_STDERR_CAPTURE=1
+         OS_TEST_TIMEOUT=60
+         OS_TEST_PATH=./zaqar/tests/unit
 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -43,10 +47,14 @@ commands =
 
 [testenv:cover]
 basepython = python3
+setenv =
+    {[testenv]setenv}
+    PYTHON=coverage run --source zaqar --parallel-mode
 commands =
-  python setup.py testr --coverage \
+    stestr run {posargs}
-    --testr-args='^(?!.*test.*coverage).*$'
+    coverage combine
-  coverage report
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
 
 [testenv:venv]
 basepython = python3