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>
This commit is contained in:
Doug Hellmann 2018-01-30 11:00:13 -05:00
parent 82b65ab421
commit 1044a1369f

View File

@ -10,7 +10,6 @@ setenv =
VIRTUAL_ENV={envdir} VIRTUAL_ENV={envdir}
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
OS_TEST_TIMEOUT=60
passenv = OS_TEST_TIMEOUT passenv = OS_TEST_TIMEOUT
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt