From df8dc8fa9e3065e4ae378dd23e1f1e878e4d53f1 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 12 Jan 2024 23:42:11 +0000
Subject: [PATCH] tests: remove direct usages of mock in favor compat module

---
 tests/integration/s3/test_https_cert_validation.py     | 3 ++-
 tests/integration/s3/test_multipart.py                 | 4 ++--
 tests/unit/cloudsearchdomain/test_cloudsearchdomain.py | 1 -
 tests/unit/test_endpoints.py                           | 2 +-
 tests/unit/test_regioninfo.py                          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/integration/s3/test_https_cert_validation.py b/tests/integration/s3/test_https_cert_validation.py
index 2931eea..acba988 100644
--- a/tests/integration/s3/test_https_cert_validation.py
+++ b/tests/integration/s3/test_https_cert_validation.py
@@ -38,7 +38,6 @@ Note that this test assumes two external dependencies are available:
 import os
 import ssl
 import unittest
-import mock
 
 from nose.plugins.attrib import attr
 
@@ -48,6 +47,8 @@ from boto import exception, https_connection
 from boto.gs.connection import GSConnection
 from boto.s3.connection import S3Connection
 
+from tests.compat import mock
+
 
 # File 'other_cacerts.txt' contains a valid CA certificate of a CA that is used
 # by neither S3 nor Google Cloud Storage. Validation against this CA cert should
diff --git a/tests/integration/s3/test_multipart.py b/tests/integration/s3/test_multipart.py
index 7864796..63fc8ab 100644
--- a/tests/integration/s3/test_multipart.py
+++ b/tests/integration/s3/test_multipart.py
@@ -37,11 +37,11 @@ import unittest
 import time
 from boto.compat import StringIO
 
-import mock
-
 import boto
 from boto.s3.connection import S3Connection
 
+from tests.compat import mock
+
 
 class S3MultiPartUploadTest(unittest.TestCase):
     s3 = True
diff --git a/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py b/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py
index e0758a4..36222c2 100644
--- a/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py
+++ b/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py
@@ -1,6 +1,5 @@
 #!/usr/bin env python
 import json
-import mock
 from tests.unit import AWSMockServiceTestCase
 from boto.cloudsearch2.domain import Domain
 from boto.cloudsearch2.layer1 import CloudSearchConnection
diff --git a/tests/unit/test_endpoints.py b/tests/unit/test_endpoints.py
index cace6bb..2d57285 100644
--- a/tests/unit/test_endpoints.py
+++ b/tests/unit/test_endpoints.py
@@ -10,12 +10,12 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
-import mock
 import os
 import json
 
 from nose.tools import assert_equal
 
+from tests.compat import mock
 from tests.unit import unittest
 import boto
 from boto.endpoints import BotoEndpointResolver
diff --git a/tests/unit/test_regioninfo.py b/tests/unit/test_regioninfo.py
index da73cb9..f1551a2 100644
--- a/tests/unit/test_regioninfo.py
+++ b/tests/unit/test_regioninfo.py
@@ -20,13 +20,13 @@
 # IN THE SOFTWARE.
 #
 import os
-import mock
 
 import boto
 from boto.pyami.config import Config
 from boto.regioninfo import RegionInfo, load_endpoint_json, merge_endpoints
 from boto.regioninfo import load_regions, get_regions, connect
 
+from tests.compat import mock
 from tests.unit import unittest
 
 
-- 
2.43.0