upgraded boto and moto

Author: snyaggarwal

core/services/storages/cloud/tests.py

@@ -13,15 +13,15 @@
 from django.utils import timezone
 from minio.deleteobjects import DeleteError
 from mock.mock import call
-from moto import mock_s3
+from moto import mock_aws
 
 from core.services.storages.cloud.aws import S3
 from core.services.storages.cloud.azure import BlobStorage
 from core.services.storages.cloud.minio import MinIO
 
 
 class S3Test(TestCase):
-    @mock_s3
+    @mock_aws
     def test_upload(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
         _conn.create_bucket(Bucket='oclapi2-dev')
@@ -36,7 +36,7 @@ def test_upload(self):
             'content'
         )
 
-    @mock_s3
+    @mock_aws
     def test_exists(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
         _conn.create_bucket(Bucket='oclapi2-dev')
@@ -63,8 +63,8 @@ def test_upload_public(self):
         )
 
     def test_upload_file(self):
-        with patch("builtins.open", mock_open(read_data="file-content")) as mock_file:
-            s3 = S3()
+        s3 = S3()
+        with patch("core.services.storages.cloud.aws.open", mock_open(read_data="file-content")) as mock_file:
             s3.upload = Mock(return_value=200)  # pylint: disable=protected-access
             file_path = "path/to/file.ext"
             res = s3.upload_file(key=file_path, headers={'header1': 'val1'})
@@ -147,7 +147,7 @@ def test_upload_base64_no_ext(self):
             isinstance(mock_calls[0][1][1], ContentFile)
         )
 
-    @mock_s3
+    @mock_aws
     def test_remove(self):
         conn = boto3.resource('s3', region_name='us-east-1')
         conn.create_bucket(Bucket='oclapi2-dev')
@@ -168,7 +168,7 @@ def test_remove(self):
         with self.assertRaises(ClientError):
             conn.Object('oclapi2-dev', 'some/path').get()
 
-    @mock_s3
+    @mock_aws
     def test_url_for(self):
         _conn = boto3.resource('s3', region_name='us-east-1')
         _conn.create_bucket(Bucket='oclapi2-dev')

requirements.txt

@@ -8,8 +8,8 @@ pydash==7.0.6
 django-cors-headers==4.9.0
 pyyaml==6.0.1
 colour_runner==0.1.1
-boto3==1.24.28
-moto==3.1.13
+boto3==1.36.10
+moto==5.0.27
 python-dateutil==2.8.2
 requests==2.32.3
 factory_boy==3.3.0