summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-15 19:18:05 +0000
committerGerrit Code Review <review@openstack.org>2017-09-15 19:18:05 +0000
commit424d112cd7330e1b641e67d440e11ece55961d7d (patch)
tree2ca67ef8b96ca6b569408d492eea0bc486f9df2a
parent3fb4fec1d6ab2c72f72997533792fbe5d05936de (diff)
parent6f72637fb6356d39adee82a2718118156ae4a6bf (diff)
downloados-client-config-424d112cd7330e1b641e67d440e11ece55961d7d.tar.gz
Merge "Updates for stestr"
-rw-r--r--.gitignore1
-rw-r--r--.stestr.conf3
-rw-r--r--tox.ini3
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 218bf6a..c24b89b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ cover
.coverage
.tox
nosetests.xml
+.stestr/
.testrepository
# Translations
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7923822
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=.
+top_dir=./
diff --git a/tox.ini b/tox.ini
index bf0fd8b..57feb6d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,9 @@ setenv =
VIRTUAL_ENV={envdir}
BRANCH_NAME=master
CLIENT_NAME=os-client-config
+ OS_STDOUT_CAPTURE=1
+ OS_STDERR_CAPTURE=1
+ OS_TEST_TIMEOUT=60
deps = -r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}'