openstack/deb-python-falcon
Code Issues Proposed changes

test(Request): 100% code coverage

Browse Source
This commit is contained in:
Kurt Griffiths
2013-02-11 16:52:26 -05:00
parent 0bebd0f23f
commit 1cb2ab0452
4 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
falcon/exceptions.py
View File

@@ -178,7 +178,7 @@ class HTTPPreconditionFailed(HTTPError):
class HTTPUnsupportedMediaType(HTTPError): class HTTPUnsupportedMediaType(HTTPError):
"""415 Unsupported Media Type """415 Unsupported Media Type
Sets title to "Unsupported Media Type". Sets title to "Unsupported media type".
Args: Args:
description: Human-friendly description of the error, along with a description: Human-friendly description of the error, along with a
@@ -188,7 +188,7 @@ class HTTPUnsupportedMediaType(HTTPError):
""" """
def __init__(self, description, **kwargs): def __init__(self, description, **kwargs):
HTTPError.__init__(self, status.HTTP_415, 'Unsupported Media Type', HTTPError.__init__(self, status.HTTP_415, 'Unsupported media type',
description, **kwargs) description, **kwargs)
@@ -220,8 +220,7 @@ class HTTPUpgradeRequired(HTTPError):
""" """
def __init__(self, title, description, **kwargs): def __init__(self, title, description, **kwargs):
HTTPError.__init__(self, status.HTTP_426, 'Upgrade Required', HTTPError.__init__(self, status.HTTP_426, title, description, **kwargs)
description, **kwargs)
class HTTPInternalServerError(HTTPError): class HTTPInternalServerError(HTTPError):

12
falcon/request.py
View File

@@ -238,8 +238,8 @@ class Request(object):
if not required: if not required:
return default return default
raise HTTPBadRequest('Missing header', description = 'The "' + name + '" header is required.'
'The "' + name + '" header is required.') raise HTTPBadRequest('Missing header', description)
def get_param(self, name, default=None, required=False): def get_param(self, name, default=None, required=False):
"""Return the value of a query string parameter as a string """Return the value of a query string parameter as a string
@@ -269,8 +269,8 @@ class Request(object):
if not required: if not required:
return default return default
raise HTTPBadRequest('Missing query parameter', message = 'The "' + name + '" query parameter is required.'
'The "' + name + '" query parameter is required.') raise HTTPBadRequest('Missing query parameter', message)
def get_param_as_int(self, name, default=None, required=False): def get_param_as_int(self, name, default=None, required=False):
"""Return the value of a query string parameter as an int """Return the value of a query string parameter as an int
@@ -306,8 +306,8 @@ class Request(object):
if not required: if not required:
return default return default
raise HTTPBadRequest('Missing query parameter', message = 'The "' + name + '" query parameter is required.'
'The "' + name + '" query parameter is required.') raise HTTPBadRequest('Missing query parameter', message)
def get_param_as_list(self, name, default=None, required=False): def get_param_as_list(self, name, default=None, required=False):
"""Return the value of a query string parameter as an int """Return the value of a query string parameter as an int

7
tests/test_headers.py
View File

@@ -100,6 +100,13 @@ class TestHeaders(testing.TestSuite):
value = self.resource.req.get_header('X-Not-Found', '876') value = self.resource.req.get_header('X-Not-Found', '876')
self.assertEquals(value, '876') self.assertEquals(value, '876')
def test_required_header(self):
self._simulate_request(self.test_route)
self.assertRaises(falcon.HTTPBadRequest,
self.resource.req.get_header, 'X-Not-Found',
required=True)
def test_prefer_host_header(self): def test_prefer_host_header(self):
self._simulate_request(self.test_route) self._simulate_request(self.test_route)

13
tests/test_query_params.py
View File

@@ -1,3 +1,4 @@
import falcon
import falcon.testing as testing import falcon.testing as testing
@@ -23,6 +24,18 @@ class TestQueryParams(testing.TestSuite):
self.assertEquals(req.get_param('marker'), 'deadbeef') self.assertEquals(req.get_param('marker'), 'deadbeef')
self.assertEquals(req.get_param('limit'), '25') self.assertEquals(req.get_param('limit'), '25')
def test_required(self):
query_string = ''
self._simulate_request('/', query_string=query_string)
req = self.resource.req
self.assertRaises(falcon.HTTPBadRequest, req.get_param,
'marker', required=True)
self.assertRaises(falcon.HTTPBadRequest, req.get_param_as_int,
'marker', required=True)
self.assertRaises(falcon.HTTPBadRequest, req.get_param_as_list,
'marker', required=True)
def test_int(self): def test_int(self):
query_string = 'marker=deadbeef&limit=25' query_string = 'marker=deadbeef&limit=25'
self._simulate_request('/', query_string=query_string) self._simulate_request('/', query_string=query_string)