Merge lp:~rconradharris/glance/lp731684 into lp:~glance-coresec/glance/cactus-trunk

[Rick Harris]

Don't require swift module for unit-tests

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Josh Kearney (jk0)]

lgtm

review: Approve

[Cory Wright (corywright)]

I agree that swift shouldn't be required to use glance, but I don't think its a good idea to skip running the tests if it isn't installed. We don't want to force users to install swift just to use glance, but developers should be required to install it in order to run tests against it and avoid introducing regressions.

[Rick Harris (rconradharris)]

> but developers should be required to install it in order to run tests against it and avoid introducing regressions.

Well put, you're right.

I'll leave the lazy-import changes so that the code itself doesn't require swift and I'll ax the skip-test workaround.

[Jay Pipes (jaypipes)]

coolness. thx rick.

review: Approve

=== modified file 'glance/store/swift.py'
--- glance/store/swift.py	2011-03-07 20:11:59 +0000
+++ glance/store/swift.py	2011-03-09 22:02:23 +0000
@@ -22,8 +22,6 @@
 import httplib
 import logging
 
-from swift.common.client import Connection, ClientException
-
 from glance.common import config
 from glance.common import exception
 import glance.store
@@ -49,18 +47,19 @@
         swift instance at auth_url and downloads the file. Returns the
         generator resp_body provided by get_object.
         """
+        from swift.common import client as swift_client
         (user, key, authurl, container, obj) = parse_swift_tokens(parsed_uri)
 
         # TODO(sirp): snet=False for now, however, if the instance of
         # swift we're talking to is within our same region, we should set
         # snet=True
-        swift_conn = Connection(
+        swift_conn = swift_client.Connection(
             authurl=authurl, user=user, key=key, snet=False)
 
         try:
             (resp_headers, resp_body) = swift_conn.get_object(
                 container=container, obj=obj, resp_chunk_size=cls.CHUNKSIZE)
-        except ClientException, e:
+        except swift_client.ClientException, e:
             if e.http_status == httplib.NOT_FOUND:
                 location = format_swift_location(user, key, authurl,
                                                  container, obj)
@@ -99,6 +98,7 @@
                 The location that was written,
                 and the size in bytes of the data written
         """
+        from swift.common import client as swift_client
         container = options.get('swift_store_container',
                                 DEFAULT_SWIFT_CONTAINER)
         auth_address = options.get('swift_store_auth_address')
@@ -132,8 +132,8 @@
                    "options.")
             raise glance.store.BackendException(msg)
 
-        swift_conn = Connection(authurl=full_auth_address, user=user,
-                                      key=key, snet=False)
+        swift_conn = swift_client.Connection(
+            authurl=full_auth_address, user=user, key=key, snet=False)
 
         logger.debug("Adding image object to Swift using "
                      "(auth_address=%(auth_address)s, user=%(user)s, "
@@ -162,7 +162,7 @@
             if 'content-length' in resp_headers:
                 size = int(resp_headers['content-length'])
             return (location, size)
-        except ClientException, e:
+        except swift_client.ClientException, e:
             if e.http_status == httplib.CONFLICT:
                 raise exception.Duplicate("Swift already has an image at "
                                           "location %(location)s" % locals())
@@ -175,17 +175,18 @@
         """
         Deletes the swift object(s) at the parsed_uri location
         """
+        from swift.common import client as swift_client
         (user, key, authurl, container, obj) = parse_swift_tokens(parsed_uri)
 
         # TODO(sirp): snet=False for now, however, if the instance of
         # swift we're talking to is within our same region, we should set
         # snet=True
-        swift_conn = Connection(
+        swift_conn = swift_client.Connection(
             authurl=authurl, user=user, key=key, snet=False)
 
         try:
             swift_conn.delete_object(container, obj)
-        except ClientException, e:
+        except swift_client.ClientException, e:
             if e.http_status == httplib.NOT_FOUND:
                 location = format_swift_location(user, key, authurl,
                                                  container, obj)
@@ -253,9 +254,10 @@
     :param swift_conn: Connection to Swift
     :param options: Option mapping
     """
+    from swift.common import client as swift_client
     try:
         swift_conn.head_container(container)
-    except ClientException, e:
+    except swift_client.ClientException, e:
         if e.http_status == httplib.NOT_FOUND:
             add_container = config.get_option(options,
                                 'swift_store_create_container_on_put',

=== modified file 'tests/unit/test_swift_store.py'
--- tests/unit/test_swift_store.py	2011-03-06 16:39:56 +0000
+++ tests/unit/test_swift_store.py	2011-03-09 22:02:23 +0000
@@ -294,7 +294,8 @@
         Test that trying to delete a swift that doesn't exist
         raises an error
         """
-        url_pieces = urlparse.urlparse("swift://user:key@auth_address/noexist")
+        url_pieces = urlparse.urlparse(
+            "swift://user:key@auth_address/noexist")
         self.assertRaises(exception.NotFound,
                           SwiftBackend.delete,
                           url_pieces)