Merge "Remove testrepository and .testr.conf"

.gitignore

@@ -13,7 +13,6 @@ releasenotes/build/
 *.egg*
 monclient/versioninfo
 *.log
-.testrepository
 .pydevproject
 .project
 .idea

.testr.conf

@@ -1,9 +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:-160} \
-             ${PYTHON:-python} -m subunit.run discover -t ./ $OS_TEST_PATH $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_list_option=--list
-group_regex=monascaclient\.tests(?:\.|_)([^_]+)

lower-constraints.txt

@@ -70,7 +70,6 @@ Sphinx==1.6.5
 sphinxcontrib-websupport==1.0.1
 stestr==1.0.0
 stevedore==1.20.0
-testrepository==0.0.18
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0

test-requirements.txt

@@ -8,7 +8,6 @@ bandit>=1.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 stestr>=1.0.0
-testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 

tox.ini

@@ -24,11 +24,15 @@ commands =
 
 [testenv:cover]
 basepython = python2.7
+setenv =
+    PYTHON=coverage run --source monascaclient --parallel-mode
 commands =
-  coverage erase
-  python setup.py test --coverage --testr-args='{posargs}' \
-    --coverage-package-name=monascaclient --omit=monascaclient/tests/*
-  coverage report
+    coverage erase
+    stestr run '{posargs}'
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [testenv:debug]
 basepython = python3