summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorjaypipes@gmail.com <>2010-07-27 04:07:28 +0000
committerTarmac <>2010-07-27 04:07:28 +0000
commit0082ae2ac4af5e2bf90ef8c0e49481987fd00b8e (patch)
tree582853bbf5a25ea46406d38f7eb58b8ddd6488b5 /nova
parent01e481f508bb6f297949b4d1a3499239dcfb069e (diff)
parenta2cf8a6f6038062cf343322acdbde66456b73dfb (diff)
Fixes bug#610140. Thanks to Vish and Muharem for the patch
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/api_unittest.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index 4477a1fe6..9d072866c 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -43,7 +43,11 @@ def boto_to_tornado(method, path, headers, data, host, connection=None):
connection should be a FakeTornadoHttpConnection instance
"""
- headers = httpserver.HTTPHeaders()
+ try:
+ headers = httpserver.HTTPHeaders()
+ except AttributeError:
+ from tornado import httputil
+ headers = httputil.HTTPHeaders()
for k, v in headers.iteritems():
headers[k] = v