Merge "Updates for stestr"

openstack · Sep 19, 2017 · 1417264 · 1417264
2 parents 522ae63 + 5e836d6
commit 1417264
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,7 @@ ChangeLog
 # Editors
 *~
 .*.swp
+/.stestr/
 /.testrepository/
 /cover/
-.coverage.*
+.coverage.*
diff --git a/.stestr.conf b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./cliff
+top_dir=./
diff --git 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