Merge "Fix boto capabilities check"

1 files changed, 4 insertions, 3 deletions

diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 11c16d6dd..949f54512 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -22,12 +22,13 @@ import random
 import StringIO
 
 import boto
+import boto.connection
 from boto.ec2 import regioninfo
 from boto import exception as boto_exc
 # newer versions of boto use their own wrapper on top of httplib.HTTPResponse
-try:
-    import boto.connection as httplib
-except ImportError:
+if hasattr(boto.connection, 'HTTPResponse'):
+    httplib = boto.connection
+else:
     import httplib
 import fixtures
 import webob