Merge lp:~soren/nova/lp695157 into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Address bug #695157 by using a blank request class and setting an empty request path.

This fixes the test suite in environments with webob >= 1.0 (e.g. Ubuntu Natty).

(Thanks for Greg Holt for the suggestion)

Address bug #695157 by using a blank request class and setting an empty request path.

This fixes the test suite in environments with webob >= 1.0 (e.g. Ubuntu Natty).

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Todd Willey (xtoddx)]

review: Abstain

[Todd Willey (xtoddx)]

review: Approve

=== modified file 'nova/wsgi.py'
--- nova/wsgi.py	2010-11-22 22:28:28 +0000
+++ nova/wsgi.py	2010-12-28 22:28:57 +0000
@@ -270,7 +270,7 @@
         needed to serialize a dictionary to that type.
         """
         self.metadata = metadata or {}
-        req = webob.Request(environ)
+        req = webob.Request.blank('', environ)
         suffix = req.path_info.split('.')[-1].lower()
         if suffix == 'json':
             self.handler = self._to_json