summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaypipes@gmail.com <>2010-07-26 23:28:59 -0400
committerjaypipes@gmail.com <>2010-07-26 23:28:59 -0400
commita2cf8a6f6038062cf343322acdbde66456b73dfb (patch)
treea5c6e4b4ba823e7838ffdb8d7bd7280da7e44f9f
parent00c2791230a89a89b53090d9c09c0e515c45823a (diff)
downloadnova-a2cf8a6f6038062cf343322acdbde66456b73dfb.tar.gz
nova-a2cf8a6f6038062cf343322acdbde66456b73dfb.tar.xz
nova-a2cf8a6f6038062cf343322acdbde66456b73dfb.zip
Fixes bug#610140. Thanks to Vish and Muharem for the patch
-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 e5e2afe26..45ae50b2e 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