yetangitu/photo-python
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Status code mismatches are actually quite common.

Browse source 
Rather than raise an exception, just ensure we return the JSON code.
This commit is contained in:
sneakypete81 2013-06-30 18:04:36 +01:00
parent 413cf297a3
commit 971bab4f7b
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openphoto/openphoto_http.py
View file

@ -199,10 +199,6 @@ class OpenPhotoHttp:
raise OpenPhotoError("HTTP Error %d: %s" % raise OpenPhotoError("HTTP Error %d: %s" %
(response.status_code, response.reason)) (response.status_code, response.reason))
if code != response.status_code:
raise OpenPhotoError(("Response status code %d does not match " +
"JSON status code %d") % (response.status_code,
code))
if 200 <= code < 300: if 200 <= code < 300:
return json_response return json_response
elif (code == DUPLICATE_RESPONSE["code"] and elif (code == DUPLICATE_RESPONSE["code"] and

22
tests/unit/test_http_errors.py
View file

@ -166,22 +166,24 @@ class TestHttpErrors(unittest.TestCase):
@httpretty.activate @httpretty.activate
def test_get_with_status_code_mismatch(self): def test_get_with_status_code_mismatch(self):
""" """
Check that an exception is raised if a get returns a Check that a mismatched HTTP status code still returns the
status code that doesn't match the JSON code JSON status code for get requests.
""" """
data = {"message": "Test Message", "code": 200} data = {"message": "Test Message", "code": 202}
self._register_uri(httpretty.GET, data=data, status=202) self._register_uri(httpretty.GET, data=data, status=200)
with self.assertRaises(openphoto.OpenPhotoError): response = self.client.get(self.test_endpoint)
self.client.get(self.test_endpoint) self.assertEqual(response["code"], 202)
# TODO: Status code mismatch should raise an exception
@unittest.expectedFailure
@httpretty.activate @httpretty.activate
def test_post_with_status_code_mismatch(self): def test_post_with_status_code_mismatch(self):
""" """
Check that an exception is raised if a post returns a Check that a mismatched HTTP status code still returns the
status code that doesn't match the JSON code JSON status code for post requests.
""" """
data = {"message": "Test Message", "code": 200} data = {"message": "Test Message", "code": 200}
self._register_uri(httpretty.POST, data=data, status=202) self._register_uri(httpretty.POST, data=data, status=202)
with self.assertRaises(openphoto.OpenPhotoError): response = self.client.post(self.test_endpoint)
self.client.post(self.test_endpoint) self.assertEqual(response["code"], 202)