From d7b773d2b07f0c95909ef73c4644a63f09fd82c3 Mon Sep 17 00:00:00 2001 From: Samuel Matzek Date: Sat, 14 Oct 2017 08:12:00 -0500 Subject: [PATCH] Enable integration tests Re-enable the integration tests. Integration tests were temporarily disabled under 9ec134996a1162de0d74ef915dc138bbacbcfdf1 to avoid the circular dependency with python-troveclient and allow the merging of the python-troveclient changes necessary to complete the fixing of the gates. This also increases the TROVE_AGENT_CALL_HIGH_TIMEOUT to help the upgrade test pass. The upgrade test has an agent call that takes longer than the current timeout when running in the gate on Nova compute with virt_type set as qemu. Change-Id: I8459cd64cdf6107e537f4e7c793c3626fa4bf9f9 --- devstack/settings | 2 +- integration/tests/integration/int_tests.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/devstack/settings b/devstack/settings index 0495b04edc..9d926c6d96 100644 --- a/devstack/settings +++ b/devstack/settings @@ -35,7 +35,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE} TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT} TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT} TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT} -TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT} +TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200} TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT} TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT} TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME} diff --git a/integration/tests/integration/int_tests.py b/integration/tests/integration/int_tests.py index a13eb6eb6e..b139820a80 100644 --- a/integration/tests/integration/int_tests.py +++ b/integration/tests/integration/int_tests.py @@ -252,9 +252,6 @@ def run_main(test_importer): # we want to start a REPL. sys.exit = lambda x: None - print("Integration tests are temporarily disabled") - return 0 - proboscis.TestProgram(argv=nose_args, groups=groups, config=c, testRunner=MAIN_RUNNER).run_and_exit() sys.stdout = sys.__stdout__