If oauth2client isn't present, skip Google Storage tests rather than blowing up.

diff --git a/src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py b/src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py
index af3a82a9437acf314962d8fccc14b94d300545e5..cf6f1537faa9b8bcd5ab99d94543c612020f0307 100644 (file)
--- a/src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py
+++ b/src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py
@@ -18,7 +18,12 @@ from twisted.internet.defer import DeferredLock
 from twisted.internet.threads import deferToThread
 from twisted.web.http import UNAUTHORIZED
 
-from oauth2client.client import SignedJwtAssertionCredentials
+try:
+    from oauth2client.client import SignedJwtAssertionCredentials
+    oauth2client_available = True
+except ImportError:
+    oauth2client_available = False
+    SignedJwtAssertionCredentials = None
 
 from zope.interface import implements
 

diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index 12d5a94f94221f13705b5a4ceab74053988925f6..d6d76f3e0db252462d5fec3473a3fd8c6418a27b 100644 (file)
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -642,6 +642,9 @@ class GoogleStorageAuthenticationClient(unittest.TestCase):
     unless noted otherwise.
     """
 
+    if not googlestorage_container.oauth2client_available:
+        skip = "Google Storage requires oauth2client"
+
     def test_credentials(self):
         """
         AuthenticationClient.get_authorization_header() initializes a
@@ -766,6 +769,9 @@ class GoogleStorageBackend(unittest.TestCase):
     allmydata.storage.backends.cloud.googlestorage.googlestorage_container
     unless noted otherwise.
     """
+    if not googlestorage_container.oauth2client_available:
+        skip = "Google Storage requires oauth2client"
+
     class Response(object):
         def __init__(self, code, headers={}):
             self.code = code