Webob needs body to calc Content-Length (bug 1016171)

- Refactored render_response() and added relevant tests

Change-Id: I121e8cc641fe11a036106cbfd206f0aa1f6da560

1 files changed, 15 insertions, 10 deletions

diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 3d06abe4..8857d645 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -490,17 +490,22 @@ class ExtensionRouter(Router):
         return _factory
 
 
-def render_response(body=None, status=(200, 'OK'), headers=None):
+def render_response(body=None, status=None, headers=None):
     """Forms a WSGI response."""
-    resp = webob.Response()
-    resp.status = '%s %s' % status
-    resp.headerlist = headers or [('Content-Type', 'application/json'),
-                                  ('Vary', 'X-Auth-Token')]
-
-    if body is not None:
-        resp.body = jsonutils.dumps(body, cls=utils.SmarterEncoder)
-
-    return resp
+    headers = headers or []
+    headers.append(('Vary', 'X-Auth-Token'))
+
+    if body is None:
+        body = ''
+        status = status or (204, 'No Content')
+    else:
+        body = jsonutils.dumps(body, cls=utils.SmarterEncoder)
+        headers.append(('Content-Type', 'application/json'))
+        status = status or (200, 'OK')
+
+    return webob.Response(body=body,
+                          status='%s %s' % status,
+                          headerlist=headers)
 
 
 def render_exception(error):