Switch to the moto v5 API

Author: timj

tests/test_s3.py

@@ -24,12 +24,16 @@
 try:
     import boto3
     import botocore
-    from moto import mock_s3
+
+    try:
+        from moto import mock_aws  # v5
+    except ImportError:
+        from moto import mock_s3 as mock_aws
 except ImportError:
     boto3 = None
 
-    def mock_s3(cls):
-        """No-op decorator in case moto mock_s3 can not be imported."""
+    def mock_aws(cls):
+        """No-op decorator in case moto mock_aws can not be imported."""
         return cls
 
 
@@ -47,13 +51,13 @@ class S3ReadWriteTestCase(GenericReadWriteTestCase, unittest.TestCase):
     scheme = "s3"
     netloc = "my_2nd_bucket"
 
-    mock_s3 = mock_s3()
+    mock_aws = mock_aws()
     """The mocked s3 interface from moto."""
 
     def setUp(self):
         self.enterContext(clean_test_environment_for_s3())
         # Enable S3 mocking of tests.
-        self.mock_s3.start()
+        self.mock_aws.start()
 
         # MOTO needs to know that we expect Bucket bucketname to exist
         s3 = boto3.resource("s3")
@@ -77,7 +81,7 @@ def tearDown(self):
         bucket.delete()
 
         # Stop the S3 mock.
-        self.mock_s3.stop()
+        self.mock_aws.stop()
 
         S3ResourcePath.use_threads = None
 

tests/test_s3utils.py

@@ -26,7 +26,11 @@
 try:
     import boto3
     from botocore.exceptions import ParamValidationError
-    from moto import mock_s3
+
+    try:
+        from moto import mock_aws  # v5
+    except ImportError:
+        from moto import mock_s3 as mock_aws
 except ImportError:
     boto3 = None
 
@@ -44,7 +48,7 @@ class S3UtilsTestCase(unittest.TestCase):
 
     def setUp(self):
         self.enterContext(clean_test_environment_for_s3())
-        self.enterContext(mock_s3())
+        self.enterContext(mock_aws())
 
         self.client = getS3Client()
         try: