Merge "Switch to use stestr for unit test"

.gitignore

@@ -27,7 +27,7 @@ cover/
 !.coveragerc
 .tox
 nosetests.xml
-.testrepository
+.stestr/
 .venv
 
 # Translations

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./sushy/tests
+top_dir=.

.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} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list

lower-constraints.txt

@@ -36,7 +36,7 @@ snowballstemmer==1.2.1
 Sphinx==1.6.2
 sphinxcontrib-websupport==1.0.1
 stevedore==1.20.0
-testrepository==0.0.18
+stestr==2.0.0
 testscenarios==0.4
 testtools==2.2.0
 traceback2==1.4.0

test-requirements.txt

@@ -9,7 +9,7 @@ python-subunit>=1.0.0 # Apache-2.0/BSD
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.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
 

tox.ini

@@ -13,7 +13,7 @@ deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3
@@ -25,13 +25,17 @@ commands = {posargs}
 
 [testenv:cover]
 basepython = python3
+setenv =
+   {[testenv]setenv}
+   PYTHON=coverage run --source sushy --parallel-mode
 # After running this target, visit sushy/cover/index.html
 # in your browser, to see a nicer presentation report with annotated
 # HTML listings detailing missed lines.
 commands = coverage erase
-           python setup.py test --coverage --testr-args='{posargs}'
-           coverage report --omit=*test*
-           coverage html --omit=*test*
+           stestr run {posargs}
+           coverage combine
+           coverage html -d cover
+           coverage xml -o cover/coverage.xml
 
 [testenv:docs]
 basepython = python3