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

Merge branch 'development' into even_more_endpoints

Browse source
This commit is contained in:
sneakypete81 2013-09-07 09:13:04 +01:00
commit 8c8c0e6bd5
2 changed files with 59 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

147
tests/unit/test_http_errors.py
View file

@ -1,6 +1,8 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
import httpretty import httpretty
from httpretty import GET, POST
from ddt import ddt, data
# TEMP: Temporary hack until httpretty string checking is fixed # TEMP: Temporary hack until httpretty string checking is fixed
if httpretty.compat.PY3: if httpretty.compat.PY3:
@ -11,8 +13,10 @@ try:
except ImportError: except ImportError:
import unittest import unittest
from test_http import GetOrPost
import trovebox import trovebox
@ddt
class TestHttpErrors(unittest.TestCase): class TestHttpErrors(unittest.TestCase):
test_host = "test.example.com" test_host = "test.example.com"
test_endpoint = "test.json" test_endpoint = "test.json"
@ -42,146 +46,93 @@ class TestHttpErrors(unittest.TestCase):
**kwds) **kwds)
@httpretty.activate @httpretty.activate
def test_get_with_error_status(self): @data(GET, POST)
def test_error_status(self, method):
""" """
Check that an error status causes the get method Check that an error status causes the get/post methods
to raise an exception to raise an exception
""" """
self._register_uri(httpretty.GET, status=500) self._register_uri(method, status=500)
with self.assertRaises(trovebox.TroveboxError): with self.assertRaises(trovebox.TroveboxError):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_error_status(self): @data(GET, POST)
def test_404_status(self, method):
""" """
Check that an error status causes the post method Check that a 404 status causes the get/post methods
to raise an exception
"""
self._register_uri(httpretty.POST, status=500)
with self.assertRaises(trovebox.TroveboxError):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_404_status(self):
"""
Check that a 404 status causes the get method
to raise a 404 exception to raise a 404 exception
""" """
self._register_uri(httpretty.GET, status=404) self._register_uri(method, status=404)
with self.assertRaises(trovebox.Trovebox404Error): with self.assertRaises(trovebox.Trovebox404Error):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_404_status(self): @data(GET, POST)
def test_with_invalid_json(self, method):
""" """
Check that a 404 status causes the post method Check that invalid JSON causes the get/post methods to
to raise a 404 exception
"""
self._register_uri(httpretty.POST, status=404)
with self.assertRaises(trovebox.Trovebox404Error):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_invalid_json(self):
"""
Check that invalid JSON causes the get method to
raise an exception raise an exception
""" """
self._register_uri(httpretty.GET, body="Invalid JSON") self._register_uri(method, body="Invalid JSON")
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_invalid_json(self): @data(GET, POST)
def test_with_error_status_and_invalid_json(self, method):
""" """
Check that invalid JSON causes the post method to Check that invalid JSON causes the get/post methods to raise
raise an exception an exception, even with an error status is returned
""" """
self._register_uri(httpretty.POST, body="Invalid JSON") self._register_uri(method, body="Invalid JSON", status=500)
with self.assertRaises(ValueError):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_error_status_and_invalid_json(self):
"""
Check that invalid JSON causes the get method to raise an exception,
even with an error status is returned
"""
self._register_uri(httpretty.GET, body="Invalid JSON", status=500)
with self.assertRaises(trovebox.TroveboxError): with self.assertRaises(trovebox.TroveboxError):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_error_status_and_invalid_json(self): @data(GET, POST)
def test_with_404_status_and_invalid_json(self, method):
""" """
Check that invalid JSON causes the post method to raise an exception, Check that invalid JSON causes the get/post methods to raise
even with an error status is returned an exception, even with a 404 status is returned
""" """
self._register_uri(httpretty.POST, body="Invalid JSON", status=500) self._register_uri(method, body="Invalid JSON", status=404)
with self.assertRaises(trovebox.TroveboxError):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_404_status_and_invalid_json(self):
"""
Check that invalid JSON causes the get method to raise an exception,
even with a 404 status is returned
"""
self._register_uri(httpretty.GET, body="Invalid JSON", status=404)
with self.assertRaises(trovebox.Trovebox404Error): with self.assertRaises(trovebox.Trovebox404Error):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_404_status_and_invalid_json(self): @data(GET, POST)
def test_with_duplicate_status(self, method):
""" """
Check that invalid JSON causes the post method to raise an exception, Check that a get/post with a duplicate status
even with a 404 status is returned
"""
self._register_uri(httpretty.POST, body="Invalid JSON", status=404)
with self.assertRaises(trovebox.Trovebox404Error):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_duplicate_status(self):
"""
Check that a get with a duplicate status
raises a duplicate exception raises a duplicate exception
""" """
data = {"message": "This photo already exists", "code": 409} data = {"message": "This photo already exists", "code": 409}
self._register_uri(httpretty.GET, data=data, status=409) self._register_uri(method, data=data, status=409)
with self.assertRaises(trovebox.TroveboxDuplicateError): with self.assertRaises(trovebox.TroveboxDuplicateError):
self.client.get(self.test_endpoint) GetOrPost(self.client, method).call(self.test_endpoint)
@httpretty.activate @httpretty.activate
def test_post_with_duplicate_status(self): @data(GET, POST)
""" def test_with_status_code_mismatch(self, method):
Check that a post with a duplicate status
raises a duplicate exception
"""
data = {"message": "This photo already exists", "code": 409}
self._register_uri(httpretty.POST, data=data, status=409)
with self.assertRaises(trovebox.TroveboxDuplicateError):
self.client.post(self.test_endpoint)
@httpretty.activate
def test_get_with_status_code_mismatch(self):
""" """
Check that a mismatched HTTP status code still returns the Check that a mismatched HTTP status code still returns the
JSON status code for get requests. JSON status code.
""" """
data = {"message": "Test Message", "code": 202} data = {"message": "Test Message", "code": 202}
self._register_uri(httpretty.GET, data=data, status=200) self._register_uri(method, data=data, status=200)
response = self.client.get(self.test_endpoint) response = GetOrPost(self.client, method).call(self.test_endpoint)
self.assertEqual(response["code"], 202) self.assertEqual(response["code"], 202)
@httpretty.activate @httpretty.activate
def test_post_with_status_code_mismatch(self): @data(GET, POST)
def test_http_error_with_no_response_processing(self, method):
""" """
Check that a mismatched HTTP status code still returns the Check that get/post methods work with response processing disabled
JSON status code for post requests. when an HTTP error code is returned.
""" """
data = {"message": "Test Message", "code": 202} httpretty.register_uri(method, self.test_uri, status=500)
self._register_uri(httpretty.POST, data=data, status=200) with self.assertRaises(trovebox.TroveboxError):
response = self.client.post(self.test_endpoint) response = GetOrPost(self.client, method).call(self.test_endpoint,
self.assertEqual(response["code"], 202) process_response=False)

12
trovebox/http.py
View file

@ -113,7 +113,11 @@ class Http(object):
if process_response: if process_response:
return self._process_response(response) return self._process_response(response)
else: else:
return response.text if 200 <= response.status_code < 300:
return response.text
else:
raise TroveboxError("HTTP Error %d: %s" %
(response.status_code, response.reason))
def post(self, endpoint, process_response=True, files=None, **params): def post(self, endpoint, process_response=True, files=None, **params):
""" """
@ -163,7 +167,11 @@ class Http(object):
if process_response: if process_response:
return self._process_response(response) return self._process_response(response)
else: else:
return response.text if 200 <= response.status_code < 300:
return response.text
else:
raise TroveboxError("HTTP Error %d: %s" %
(response.status_code, response.reason))
def _construct_url(self, endpoint): def _construct_url(self, endpoint):
"""Return the full URL to the specified endpoint""" """Return the full URL to the specified endpoint"""