Change servers client to return one value and update tests
get_console_output and rescue_server are a little different but I did not
change them fundamentally in this commit.
Partially implements: blueprint clients-return-one-value
Change-Id: I44026cac62084b868eb47aedb43c17d38ac8e43b
diff --git a/tempest/api/compute/servers/test_instance_actions.py b/tempest/api/compute/servers/test_instance_actions.py
index 103c241..e02c41b 100644
--- a/tempest/api/compute/servers/test_instance_actions.py
+++ b/tempest/api/compute/servers/test_instance_actions.py
@@ -30,11 +30,10 @@
@test.attr(type='gate')
def test_list_instance_actions(self):
# List actions of the provided server
- resp, body = self.client.reboot(self.server_id, 'HARD')
+ self.client.reboot(self.server_id, 'HARD')
self.client.wait_for_server_status(self.server_id, 'ACTIVE')
- resp, body = self.client.list_instance_actions(self.server_id)
- self.assertEqual(200, resp.status)
+ body = self.client.list_instance_actions(self.server_id)
self.assertTrue(len(body) == 2, str(body))
self.assertTrue(any([i for i in body if i['action'] == 'create']))
self.assertTrue(any([i for i in body if i['action'] == 'reboot']))
@@ -42,8 +41,7 @@
@test.attr(type='gate')
def test_get_instance_action(self):
# Get the action details of the provided server
- resp, body = self.client.get_instance_action(self.server_id,
- self.request_id)
- self.assertEqual(200, resp.status)
+ body = self.client.get_instance_action(self.server_id,
+ self.request_id)
self.assertEqual(self.server_id, body['instance_uuid'])
self.assertEqual('create', body['action'])