Merge "Updates for stestr"

2017-09-19 09:12:49 +00:00 · 2017-09-19 09:12:49 +00:00 · 1417264e4e
parent 522ae63ebb 5e836d6ee1
commit 1417264e4e
3 changed files with 8 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -38,6 +38,7 @@ ChangeLog
 # Editors
 *~
 .*.swp
+/.stestr/
 /.testrepository/
 /cover/
-.coverage.*
+.coverage.*
--- a/.stestr.conf
+++ b/.stestr.conf
@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./cliff
+top_dir=./
--- a/tox.ini
+++ b/tox.ini
@ -7,6 +7,9 @@ setenv =
    VIRTUAL_ENV={envdir}
    BRANCH_NAME=master
    CLIENT_NAME=cliff
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
 passenv =
    ZUUL_CACHE_DIR
 distribute = False