[gcloud/tests] Add retry to expected params

qedsoftware · Mar 10, 2022 · 4336884 · 4336884
1 parent 9567455
commit 4336884
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/storages/backends/gcloud.py b/storages/backends/gcloud.py
@@ -20,7 +20,7 @@
     from google.cloud.storage import Blob, Client
     from google.cloud.storage.blob import _quote
     from google.cloud.storage.retry import (
-        DEFAULT_RETRY, DEFAULT_RETRY_IF_GENERATION_SPECIFIED
+        DEFAULT_RETRY, DEFAULT_RETRY_IF_GENERATION_SPECIFIED,
     )
 except ImportError:
     raise ImproperlyConfigured("Could not load Google Cloud Storage bindings.\n"

diff --git a/tests/test_gcloud.py b/tests/test_gcloud.py
@@ -92,7 +92,7 @@ def test_open_write(self, MockBlob):
         MockBlob().upload_from_file.assert_called_with(
             tmpfile, rewind=True,
             content_type=mimetypes.guess_type(self.filename)[0],
-            predefined_acl='projectPrivate', timeout=60)
+            predefined_acl='projectPrivate', timeout=60, retry=mock.ANY)
 
     def test_save(self):
         data = 'This is some test content.'
@@ -103,7 +103,7 @@ def test_save(self):
         self.storage._client.bucket.assert_called_with(self.bucket_name)
         self.storage._bucket.get_blob().upload_from_file.assert_called_with(
             content, rewind=True, size=len(data), content_type=mimetypes.guess_type(self.filename)[0],
-            predefined_acl=None, timeout=60)
+            predefined_acl=None, timeout=60, retry=mock.ANY)
 
     def test_save2(self):
         data = 'This is some test ủⓝï℅ⅆℇ content.'
@@ -115,7 +115,7 @@ def test_save2(self):
         self.storage._client.bucket.assert_called_with(self.bucket_name)
         self.storage._bucket.get_blob().upload_from_file.assert_called_with(
             content, rewind=True, size=len(data), content_type=mimetypes.guess_type(filename)[0],
-            predefined_acl=None, timeout=60)
+            predefined_acl=None, timeout=60, retry=mock.ANY)
 
     def test_save_with_default_acl(self):
         data = 'This is some test ủⓝï℅ⅆℇ content.'
@@ -132,13 +132,15 @@ def test_save_with_default_acl(self):
         self.storage._client.bucket.assert_called_with(self.bucket_name)
         self.storage._bucket.get_blob().upload_from_file.assert_called_with(
             content, rewind=True, size=len(data), content_type=mimetypes.guess_type(filename)[0],
-            predefined_acl='publicRead', timeout=60)
+            predefined_acl='publicRead', timeout=60, retry=mock.ANY)
 
     def test_delete(self):
         self.storage.delete(self.filename)
 
         self.storage._client.bucket.assert_called_with(self.bucket_name)
-        self.storage._bucket.delete_blob.assert_called_with(self.filename, timeout=60)
+        self.storage._bucket.delete_blob.assert_called_with(
+            self.filename, timeout=60, retry=mock.ANY
+        )
 
     def test_exists(self):
         self.storage._bucket = mock.MagicMock()
@@ -419,6 +421,7 @@ def test_storage_save_gzipped(self):
             predefined_acl=None,
             content_type=None,
             timeout=60,
+            retry=mock.ANY,
         )
 
     def test_storage_save_gzipped_non_seekable(self):
@@ -436,6 +439,7 @@ def test_storage_save_gzipped_non_seekable(self):
             predefined_acl=None,
             content_type=None,
             timeout=60,
+            retry=mock.ANY,
         )
 
     def test_storage_save_gzip(self):
@@ -456,6 +460,7 @@ def test_storage_save_gzip(self):
             predefined_acl=None,
             content_type='text/css',
             timeout=60,
+            retry=mock.ANY,
         )
         args, kwargs = obj.upload_from_file.call_args
         content = args[0]
@@ -486,6 +491,7 @@ def test_storage_save_gzip_twice(self):
             predefined_acl=None,
             content_type='text/css',
             timeout=60,
+            retry=mock.ANY,
         )
         args, kwargs = obj.upload_from_file.call_args
         content = args[0]