openstack/glance
Code Issues Proposed changes

Fixes build failures due to webob upgrade. Updated pop-requires as well

Browse Source
This commit is contained in:
Brian Waldon 2011-06-21 17:27:37 +00:00 committed by Tarmac
commit c79a489b82
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/test_api.py
View File

@ -991,8 +991,8 @@ class TestGlanceAPI(unittest.TestCase):
'x-image-meta-name': 'fake image #3'} 'x-image-meta-name': 'fake image #3'}
req = webob.Request.blank("/images") req = webob.Request.blank("/images")
req.body = "chunk00000remainder"
req.method = 'POST' req.method = 'POST'
req.body = "chunk00000remainder"
for k, v in fixture_headers.iteritems(): for k, v in fixture_headers.iteritems():
req.headers[k] = v req.headers[k] = v
res = req.get_response(self.api) res = req.get_response(self.api)

6
tests/unit/test_wsgi.py
View File

@ -25,14 +25,12 @@ from glance.common import exception
class RequestTest(unittest.TestCase): class RequestTest(unittest.TestCase):
def test_content_type_missing(self): def test_content_type_missing(self):
request = wsgi.Request.blank('/tests/123') request = wsgi.Request.blank('/tests/123')
request.body = "<body />"
self.assertRaises(exception.InvalidContentType, self.assertRaises(exception.InvalidContentType,
request.get_content_type, ('application/xml')) request.get_content_type, ('application/xml'))
def test_content_type_unsupported(self): def test_content_type_unsupported(self):
request = wsgi.Request.blank('/tests/123') request = wsgi.Request.blank('/tests/123')
request.headers["Content-Type"] = "text/html" request.headers["Content-Type"] = "text/html"
request.body = "asdf<br />"
self.assertRaises(exception.InvalidContentType, self.assertRaises(exception.InvalidContentType,
request.get_content_type, ('application/xml')) request.get_content_type, ('application/xml'))
@ -142,18 +140,21 @@ class JSONResponseSerializerTest(unittest.TestCase):
class JSONRequestDeserializerTest(unittest.TestCase): class JSONRequestDeserializerTest(unittest.TestCase):
def test_has_body_no_content_length(self): def test_has_body_no_content_length(self):
request = wsgi.Request.blank('/') request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf' request.body = 'asdf'
request.headers.pop('Content-Length') request.headers.pop('Content-Length')
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request)) self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_zero_content_length(self): def test_has_body_zero_content_length(self):
request = wsgi.Request.blank('/') request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf' request.body = 'asdf'
request.headers['Content-Length'] = 0 request.headers['Content-Length'] = 0
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request)) self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_has_content_length(self): def test_has_body_has_content_length(self):
request = wsgi.Request.blank('/') request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = 'asdf' request.body = 'asdf'
self.assertTrue('Content-Length' in request.headers) self.assertTrue('Content-Length' in request.headers)
self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request)) self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
@ -176,6 +177,7 @@ class JSONRequestDeserializerTest(unittest.TestCase):
def test_default_with_body(self): def test_default_with_body(self):
request = wsgi.Request.blank('/') request = wsgi.Request.blank('/')
request.method = 'POST'
request.body = '{"key": "value"}' request.body = '{"key": "value"}'
actual = wsgi.JSONRequestDeserializer().default(request) actual = wsgi.JSONRequestDeserializer().default(request)
expected = {"body": {"key": "value"}} expected = {"body": {"key": "value"}}

2
tools/pip-requires
View File

@ -6,7 +6,7 @@ anyjson
eventlet>=0.9.12 eventlet>=0.9.12
PasteDeploy PasteDeploy
routes routes
webob webob==1.0.8
wsgiref wsgiref
nose nose
sphinx sphinx