From 1044a1369f35ad0d6d1d0cf9f8ce1285a5d11d46 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Tue, 30 Jan 2018 11:00:13 -0500
Subject: [PATCH] do not set OS_TEST_TIMEOUT in tox.ini

Do not set the variable in tox.ini, because that overrides any value
the user is trying to pass on the command line or from their
environment. A default is already set in .testr.conf using shell
syntax that supports using the value from the user if there is one.

Change-Id: I5ff1880655e927ea596217154958fb95857f5649
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 1136957a..3646f558 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ setenv =
     VIRTUAL_ENV={envdir}
     OS_STDERR_CAPTURE=1
     OS_STDOUT_CAPTURE=1
-    OS_TEST_TIMEOUT=60
 passenv = OS_TEST_TIMEOUT
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt