Merge "Switch to stestr"

6 files changed, 13 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 9f6cf16..7c36a5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.pyc
-.testrepository
+.stestr/
 .tox/*
 dist/*
 build/*
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..3aeee01
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./
+top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 888f7de..0000000
--- 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 ./ ./ $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 9eedd0d..6c920e5 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -78,8 +78,8 @@ six==1.10.0
 snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
+stestr==2.0.0
 stevedore==1.20.0
-testrepository==0.0.18
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 078aad6..0503eb1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 oslotest>=3.2.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 mock>=2.0.0 # BSD
diff --git a/tox.ini b/tox.ini
index 925e2d0..d45c41e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,7 @@ deps =
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find . -type f -name "*.pyc" -delete
-           rm -f .testrepository/times.dbm
-           python setup.py testr --testr-args='{posargs}'
+           stestr run {posargs}
 whitelist_externals = find
                       rm
 
@@ -46,10 +45,14 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
+setenv =
+    PYTHON=coverage run --source troveclient --parallel-mode
 commands =
     coverage erase
-    python setup.py testr --coverage --testr-args='{posargs}'
-    coverage html
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
     coverage report
 
 [testenv:docs]