summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Matzek <smatzek@us.ibm.com>2017-10-14 08:12:00 -0500
committerSamuel Matzek <smatzek@us.ibm.com>2017-10-19 06:23:16 -0500
commitd7b773d2b07f0c95909ef73c4644a63f09fd82c3 (patch)
tree8f49a9d68c44a352d015aebdc24223bb7b131cbb
parentc4c0083f2660504a6de3a0f8937d8265d5f2bede (diff)
Enable integration tests9.0.0.0b1
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
Notes
Notes (review): Code-Review+2: Samuel Matzek <smatzek@us.ibm.com> Workflow+1: Samuel Matzek <smatzek@us.ibm.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 19 Oct 2017 23:11:16 +0000 Reviewed-on: https://review.openstack.org/512018 Project: openstack/trove Branch: refs/heads/master
-rw-r--r--devstack/settings2
-rw-r--r--integration/tests/integration/int_tests.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/devstack/settings b/devstack/settings
index 0495b04..9d926c6 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -35,7 +35,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE}
35TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT} 35TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT}
36TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT} 36TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT}
37TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT} 37TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT}
38TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT} 38TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200}
39TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT} 39TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT}
40TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT} 40TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT}
41TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME} 41TROVE_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 a13eb6e..b139820 100644
--- a/integration/tests/integration/int_tests.py
+++ b/integration/tests/integration/int_tests.py
@@ -252,9 +252,6 @@ def run_main(test_importer):
252 # we want to start a REPL. 252 # we want to start a REPL.
253 sys.exit = lambda x: None 253 sys.exit = lambda x: None
254 254
255 print("Integration tests are temporarily disabled")
256 return 0
257
258 proboscis.TestProgram(argv=nose_args, groups=groups, config=c, 255 proboscis.TestProgram(argv=nose_args, groups=groups, config=c,
259 testRunner=MAIN_RUNNER).run_and_exit() 256 testRunner=MAIN_RUNNER).run_and_exit()
260 sys.stdout = sys.__stdout__ 257 sys.stdout = sys.__stdout__