summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-14 11:07:30 +0000
committerGerrit Code Review <review@openstack.org>2017-06-14 11:07:30 +0000
commitf2055253e95f240733ea12de1d93b6f8d3208765 (patch)
treeb13410446d51cb7d0b9cdc7eca3e7478630842fd
parent817651d25a6cf1ef536be49f5735714e74d9b9c5 (diff)
parentc2d9b66975d3606379eec9f01f055847693c6949 (diff)
Merge "Fix tox command for running tests"
-rw-r--r--.testr.conf5
-rw-r--r--tox.ini2
2 files changed, 6 insertions, 1 deletions
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 0000000..6a52f97
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,5 @@
1[DEFAULT]
2test_command=${PYTHON:-python} -m subunit.run discover -s ./barbican_tempest_plugin -t . $LISTOPT $IDOPTION
3
4test_id_option=--load-list $IDFILE
5test_list_option=--list
diff --git a/tox.ini b/tox.ini
index 011fc96..1f1ce01 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
10 VIRTUAL_ENV={envdir} 10 VIRTUAL_ENV={envdir}
11 PYTHONWARNINGS=default::DeprecationWarning 11 PYTHONWARNINGS=default::DeprecationWarning
12deps = -r{toxinidir}/test-requirements.txt 12deps = -r{toxinidir}/test-requirements.txt
13commands = python setup.py test --slowest --testr-args='{posargs}' 13commands = python setup.py testr --slowest --testr-args='{posargs}'
14 14
15[testenv:pep8] 15[testenv:pep8]
16commands = 16commands =