]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
If oauth2client isn't present, skip Google Storage tests rather than blowing up.
authorItamar Turner-Trauring <itamar@futurefoundries.com>
Tue, 5 Mar 2013 17:01:06 +0000 (12:01 -0500)
committerDaira Hopwood <daira@jacaranda.org>
Tue, 4 Aug 2015 17:20:41 +0000 (18:20 +0100)
src/allmydata/storage/backends/cloud/googlestorage/googlestorage_container.py
src/allmydata/test/test_storage.py

index af3a82a9437acf314962d8fccc14b94d300545e5..cf6f1537faa9b8bcd5ab99d94543c612020f0307 100644 (file)
@@ -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
 
index 14943d3395792d2b3e9e6ee8ce9ef8a29076ed6e..726ef93ad47583bb1242780d8955566b38e22dc4 100644 (file)
@@ -649,6 +649,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
@@ -773,6 +776,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