summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-09-17 16:02:04 +0000
committerGerrit Code Review <review@openstack.org>2021-09-17 16:02:04 +0000
commitd68ed38d7302f8509863c08f040e96e9900f3d05 (patch)
tree4cb29a867f3319326673a611375db43bb3f1e46d
parent2239d425f9ef38270bd309f55fb75401641ea59d (diff)
parentf7b35078861091edc3538429a436118b7ce30628 (diff)
downloadpython-cinderclient-d68ed38d7302f8509863c08f040e96e9900f3d05.tar.gz
Merge "Unset tempest.lib timeout in functional tests" into stable/victoria
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 236cf6d..b58621b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -87,6 +87,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