Merge "Switch to stestr"

.gitignore

@@ -25,8 +25,7 @@ pip-log.txt
 # Unit test / coverage reports
 .coverage
 .tox
-nosetests.xml
+.stestr/
-.testrepository
 .venv
 cover
 

.stestr.conf

@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=./castellan/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 ./ ${OS_TEST_PATH:-./castellan/tests} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list

lower-constraints.txt

@@ -66,7 +66,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
 bandit>=1.1.0 # Apache-2.0

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}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:py27]
 basepython = python2.7
@@ -47,9 +47,14 @@ commands = oslo_debug_helper {posargs}
 
 [testenv:cover]
 basepython = python3
+setenv =
+    PYTHON=coverage run --source $project --parallel-mode
 commands =
-   python setup.py testr --coverage --testr-args='{posargs}'
+    stestr run '{posargs}'
-   coverage report
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [testenv:docs]
 basepython = python3
@@ -65,7 +70,7 @@ install_command = pip install -U {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=./castellan/tests/functional
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
 
 [testenv:functional-vault]
 passenv = HOME
@@ -75,7 +80,7 @@ setenv =
     VIRTUAL_ENV={envdir}
     OS_TEST_PATH=./castellan/tests/functional
 commands =
-    {toxinidir}/tools/setup-vault-env.sh pifpaf -e VAULT_TEST run vault -- python setup.py testr --slowest --testr-args='{posargs}'
+    {toxinidir}/tools/setup-vault-env.sh pifpaf -e VAULT_TEST run vault -- stestr run --slowest {posargs}
 
 [testenv:genconfig]
 basepython = python3