From 7210db0247633f1de8860490719e24fc2786ba97 Mon Sep 17 00:00:00 2001 From: Harry Karvonen Date: Tue, 9 Aug 2022 08:47:42 +0300 Subject: [PATCH] gcloud: Added missing retry arg to tests. --- tests/test_gcloud.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/test_gcloud.py b/tests/test_gcloud.py index 14241efd3..cade9b071 100644 --- a/tests/test_gcloud.py +++ b/tests/test_gcloud.py @@ -11,6 +11,7 @@ from django.utils import timezone from google.cloud.exceptions import NotFound from google.cloud.storage.blob import Blob +from google.cloud.storage.retry import DEFAULT_RETRY from storages.backends import gcloud from tests.utils import NonSeekableContentFile @@ -97,6 +98,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], + retry=DEFAULT_RETRY, predefined_acl='projectPrivate') def test_save(self): @@ -107,7 +109,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], + content, rewind=True, retry=DEFAULT_RETRY, size=len(data), content_type=mimetypes.guess_type(self.filename)[0], predefined_acl=None) def test_save2(self): @@ -119,7 +121,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], + content, rewind=True, retry=DEFAULT_RETRY, size=len(data), content_type=mimetypes.guess_type(filename)[0], predefined_acl=None) def test_save_with_default_acl(self): @@ -136,7 +138,7 @@ 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], + content, rewind=True, retry=DEFAULT_RETRY, size=len(data), content_type=mimetypes.guess_type(filename)[0], predefined_acl='publicRead') def test_delete(self): @@ -420,6 +422,7 @@ def test_storage_save_gzipped(self): obj.upload_from_file.assert_called_with( mock.ANY, rewind=True, + retry=DEFAULT_RETRY, size=11, predefined_acl=None, content_type=None @@ -436,6 +439,7 @@ def test_storage_save_gzipped_non_seekable(self): obj.upload_from_file.assert_called_with( mock.ANY, rewind=True, + retry=DEFAULT_RETRY, size=11, predefined_acl=None, content_type=None @@ -455,6 +459,7 @@ def test_storage_save_gzip(self): obj.upload_from_file.assert_called_with( mock.ANY, rewind=True, + retry=DEFAULT_RETRY, size=None, predefined_acl=None, content_type='text/css', @@ -484,6 +489,7 @@ def test_storage_save_gzip_twice(self): obj.upload_from_file.assert_called_with( mock.ANY, rewind=True, + retry=DEFAULT_RETRY, size=None, predefined_acl=None, content_type='text/css',