openstack/neutron
Code Issues Proposed changes

Allow OS_TEST_TIMEOUT to be configurable from env

Browse Source 
the OS_TEST_TIMEOUT of 180 is too short for
some test servers.  Allow it to be modified from the
outside via environment.  Currently I have to sed the tox.ini
file to fix this.

Change-Id: Ib0e9aa0fff4cd26be115cc4b12036e9ee5e737f3
This commit is contained in:
Mike Bayer 2017-09-12 15:11:03 -04:00
parent 863fb129f9
commit 67589fbf99
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tox.ini
View File

@ -20,7 +20,7 @@ commands =
[testenv:common] [testenv:common]
# Fake job to define environment variables shared between dsvm/non-dsvm jobs # Fake job to define environment variables shared between dsvm/non-dsvm jobs
setenv = OS_TEST_TIMEOUT=180 setenv = OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:180}
commands = false commands = false
[testenv:dsvm] [testenv:dsvm]
@ -72,7 +72,7 @@ setenv = {[testenv]setenv}
{[testenv:common]setenv} {[testenv:common]setenv}
{[testenv:dsvm]setenv} {[testenv:dsvm]setenv}
# workaround for DB teardown lock contention (bug/1541742) # workaround for DB teardown lock contention (bug/1541742)
OS_TEST_TIMEOUT=600 OS_TEST_TIMEOUT={env:OS_TEST_TIMEOUT:600}
OS_TEST_PATH=./neutron/tests/fullstack OS_TEST_PATH=./neutron/tests/fullstack
deps = deps =
{[testenv:functional]deps} {[testenv:functional]deps}