fix ci

ansible-collections · Mar 27, 2024 · 8f405c3 · 8f405c3
1 parent ddd53d9
commit 8f405c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/tests/unit/modules/network/ios/test_ios_evpn_evi.py b/tests/unit/modules/network/ios/test_ios_evpn_evi.py
@@ -7,11 +7,10 @@
 
 
 __metaclass__ = type
-
+from unittest.mock import patch
 from textwrap import dedent
 
 from ansible_collections.cisco.ios.plugins.modules import ios_evpn_evi
-from ansible_collections.cisco.ios.tests.unit.compat.mock import patch
 from ansible_collections.cisco.ios.tests.unit.modules.utils import set_module_args
 
 from .ios_module import TestIosModule
@@ -27,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.evpn_evi.evpn_evi."

diff --git a/tests/unit/modules/utils.py b/tests/unit/modules/utils.py
@@ -3,12 +3,10 @@
 
 __metaclass__ = type
 import json
-
+from unittest.mock import patch
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
-
-from ansible_collections.cisco.ios.tests.unit.compat import unittest
-from ansible_collections.cisco.ios.tests.unit.compat.mock import patch
+from unittest import TestCase
 
 
 def set_module_args(args):
@@ -40,7 +38,7 @@ def fail_json(*args, **kwargs):
     raise AnsibleFailJson(kwargs)
 
 
-class ModuleTestCase(unittest.TestCase):
+class ModuleTestCase(TestCase):
     def setUp(self):
         self.mock_module = patch.multiple(
             basic.AnsibleModule,

diff --git a/tests/unit/plugins/cliconf/test_ios.py b/tests/unit/plugins/cliconf/test_ios.py
@@ -30,11 +30,10 @@
     from unittest.mock import MagicMock
 except ImportError:
     from mock import MagicMock
-
+from unittest import TestCase
 from ansible.module_utils._text import to_bytes
 
 from ansible_collections.cisco.ios.plugins.cliconf import ios
-from ansible_collections.cisco.ios.tests.unit.compat import unittest
 
 
 b_FIXTURE_DIR = b"%s/fixtures/ios" % (
@@ -49,7 +48,9 @@ def _connection_side_effect(*args, **kwargs):
         else:
             value = kwargs.get("command")
 
-        fixture_path = path.abspath(b"%s/%s" % (b_FIXTURE_DIR, b"_".join(value.split(b" "))))
+        fixture_path = path.abspath(
+            b"%s/%s" % (b_FIXTURE_DIR, b"_".join(value.split(b" ")))
+        )
         with open(fixture_path, "rb") as file_desc:
             return file_desc.read()
     except (OSError, IOError):
@@ -63,7 +64,7 @@ def _connection_side_effect(*args, **kwargs):
         return "Nope"
 
 
-class TestPluginCLIConfIOS(unittest.TestCase):
+class TestPluginCLIConfIOS(TestCase):
     """Test class for IOS CLI Conf Methods"""
 
     def setUp(self):