Varous fixes

Signed-off-by: Alina Buzachis <[email protected]>

tests/unit/module_utils/cloud/test_cloud_retry.py

@@ -3,9 +3,6 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import random
 from datetime import datetime
 import pytest

tests/unit/module_utils/cloud/test_decorator_generation.py

@@ -3,16 +3,14 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import pytest
 import sys
 
+from unittest.mock import MagicMock
+from unittest.mock import sentinel
+
 from ansible_collections.amazon.aws.plugins.module_utils.cloud import CloudRetry
 from ansible_collections.amazon.aws.plugins.module_utils.cloud import BackoffIterator
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
-from ansible_collections.amazon.aws.tests.unit.compat.mock import sentinel
 
 if sys.version_info < (3, 8):
     pytest.skip("accessing call_args.kwargs by keyword (instead of index) was introduced in Python 3.8", allow_module_level=True)

tests/unit/module_utils/cloud/test_retry_func.py

@@ -3,15 +3,13 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import pytest
 import sys
 
+from unittest.mock import Mock
+from unittest.mock import sentinel
+
 import ansible_collections.amazon.aws.plugins.module_utils.cloud as cloud_utils
-from ansible_collections.amazon.aws.tests.unit.compat.mock import Mock
-from ansible_collections.amazon.aws.tests.unit.compat.mock import sentinel
 
 if sys.version_info < (3, 8):
     pytest.skip("accessing call_args.kwargs by keyword (instead of index) was introduced in Python 3.8", allow_module_level=True)

tests/unit/module_utils/test_elbv2.py

@@ -4,11 +4,10 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from unittest.mock import MagicMock
 
 from ansible_collections.amazon.aws.plugins.module_utils import elbv2
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
+
 
 one_action = [
     {

tests/unit/module_utils/test_iam.py

@@ -4,9 +4,6 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import pytest
 
 try:
@@ -15,7 +12,7 @@
     # Handled by HAS_BOTO3
     pass
 
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
+from unittest.mock import MagicMock
 
 import ansible_collections.amazon.aws.plugins.module_utils.iam as utils_iam
 from ansible_collections.amazon.aws.plugins.module_utils.ec2 import HAS_BOTO3

tests/unit/module_utils/test_rds.py

@@ -3,15 +3,8 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
 import sys
 import pytest
-
-if sys.version_info < (3, 7):
-    pytest.skip("contextlib.nullcontext was introduced in Python 3.7", allow_module_level=True)
-
 from contextlib import nullcontext
 
 try:
@@ -20,7 +13,7 @@
     # Handled by HAS_BOTO3
     pass
 
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
+from unittest.mock import MagicMock
 
 from ansible_collections.amazon.aws.plugins.module_utils import rds
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import HAS_BOTO3

tests/unit/module_utils/test_s3.py

@@ -4,11 +4,8 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
+from unittest.mock import MagicMock
 
-__metaclass__ = type
-
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
 from ansible_collections.amazon.aws.plugins.module_utils import s3
 from ansible.module_utils.basic import AnsibleModule
 

tests/unit/module_utils/transformation/test_map_complex_type.py

@@ -3,13 +3,10 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from unittest.mock import sentinel
 
 from ansible_collections.amazon.aws.plugins.module_utils.transformation import map_complex_type
 
-from ansible_collections.amazon.aws.tests.unit.compat.mock import sentinel
-
 
 def test_map_complex_type_over_dict():
     type_map = {'minimum_healthy_percent': 'int', 'maximum_percent': 'int'}

tests/unit/plugins/modules/ec2_instance/test_build_run_instance_spec.py

@@ -3,12 +3,8 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import pytest
-
-from ansible_collections.amazon.aws.tests.unit.compat.mock import sentinel
+from unittest.mock import sentinel
 import ansible_collections.amazon.aws.plugins.modules.ec2_instance as ec2_instance_module
 
 

tests/unit/plugins/modules/ec2_instance/test_determine_iam_role.py

@@ -3,14 +3,10 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
 import pytest
 import sys
-
-from ansible_collections.amazon.aws.tests.unit.compat.mock import MagicMock
-from ansible_collections.amazon.aws.tests.unit.compat.mock import sentinel
+from unittest.mock import MagicMock
+from unittest.mock import sentinel
 import ansible_collections.amazon.aws.plugins.modules.ec2_instance as ec2_instance_module
 import ansible_collections.amazon.aws.plugins.module_utils.arn as utils_arn
 from ansible_collections.amazon.aws.plugins.module_utils.botocore import HAS_BOTO3

tests/unit/plugins/modules/test_ec2_vpc_dhcp_option.py

@@ -3,12 +3,10 @@
 # This file is part of Ansible
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from unittest.mock import patch
 
 # Magic...  Incorrectly identified by pylint as unused
 from ansible_collections.amazon.aws.tests.unit.utils.amazon_placebo_fixtures import placeboify  # pylint: disable=unused-import
-from ansible_collections.amazon.aws.tests.unit.compat.mock import patch
 
 from ansible_collections.amazon.aws.plugins.modules import ec2_vpc_dhcp_option as dhcp_module
 from ansible_collections.amazon.aws.tests.unit.plugins.modules.utils import ModuleTestCase

tests/unit/plugins/modules/utils.py

@@ -1,10 +1,9 @@
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 import json
 
-from ansible_collections.amazon.aws.tests.unit.compat import unittest
-from ansible_collections.amazon.aws.tests.unit.compat.mock import patch
+import unittest
+from unittest.mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes