Merge "Creating or updating a image member in a list causes 500"
This commit is contained in:
commit
919f6b11d5
@ -255,6 +255,10 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
|
|||||||
except ValueError:
|
except ValueError:
|
||||||
msg = _("Member can't be empty")
|
msg = _("Member can't be empty")
|
||||||
raise webob.exc.HTTPBadRequest(explanation=msg)
|
raise webob.exc.HTTPBadRequest(explanation=msg)
|
||||||
|
except TypeError:
|
||||||
|
msg = _('Expected a member in the form: '
|
||||||
|
'{"member": "image_id"}')
|
||||||
|
raise webob.exc.HTTPBadRequest(explanation=msg)
|
||||||
return dict(member_id=member_id)
|
return dict(member_id=member_id)
|
||||||
|
|
||||||
def update(self, request):
|
def update(self, request):
|
||||||
@ -264,6 +268,10 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer):
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
msg = _("Status not specified")
|
msg = _("Status not specified")
|
||||||
raise webob.exc.HTTPBadRequest(explanation=msg)
|
raise webob.exc.HTTPBadRequest(explanation=msg)
|
||||||
|
except TypeError:
|
||||||
|
msg = _('Expected a status in the form: '
|
||||||
|
'{"status": "status"}')
|
||||||
|
raise webob.exc.HTTPBadRequest(explanation=msg)
|
||||||
return dict(status=status)
|
return dict(status=status)
|
||||||
|
|
||||||
|
|
||||||
|
@ -540,6 +540,18 @@ class TestImagesDeserializer(test_utils.BaseTestCase):
|
|||||||
self.assertRaises(webob.exc.HTTPBadRequest, self.deserializer.create,
|
self.assertRaises(webob.exc.HTTPBadRequest, self.deserializer.create,
|
||||||
request)
|
request)
|
||||||
|
|
||||||
|
def test_create_list_return_error(self):
|
||||||
|
request = unit_test_utils.get_fake_request()
|
||||||
|
request.body = jsonutils.dump_as_bytes([TENANT1])
|
||||||
|
self.assertRaises(webob.exc.HTTPBadRequest, self.deserializer.create,
|
||||||
|
request)
|
||||||
|
|
||||||
|
def test_update_list_return_error(self):
|
||||||
|
request = unit_test_utils.get_fake_request()
|
||||||
|
request.body = jsonutils.dump_as_bytes([TENANT1])
|
||||||
|
self.assertRaises(webob.exc.HTTPBadRequest, self.deserializer.update,
|
||||||
|
request)
|
||||||
|
|
||||||
def test_update(self):
|
def test_update(self):
|
||||||
request = unit_test_utils.get_fake_request()
|
request = unit_test_utils.get_fake_request()
|
||||||
request.body = jsonutils.dump_as_bytes({'status': 'accepted'})
|
request.body = jsonutils.dump_as_bytes({'status': 'accepted'})
|
||||||
|
Loading…
Reference in New Issue
Block a user