aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-17 16:49:46 +0000
committerGerrit Code Review <review@openstack.org>2016-01-17 16:49:46 +0000
commitc531338fef2b0d904bc9c8a85416806c77fd3cb1 (patch)
treec8593cdefb7b430872311c52c74ede88c2315a03
parent040eb49130bad0bfa6e8740940c8df92aedc51a2 (diff)
parent3ce3b5b889ada27e528f6013e6cb710714b3890c (diff)
downloadkolla-c531338fef2b0d904bc9c8a85416806c77fd3cb1.tar.gz
kolla-c531338fef2b0d904bc9c8a85416806c77fd3cb1.zip
Merge "make the testr.conf required environment pass throught in tox"
-rw-r--r--tox.ini2
1 files changed, 2 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 6c8c1eb3f..45851cfcf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,8 @@ install_command = pip install -U {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+ OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT
+ PYTHON OS_TEST_PATH LISTOPT IDOPTION
commands =
find . -type f -name "*.pyc" -delete
python setup.py test --slowest --testr-args='{posargs}'