diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-11 13:29:56 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-07-11 13:29:56 -0400 |
| commit | 02b0ca3e44626623c70d04ccaa50af8c75d640af (patch) | |
| tree | b988f3c33b5355d419ed168f9cd3fb9b7e55cdf2 /nova | |
| parent | 07b8fc85bb5af2e76a9d970a3ea818aa65dc3b1f (diff) | |
updating code to implement tests
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/servers.py | 4 | ||||
| -rw-r--r-- | nova/tests/integrated/api/client.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 15d23dc09..12af44a8d 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -606,9 +606,9 @@ class ControllerV11(Controller): return self.helper._get_server_admin_password_new_style(server) -class HeadersSerializer(wsgi.DictSerializer): +class HeadersSerializer(wsgi.ResponseHeadersSerializer): - def delete(self, response): + def delete(self, response, data): response.status_int = 204 diff --git a/nova/tests/integrated/api/client.py b/nova/tests/integrated/api/client.py index 3d255b40c..59cc3b564 100644 --- a/nova/tests/integrated/api/client.py +++ b/nova/tests/integrated/api/client.py @@ -174,7 +174,7 @@ class TestOpenStackClient(object): def api_delete(self, relative_uri, **kwargs): kwargs['method'] = 'DELETE' - kwargs.setdefault('check_response_status', [200, 202]) + kwargs.setdefault('check_response_status', [200, 202, 204]) return self.api_request(relative_uri, **kwargs) def get_server(self, server_id): |