summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-08-31 10:38:32 +0000
committerGerrit Code Review <review@openstack.org>2021-08-31 10:38:32 +0000
commit69fa73a153239383054530cf7a6b98af03ad713f (patch)
treeb86b0fb4140550dc6fa8d1beb1d5960a31f5c69e
parentaba49e1b275f8a43cb808e394d6847de5928ef02 (diff)
parentfa00aff41b266f46362b581ac48b4cec1692de71 (diff)
downloadpython-cinderclient-69fa73a153239383054530cf7a6b98af03ad713f.tar.gz
Merge "Unset tempest.lib timeout in functional tests" into stable/wallaby
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 9100669..8412d31 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,6 +84,11 @@ setenv =
OS_VOLUME_API_VERSION = 3
# must define this here so it can be inherited by the -py3* environments
OS_CINDERCLIENT_EXEC_DIR = {envdir}/bin
+ # Our functional tests contain their own timeout handling, so
+ # turn off the timeout handling provided by the
+ # tempest.lib.base.BaseTestCase that our ClientTestBase class
+ # inherits from.
+ OS_TEST_TIMEOUT=0
# The OS_CACERT environment variable should be passed to the test
# environments to specify a CA bundle file to use in verifying a