From 2fd802745d8de02f7d67c5fdaded5236d6bf2e97 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 15 Sep 2017 10:13:38 -0500
Subject: [PATCH] Updates for stestr

Per changes to os-testr [1], this patch set updates the code to leverage
stestr and exclude the newly generated .stestr directory

[1] http://lists.openstack.org/pipermail/openstack-dev/2017-September/122135.html

Change-Id: Ic4713af0ad888bd2ca669a5e9de5e9212255e970
---
 .gitignore   | 1 +
 .stestr.conf | 3 +++
 tox.ini      | 7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 .stestr.conf

diff --git a/.gitignore b/.gitignore
index 96eb68e6..56eae754 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ pip-log.txt
 nosetests.xml
 .testrepository
 cover
+.stestr/
 
 # Translations
 *.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..a1458ba4
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./keystonemiddleware/tests/unit}
+top_dir=./
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 9e3ececf..c0a99df2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,14 +9,15 @@ install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:h
 setenv = VIRTUAL_ENV={envdir}
          BRANCH_NAME=master
          CLIENT_NAME=keystonemiddleware
-         OS_STDOUT_NOCAPTURE=False
-         OS_STDERR_NOCAPTURE=False
+         OS_STDOUT_CAPTURE=1
+         OS_STDERR_CAPTURE=1
+         OS_TEST_TIMEOUT=60
          TESTS_DIR=./keystonemiddleware/tests/unit/
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        .[audit_notifications]
-commands = ostestr {posargs}
+commands = stestr run {posargs}
 
 [testenv:pep8]
 commands =