From 67589fbf9935a186229b0aaecacc33d3c9753e3d Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 12 Sep 2017 15:11:03 -0400
Subject: [PATCH] Allow OS_TEST_TIMEOUT to be configurable from env

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
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 5ef92582977..362036c8d20 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@ commands =
 
 [testenv:common]
 # 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
 
 [testenv:dsvm]
@@ -72,7 +72,7 @@ setenv = {[testenv]setenv}
          {[testenv:common]setenv}
          {[testenv:dsvm]setenv}
          # 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
 deps =
   {[testenv:functional]deps}