Merge "Updates for stestr"

.gitignore

@@ -27,6 +27,7 @@ pip-log.txt
 nosetests.xml
 .testrepository
 cover
+.stestr/
 
 # Translations
 *.mo

.stestr.conf

@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./keystonemiddleware/tests/unit}
+top_dir=./

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 =