summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tox.ini5
1 files changed, 5 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index fb1f64b..3956036 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,6 +88,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