commit 3a28a10aba525b93b05efac2d50d6a2586ef9bbb
author Zuul <zuul@review.openstack.org> Fri Feb 23 16:11:47 2018 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 23 16:11:47 2018 +0000
tree b8cec537385b14f7c601d744a30ab83fbbfb54c7
parent fb991ba1ed9d978d3f8a7551d6f8ed08aa49e47b
parent 3c6b15db0dbb372480368c3da540e9835727e9b8

Merge "Add test for tempest run with a whitelist file"

tox.ini

diff --git a/tox.ini b/tox.ini
index 892b6f4..5644641 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,6 +16,9 @@
 setenv =
     VIRTUAL_ENV={envdir}
     OS_LOG_CAPTURE=1
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=160
     PYTHONWARNINGS=default::DeprecationWarning
 passenv = OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_TEST_TIMEOUT OS_TEST_LOCK_PATH TEMPEST_CONFIG TEMPEST_CONFIG_DIR http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY ZUUL_CACHE_DIR REQUIREMENTS_PIP_LOCATION GENERATE_TEMPEST_PLUGIN_LIST
 usedevelop = True