openstack/ironic
Code Issues Proposed changes

Fix usage of rest_client expected_success() in tests

Browse Source 
rest_client expected_success() method expect read_code
must be int and states the same in doc string .

Tempest is converting that to error instead of false pass.
Details: I3f4c58bdbb172805514831103927d3464d65d7f3

Change-Id: Ic4b0af5701df99621e3abb693644c4824c92dc4c
This commit is contained in:
ghanshyam
2016-04-21 17:19:06 +09:00
parent 151ab7aa49
commit e8dda1db0e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ironic_tempest_plugin/services/baremetal/base.py
View File

@@ -110,7 +110,7 @@ class BaremetalClient(rest_client.RestClient):
uri += "?%s" % urllib.urlencode(kwargs) uri += "?%s" % urllib.urlencode(kwargs)
resp, body = self.get(uri) resp, body = self.get(uri)
self.expected_success(200, resp['status']) self.expected_success(200, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@@ -126,7 +126,7 @@ class BaremetalClient(rest_client.RestClient):
else: else:
uri = self._get_uri(resource, uuid=uuid, permanent=permanent) uri = self._get_uri(resource, uuid=uuid, permanent=permanent)
resp, body = self.get(uri) resp, body = self.get(uri)
self.expected_success(200, resp['status']) self.expected_success(200, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@@ -144,7 +144,7 @@ class BaremetalClient(rest_client.RestClient):
uri = self._get_uri(resource) uri = self._get_uri(resource)
resp, body = self.post(uri, body=body) resp, body = self.post(uri, body=body)
self.expected_success(201, resp['status']) self.expected_success(201, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@@ -159,7 +159,7 @@ class BaremetalClient(rest_client.RestClient):
uri = self._get_uri(resource, uuid) uri = self._get_uri(resource, uuid)
resp, body = self.delete(uri) resp, body = self.delete(uri)
self.expected_success(204, resp['status']) self.expected_success(204, resp.status)
return resp, body return resp, body
def _patch_request(self, resource, uuid, patch_object): def _patch_request(self, resource, uuid, patch_object):
@@ -175,7 +175,7 @@ class BaremetalClient(rest_client.RestClient):
patch_body = json.dumps(patch_object) patch_body = json.dumps(patch_object)
resp, body = self.patch(uri, body=patch_body) resp, body = self.patch(uri, body=patch_body)
self.expected_success(200, resp['status']) self.expected_success(200, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@handle_errors @handle_errors
@@ -200,5 +200,5 @@ class BaremetalClient(rest_client.RestClient):
put_body = json.dumps(put_object) put_body = json.dumps(put_object)
resp, body = self.put(uri, body=put_body) resp, body = self.put(uri, body=put_body)
self.expected_success(202, resp['status']) self.expected_success([202, 204], resp.status)
return resp, body return resp, body