openstack/trove
Code Issues Proposed changes

Merge "Increase time_out to 30 sec for failing int-tests"

Browse Source
This commit is contained in:
Jenkins
2014-06-09 07:12:22 +00:00
committed by Gerrit Code Review
parent 1bda572186 1ffe49cdbf
commit 9314db40bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trove/tests/api/configurations.py
View File

@@ -268,7 +268,7 @@ class AfterConfigurationsCreation(object):
configuration=config_id) configuration=config_id)
@test(depends_on=[test_assign_configuration_to_valid_instance]) @test(depends_on=[test_assign_configuration_to_valid_instance])
@time_out(10) @time_out(30)
def test_get_configuration_details_from_instance_validation(self): def test_get_configuration_details_from_instance_validation(self):
# validate that the configuraiton was applied correctly to the instance # validate that the configuraiton was applied correctly to the instance
inst = instance_info.dbaas.instances.get(instance_info.id) inst = instance_info.dbaas.instances.get(instance_info.id)
@@ -414,7 +414,7 @@ class ListConfigurations(object):
poll_until(result_is_active) poll_until(result_is_active)
@test(depends_on=[test_restart_service_should_return_active]) @test(depends_on=[test_restart_service_should_return_active])
@time_out(10) @time_out(30)
def test_get_configuration_details_from_instance_validation(self): def test_get_configuration_details_from_instance_validation(self):
# validate that the configuraiton was applied correctly to the instance # validate that the configuraiton was applied correctly to the instance
inst = instance_info.dbaas.instances.get(instance_info.id) inst = instance_info.dbaas.instances.get(instance_info.id)
@@ -484,7 +484,7 @@ class WaitForConfigurationInstanceToFinish(object):
poll_until(result_is_active) poll_until(result_is_active)
@test(depends_on=[test_instance_with_configuration_active]) @test(depends_on=[test_instance_with_configuration_active])
@time_out(10) @time_out(30)
def test_get_configuration_details_from_instance_validation(self): def test_get_configuration_details_from_instance_validation(self):
# validate that the configuraiton was applied correctly to the instance # validate that the configuraiton was applied correctly to the instance
inst = instance_info.dbaas.instances.get(configuration_instance.id) inst = instance_info.dbaas.instances.get(configuration_instance.id)