diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py index fa46bee71c..498cacbd5c 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py @@ -1090,19 +1090,22 @@ class ServersControllerTest(ControllerTest): self.assertEqual(res_dict['server']['accessIPv6'], 'beef::123') def test_update_server_invalid_xml_raises_lookup(self): - req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID) + req = webob.Request.blank('/v3/servers/%s' % FAKE_UUID) req.method = 'PUT' req.content_type = 'application/xml' #xml request which raises LookupError req.body = """ """ - res = req.get_response(fakes.wsgi_app()) + key="Label">""" + res = req.get_response(fakes.wsgi_app_v3()) self.assertEqual(res.status_int, 400) + res_dict = jsonutils.loads(res.body) + self.assertEqual(res_dict['badRequest']['message'], + "Malformed request body") def test_update_server_invalid_xml_raises_expat(self): - req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID) + req = webob.Request.blank('/v3/servers/%s' % FAKE_UUID) req.method = 'PUT' req.content_type = 'application/xml' #xml request which raises ExpatError @@ -1110,8 +1113,11 @@ class ServersControllerTest(ControllerTest): """ - res = req.get_response(fakes.wsgi_app()) + res = req.get_response(fakes.wsgi_app_v3()) self.assertEqual(res.status_int, 400) + res_dict = jsonutils.loads(res.body) + self.assertEqual(res_dict['badRequest']['message'], + "Malformed request body") def test_update_server_name(self): self.stubs.Set(db, 'instance_get',