summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-31 13:17:52 +0000
committerGerrit Code Review <review@openstack.org>2018-10-31 13:17:52 +0000
commited53ee13c7ce4a3efef1dfefebb4242a0c955b60 (patch)
treecdef4bba872794c81a4f08a774bc1bf90d195a91
parentd0f3ee2e6df9534f5aa57fc4ae9f0edb45a2fc83 (diff)
parentccb663c9663546bf0de229a55c6752946d67a424 (diff)
Merge "Bump the OS_TEST_TIMEOUT for functional tests"
-rw-r--r--tox.ini6
1 files changed, 3 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index 87600e1..38449a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,7 +32,7 @@ commands = {posargs}
32setenv = 32setenv =
33 {[testenv]setenv} 33 {[testenv]setenv}
34 OS_TEST_PATH=./networking_ovn/tests/functional 34 OS_TEST_PATH=./networking_ovn/tests/functional
35 OS_TEST_TIMEOUT=120 35 OS_TEST_TIMEOUT=240
36deps = {[testenv]deps} 36deps = {[testenv]deps}
37 -r{toxinidir}/networking_ovn/tests/functional/requirements.txt 37 -r{toxinidir}/networking_ovn/tests/functional/requirements.txt
38 38
@@ -41,12 +41,12 @@ basepython = python3.5
41setenv = 41setenv =
42 {[testenv]setenv} 42 {[testenv]setenv}
43 OS_TEST_PATH=./networking_ovn/tests/functional 43 OS_TEST_PATH=./networking_ovn/tests/functional
44 OS_TEST_TIMEOUT=120 44 OS_TEST_TIMEOUT=240
45deps = {[testenv]deps} 45deps = {[testenv]deps}
46 46
47[testenv:dsvm] 47[testenv:dsvm]
48# Fake job to define environment variables shared between dsvm jobs 48# Fake job to define environment variables shared between dsvm jobs
49setenv = OS_TEST_TIMEOUT=120 49setenv = OS_TEST_TIMEOUT=240
50 OS_LOG_PATH={env:OS_LOG_PATH:/opt/stack/logs} 50 OS_LOG_PATH={env:OS_LOG_PATH:/opt/stack/logs}
51commands = false 51commands = false
52 52