From e0f7e6d9a015fcb4606faee2016b21ff9281752a Mon Sep 17 00:00:00 2001
From: Brian Waldon
Date: Tue, 21 Jun 2011 12:31:54 -0400
Subject: [PATCH] upgrading webob and fixing tests
---
tests/unit/test_api.py | 2 +-
tests/unit/test_wsgi.py | 6 ++++--
tools/pip-requires | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index e3157c896d..e16b4516ab 100644
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -991,8 +991,8 @@ class TestGlanceAPI(unittest.TestCase):
'x-image-meta-name': 'fake image #3'}
req = webob.Request.blank("/images")
- req.body = "chunk00000remainder"
req.method = 'POST'
+ req.body = "chunk00000remainder"
for k, v in fixture_headers.iteritems():
req.headers[k] = v
res = req.get_response(self.api)
diff --git a/tests/unit/test_wsgi.py b/tests/unit/test_wsgi.py
index 248bb01483..fe06b6dc69 100644
--- a/tests/unit/test_wsgi.py
+++ b/tests/unit/test_wsgi.py
@@ -25,14 +25,12 @@ from glance.common import exception
class RequestTest(unittest.TestCase):
def test_content_type_missing(self):
request = wsgi.Request.blank('/tests/123')
- request.body = ""
self.assertRaises(exception.InvalidContentType,
request.get_content_type, ('application/xml'))
def test_content_type_unsupported(self):
request = wsgi.Request.blank('/tests/123')
request.headers["Content-Type"] = "text/html"
- request.body = "asdf
"
self.assertRaises(exception.InvalidContentType,
request.get_content_type, ('application/xml'))
@@ -142,18 +140,21 @@ class JSONResponseSerializerTest(unittest.TestCase):
class JSONRequestDeserializerTest(unittest.TestCase):
def test_has_body_no_content_length(self):
request = wsgi.Request.blank('/')
+ request.method = 'POST'
request.body = 'asdf'
request.headers.pop('Content-Length')
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_zero_content_length(self):
request = wsgi.Request.blank('/')
+ request.method = 'POST'
request.body = 'asdf'
request.headers['Content-Length'] = 0
self.assertFalse(wsgi.JSONRequestDeserializer().has_body(request))
def test_has_body_has_content_length(self):
request = wsgi.Request.blank('/')
+ request.method = 'POST'
request.body = 'asdf'
self.assertTrue('Content-Length' in request.headers)
self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
@@ -176,6 +177,7 @@ class JSONRequestDeserializerTest(unittest.TestCase):
def test_default_with_body(self):
request = wsgi.Request.blank('/')
+ request.method = 'POST'
request.body = '{"key": "value"}'
actual = wsgi.JSONRequestDeserializer().default(request)
expected = {"body": {"key": "value"}}
diff --git a/tools/pip-requires b/tools/pip-requires
index 6705b481dc..ab892c5af2 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -6,7 +6,7 @@ anyjson
eventlet>=0.9.12
PasteDeploy
routes
-webob
+webob==1.0.8
wsgiref
nose
sphinx