fixes

Signed-off-by: NilashishC <[email protected]>
ansible-collections · Jun 7, 2024 · f21e8ad · f21e8ad
1 parent 7b6a34e
commit f21e8ad
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 80 deletions.
diff --git a/.github/workflows/codecoverage.yml b/.github/workflows/codecoverage.yml
@@ -4,7 +4,7 @@ name: Code Coverage
 on:
   push:
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   codecoverage:

diff --git a/tests/unit/compat/__init__.py b/tests/unit/compat/__init__.py
diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py
diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py
diff --git a/tests/unit/mock/path.py b/tests/unit/mock/path.py
@@ -4,9 +4,9 @@
 __metaclass__ = type
 
 
-from ansible.utils.path import unfrackpath
+from unittest.mock import MagicMock
 
-from ansible_collections.frr.frr.tests.unit.compat.mock import MagicMock
+from ansible.utils.path import unfrackpath
 
 
 mock_unfrackpath_noop = MagicMock(spec_set=unfrackpath, side_effect=lambda x, *args, **kwargs: x)
diff --git a/tests/unit/mock/procenv.py b/tests/unit/mock/procenv.py
@@ -27,12 +27,11 @@
 
 from contextlib import contextmanager
 from io import BytesIO, StringIO
+from unittest import TestCase
 
 from ansible.module_utils._text import to_bytes
 from ansible.module_utils.six import PY3
 
-from ansible_collections.frr.frr.tests.unit.compat import unittest
-
 
 @contextmanager
 def swap_stdin_and_argv(stdin_data="", argv_data=tuple()):
@@ -78,7 +77,7 @@ def swap_stdout():
         sys.stdout = old_stdout
 
 
-class ModuleTestCase(unittest.TestCase):
+class ModuleTestCase(TestCase):
     def setUp(self, module_args=None):
         if module_args is None:
             module_args = {

diff --git a/tests/unit/modules/network/frr/test_frr_facts.py b/tests/unit/modules/network/frr/test_frr_facts.py
@@ -6,8 +6,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.frr.frr.plugins.modules import frr_facts
-from ansible_collections.frr.frr.tests.unit.compat.mock import patch
 from ansible_collections.frr.frr.tests.unit.modules.utils import set_module_args
 
 from .frr_module import TestFrrModule, load_fixture

diff --git a/tests/unit/modules/utils.py b/tests/unit/modules/utils.py
@@ -5,12 +5,12 @@
 
 import json
 
+from unittest import TestCase
+from unittest.mock import patch
+
 from ansible.module_utils import basic
 from ansible.module_utils._text import to_bytes
 
-from ansible_collections.frr.frr.tests.unit.compat import unittest
-from ansible_collections.frr.frr.tests.unit.compat.mock import patch
-
 
 def set_module_args(args):
     if "_ansible_remote_tmp" not in args:
@@ -41,7 +41,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,