Merge "Negative test added for rescuing a paused vm"

This commit is contained in:
Jenkins
2013-07-31 20:55:15 +00:00
committed by Gerrit Code Review

View File

@@ -110,6 +110,11 @@ class ServerRescueTestJSON(base.BaseComputeTest):
self.assertEqual(202, resp.status) self.assertEqual(202, resp.status)
self.servers_client.wait_for_server_status(server_id, 'ACTIVE') self.servers_client.wait_for_server_status(server_id, 'ACTIVE')
def _unpause(self, server_id):
resp, body = self.servers_client.unpause_server(server_id)
self.assertEqual(202, resp.status)
self.servers_client.wait_for_server_status(server_id, 'ACTIVE')
@attr(type='smoke') @attr(type='smoke')
def test_rescue_unrescue_instance(self): def test_rescue_unrescue_instance(self):
resp, body = self.servers_client.rescue_server( resp, body = self.servers_client.rescue_server(
@@ -120,6 +125,18 @@ class ServerRescueTestJSON(base.BaseComputeTest):
self.assertEqual(202, resp.status) self.assertEqual(202, resp.status)
self.servers_client.wait_for_server_status(self.server_id, 'ACTIVE') self.servers_client.wait_for_server_status(self.server_id, 'ACTIVE')
@attr(type=['negative', 'gate'])
def test_rescue_paused_instance(self):
#Rescue a paused server
resp, body = self.servers_client.pause_server(
self.server_id)
self.addCleanup(self._unpause, self.server_id)
self.assertEqual(202, resp.status)
self.servers_client.wait_for_server_status(self.server_id, 'PAUSED')
self.assertRaises(exceptions.Duplicate,
self.servers_client.rescue_server,
self.server_id)
@attr(type=['negative', 'gate']) @attr(type=['negative', 'gate'])
def test_rescued_vm_reboot(self): def test_rescued_vm_reboot(self):
self.assertRaises(exceptions.Duplicate, self.servers_client.reboot, self.assertRaises(exceptions.Duplicate, self.servers_client.reboot,