commit f2055253e95f240733ea12de1d93b6f8d3208765
author Jenkins <jenkins@review.openstack.org> Wed Jun 14 11:07:30 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jun 14 11:07:30 2017 +0000
tree b13410446d51cb7d0b9cdc7eca3e7478630842fd
parent 817651d25a6cf1ef536be49f5735714e74d9b9c5
parent c2d9b66975d3606379eec9f01f055847693c6949

Merge "Fix tox command for running tests"

.testr.conf

diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..6a52f97
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+test_command=${PYTHON:-python} -m subunit.run discover -s ./barbican_tempest_plugin -t . $LISTOPT $IDOPTION
+
+test_id_option=--load-list $IDFILE
+test_list_option=--list

tox.ini

diff --git a/tox.ini b/tox.ini
index 011fc96..1f1ce01 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
 commands =