openstack/trove
Code Issues Proposed changes

Enable integration tests

Browse Source 
Re-enable the integration tests.

Integration tests were temporarily disabled under
9ec134996a 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
This commit is contained in:
Samuel Matzek 2017-10-14 08:12:00 -05:00
parent c4c0083f26
commit d7b773d2b0
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/settings
View File

@ -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}

3
integration/tests/integration/int_tests.py
View File

@ -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__