Increase delete_server timeout to 60 seconds

Change-Id: If40772482d72267b0113b773537156b52a141f5b
Closes-Bug: #1607808
(cherry picked from commit ddd691205d)
This commit is contained in:
Maksym Strukov 2016-10-20 17:11:21 +03:00 committed by Vladimir Khlyunev
parent 7e4223630b
commit 0cd75f47ce
4 changed files with 8 additions and 8 deletions

View File

@ -136,7 +136,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)
@ -180,7 +180,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)

View File

@ -154,7 +154,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)
@ -232,7 +232,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)
@ -285,7 +285,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)
@ -361,6 +361,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)

View File

@ -180,6 +180,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)

View File

@ -371,7 +371,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