summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-08-05 16:27:04 +0000
committerGerrit Code Review <review@openstack.org>2021-08-05 16:27:04 +0000
commitfe1a377527ae8477246571eaa2a785014f746af5 (patch)
treee1c2b7ffbe03a7da901e5020131cd656c95b5561
parent48cedc6ad1d730b3f1960daff744af9b6fb26c1f (diff)
parentd04ded6a6ff4cc9ba8377a1b025493e939047b2c (diff)
downloadpython-cinderclient-fe1a377527ae8477246571eaa2a785014f746af5.tar.gz
Merge "Unset tempest.lib timeout in functional tests"
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 935de96..a9d74ce 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