commit 6af4ffe2482371d9ba237ced2f264b61a7cef50a
author Jenkins <jenkins@review.openstack.org> Mon Oct 06 07:08:04 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Oct 06 07:08:04 2014 +0000
tree b3e2e0fb18e2cbe5fed904bbeb979b0d34f1ce83
parent bea1b3c1a223a5a586025bb9e391c77be3c13076
parent 8f79850de98ea2c89c15f1f82811935dafa57c31

Merge "Fix arguments for method expected_success"

tempest/services/compute/json/images_client.py

diff --git a/tempest/services/compute/json/images_client.py b/tempest/services/compute/json/images_client.py
index 9877391..4af8331 100644
--- a/tempest/services/compute/json/images_client.py
+++ b/tempest/services/compute/json/images_client.py
@@ -76,7 +76,7 @@
     def get_image(self, image_id):
         """Returns the details of a single image."""
         resp, body = self.get("images/%s" % str(image_id))
-        self.expected_success(200, resp)
+        self.expected_success(200, resp.status)
         body = json.loads(body)
         self.validate_response(schema.get_image, resp, body)
         return resp, body['image']

tempest/services/compute/xml/images_client.py

diff --git a/tempest/services/compute/xml/images_client.py b/tempest/services/compute/xml/images_client.py
index 6b15404..94acf36 100644
--- a/tempest/services/compute/xml/images_client.py
+++ b/tempest/services/compute/xml/images_client.py
@@ -127,7 +127,7 @@
     def get_image(self, image_id):
         """Returns the details of a single image."""
         resp, body = self.get("images/%s" % str(image_id))
-        self.expected_success(200, resp)
+        self.expected_success(200, resp.status)
         body = self._parse_image(etree.fromstring(body))
         return resp, body