From 79e7b4fe6dc51ab42db83c41d237062cf7737f00 Mon Sep 17 00:00:00 2001 From: Maksym Strukov Date: Thu, 20 Oct 2016 17:11:21 +0300 Subject: [PATCH] Increase delete_server timeout to 60 seconds Change-Id: If40772482d72267b0113b773537156b52a141f5b Closes-Bug: #1607808 --- fuel_health/tests/smoke/test_create_volume.py | 4 ++-- .../smoke/test_nova_create_instance_with_connectivity.py | 8 ++++---- fuel_health/tests/smoke/test_nova_image_actions.py | 2 +- fuel_health/tests/tests_platform/test_ceilometer.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fuel_health/tests/smoke/test_create_volume.py b/fuel_health/tests/smoke/test_create_volume.py index 7db0367b..451bcadb 100644 --- a/fuel_health/tests/smoke/test_create_volume.py +++ b/fuel_health/tests/smoke/test_create_volume.py @@ -138,7 +138,7 @@ class VolumesTest(nmanager.SmokeChecksTest): "volume deletion", volume) - self.verify(30, self._delete_server, 13, + self.verify(60, self._delete_server, 13, "Can not delete server. ", "server deletion", instance) @@ -182,7 +182,7 @@ class VolumesTest(nmanager.SmokeChecksTest): "instance becoming 'ACTIVE'", instance, 'ACTIVE') - self.verify(30, self._delete_server, 5, + self.verify(60, self._delete_server, 5, "Can not delete server. ", "server deletion", instance) diff --git a/fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py b/fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py index ed8a173e..9586dede 100644 --- a/fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py +++ b/fuel_health/tests/smoke/test_nova_create_instance_with_connectivity.py @@ -157,7 +157,7 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest): self.compute_client, name, security_groups ) - self.verify(30, self._delete_server, 3, + self.verify(60, self._delete_server, 3, "Server can not be deleted.", "server deletion", server) @@ -235,7 +235,7 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest): if self.floating_ips: self.floating_ips.remove(floating_ip) - self.verify(30, self._delete_server, 9, + self.verify(60, self._delete_server, 9, "Server can not be deleted. ", "server deletion", server) @@ -288,7 +288,7 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest): 'public connectivity checking from VM', instance_ip, 30, (9, 30), compute) - self.verify(30, self._delete_server, 4, + self.verify(60, self._delete_server, 4, "Server can not be deleted. ", "server deletion", server) @@ -364,6 +364,6 @@ class TestNovaNetwork(nmanager.NovaNetworkScenarioTest): if self.floating_ips: self.floating_ips.remove(floating_ip) - self.verify(30, self._delete_server, 6, + self.verify(60, self._delete_server, 6, "Server can not be deleted. ", "server deletion", server) diff --git a/fuel_health/tests/smoke/test_nova_image_actions.py b/fuel_health/tests/smoke/test_nova_image_actions.py index 01c169a5..afb28b28 100644 --- a/fuel_health/tests/smoke/test_nova_image_actions.py +++ b/fuel_health/tests/smoke/test_nova_image_actions.py @@ -183,6 +183,6 @@ class TestImageAction(nmanager.SmokeChecksTest): 'booting instance from snapshot', snapshot_image_id) - self.verify(30, self._delete_server, 7, + self.verify(60, self._delete_server, 7, "Server can not be deleted.", "server deletion", server) diff --git a/fuel_health/tests/tests_platform/test_ceilometer.py b/fuel_health/tests/tests_platform/test_ceilometer.py index 9c584b44..03d46eb8 100644 --- a/fuel_health/tests/tests_platform/test_ceilometer.py +++ b/fuel_health/tests/tests_platform/test_ceilometer.py @@ -381,7 +381,7 @@ class CeilometerApiPlatformTests(ceilometermanager.CeilometerBaseTest): fail_msg = 'Failed to delete the server.' msg = 'deleting server' - self.verify(30, self._delete_server, 6, fail_msg, msg, instance) + self.verify(60, self._delete_server, 6, fail_msg, msg, instance) def test_check_glance_notifications(self): """Ceilometer test to check notifications from Glance