diff --git a/changelogs/fragments/trivial_tests_updates.yaml b/changelogs/fragments/trivial_tests_updates.yaml new file mode 100644 index 0000000..6f9f7d9 --- /dev/null +++ b/changelogs/fragments/trivial_tests_updates.yaml @@ -0,0 +1,4 @@ +--- +trivial: + - remove compat files as we stopped testing against python 2.7. + - update direct imports for patch and MagicMock from unittest. diff --git a/tests/unit/compat/__init__.py b/tests/unit/compat/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py deleted file mode 100644 index 3a3e082..0000000 --- a/tests/unit/compat/mock.py +++ /dev/null @@ -1,127 +0,0 @@ -# (c) 2014, Toshio Kuratomi -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# Make coding more python3-ish -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - -""" -Compat module for Python3.x's unittest.mock module -""" -import sys - -import _io # pyright: ignore[reportMissingImports] - - -# Python 2.7 - -# Note: Could use the pypi mock library on python3.x as well as python2.x. It -# is the same as the python3 stdlib mock library - -try: - # Allow wildcard import because we really do want to import all of mock's - # symbols into this compat shim - # pylint: disable=wildcard-import,unused-wildcard-import - from unittest.mock import * # noqa F403 -except ImportError: - # Python 2 - # pylint: disable=wildcard-import,unused-wildcard-import - try: - from mock import * # pyright: ignore[reportMissingModuleSource] # noqa F403 - except ImportError: - print("You need the mock library installed on python2.x to run tests") - - -# Prior to 3.4.4, mock_open cannot handle binary read_data -if sys.version_info >= (3,) and sys.version_info < (3, 4, 4): - file_spec = None - - def _iterate_read_data(read_data): - # Helper for mock_open: - # Retrieve lines from read_data via a generator so that separate calls to - # readline, read, and readlines are properly interleaved - sep = b"\n" if isinstance(read_data, bytes) else "\n" - data_as_list = [line + sep for line in read_data.split(sep)] - - if data_as_list[-1] == sep: - # If the last line ended in a newline, the list comprehension will have an - # extra entry that's just a newline. Remove this. - data_as_list = data_as_list[:-1] - else: - # If there wasn't an extra newline by itself, then the file being - # emulated doesn't have a newline to end the last line remove the - # newline that our naive format() added - data_as_list[-1] = data_as_list[-1][:-1] - - for line in data_as_list: - yield line - - def mock_open(mock=None, read_data=""): - """ - A helper function to create a mock to replace the use of `open`. It works - for `open` called directly or used as a context manager. - - The `mock` argument is the mock object to configure. If `None` (the - default) then a `MagicMock` will be created for you, with the API limited - to methods or attributes available on standard file handles. - - `read_data` is a string for the `read` methoddline`, and `readlines` of the - file handle to return. This is an empty string by default. - """ - - def _readlines_side_effect(*args, **kwargs): - if handle.readlines.return_value is not None: - return handle.readlines.return_value - return list(_data) - - def _read_side_effect(*args, **kwargs): - if handle.read.return_value is not None: - return handle.read.return_value - return type(read_data)().join(_data) - - def _readline_side_effect(): - if handle.readline.return_value is not None: - while True: - yield handle.readline.return_value - for line in _data: - yield line - - global file_spec - if file_spec is None: - file_spec = list(set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO)))) - - if mock is None: - mock = MagicMock(name="open", spec=open) # noqa F405 - - handle = MagicMock(spec=file_spec) # noqa F405 - handle.__enter__.return_value = handle - - _data = _iterate_read_data(read_data) - - handle.write.return_value = None - handle.read.return_value = None - handle.readline.return_value = None - handle.readlines.return_value = None - - handle.read.side_effect = _read_side_effect - handle.readline.side_effect = _readline_side_effect() - handle.readlines.side_effect = _readlines_side_effect - - mock.return_value = handle - return mock diff --git a/tests/unit/compat/unittest.py b/tests/unit/compat/unittest.py deleted file mode 100644 index 8cbfa7b..0000000 --- a/tests/unit/compat/unittest.py +++ /dev/null @@ -1,41 +0,0 @@ -# (c) 2014, Toshio Kuratomi -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# Make coding more python3-ish -from __future__ import absolute_import, division, print_function - - -__metaclass__ = type - -""" -Compat module for Python2.7's unittest module -""" - -import sys - - -# Allow wildcard import because we really do want to import all of -# unittests's symbols into this compat shim -# pylint: disable=wildcard-import,unused-wildcard-import -if sys.version_info < (2, 7): - try: - # Need unittest2 on python2.6 - from unittest2 import * # noqa F403 - except ImportError: - print("You need unittest2 installed on python2.6.x to run tests") -else: - from unittest import * # noqa F403 diff --git a/tests/unit/mock/path.py b/tests/unit/mock/path.py index 67e47a4..73ed2d9 100644 --- a/tests/unit/mock/path.py +++ b/tests/unit/mock/path.py @@ -2,8 +2,10 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type + +from unittest.mock import MagicMock + from ansible.utils.path import unfrackpath -from ansible_collections.ansible.netcommon.tests.unit.compat.mock import MagicMock 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 index 657d1e8..e6e0946 100644 --- a/tests/unit/mock/procenv.py +++ b/tests/unit/mock/procenv.py @@ -27,10 +27,10 @@ import sys 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.ansible.netcommon.tests.unit.compat import unittest @contextmanager @@ -77,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/module_utils/test_argspec_validate.py b/tests/unit/module_utils/test_argspec_validate.py index 6e689ba..0bdd54f 100644 --- a/tests/unit/module_utils/test_argspec_validate.py +++ b/tests/unit/module_utils/test_argspec_validate.py @@ -9,7 +9,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_validate import ( AnsibleArgSpecValidator, @@ -18,7 +18,7 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid from .fixtures.docstring import DOCUMENTATION -class TestSortList(unittest.TestCase): +class TestSortList(TestCase): def test_simple_pass(self): data = {"param_str": "string"} aav = AnsibleArgSpecValidator( diff --git a/tests/unit/module_utils/test_dict_merge.py b/tests/unit/module_utils/test_dict_merge.py index 04e14bd..bca7c40 100644 --- a/tests/unit/module_utils/test_dict_merge.py +++ b/tests/unit/module_utils/test_dict_merge.py @@ -9,12 +9,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.module_utils.common.utils import dict_merge -class TestDict_merge(unittest.TestCase): +class TestDict_merge(TestCase): def test_not_dict_base(self): base = [0] other = {"a": "b"} diff --git a/tests/unit/module_utils/test_get_path.py b/tests/unit/module_utils/test_get_path.py index a129aaa..53bfbee 100644 --- a/tests/unit/module_utils/test_get_path.py +++ b/tests/unit/module_utils/test_get_path.py @@ -9,14 +9,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.template import Templar from ansible_collections.ansible.utils.plugins.module_utils.common.get_path import get_path -class TestGetPath(unittest.TestCase): +class TestGetPath(TestCase): def setUp(self): self._environment = Templar(loader=None).environment diff --git a/tests/unit/module_utils/test_sort_list.py b/tests/unit/module_utils/test_sort_list.py index bab1b5f..d7e0d32 100644 --- a/tests/unit/module_utils/test_sort_list.py +++ b/tests/unit/module_utils/test_sort_list.py @@ -9,12 +9,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.module_utils.common.utils import sort_list -class TestSortList(unittest.TestCase): +class TestSortList(TestCase): def test_simple(self): var = [3, 2, 1] result = sort_list(var) diff --git a/tests/unit/module_utils/test_to_paths.py b/tests/unit/module_utils/test_to_paths.py index 68aaf21..c5e09e7 100644 --- a/tests/unit/module_utils/test_to_paths.py +++ b/tests/unit/module_utils/test_to_paths.py @@ -12,7 +12,8 @@ __metaclass__ = type import heapq import json import os -import unittest + +from unittest import TestCase from ansible.template import Templar @@ -20,7 +21,7 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.get_path impo from ansible_collections.ansible.utils.plugins.module_utils.common.to_paths import to_paths -class TestToPaths(unittest.TestCase): +class TestToPaths(TestCase): def setUp(self): self._environment = Templar(loader=None).environment diff --git a/tests/unit/plugins/action/test_cli_parse.py b/tests/unit/plugins/action/test_cli_parse.py index c0c8af7..0c6e826 100644 --- a/tests/unit/plugins/action/test_cli_parse.py +++ b/tests/unit/plugins/action/test_cli_parse.py @@ -9,6 +9,9 @@ __metaclass__ = type import os import tempfile +from unittest import TestCase +from unittest.mock import MagicMock, patch + from ansible.module_utils.connection import ConnectionError as AnsibleConnectionError from ansible.playbook.task import Task from ansible.template import Templar @@ -22,12 +25,10 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid ) from ansible_collections.ansible.utils.plugins.modules.cli_parse import DOCUMENTATION from ansible_collections.ansible.utils.plugins.plugin_utils.base.cli_parser import CliParserBase -from ansible_collections.ansible.utils.tests.unit.compat import unittest -from ansible_collections.ansible.utils.tests.unit.compat.mock import MagicMock, patch from ansible_collections.ansible.utils.tests.unit.mock.loader import DictDataLoader -class TestCli_Parse(unittest.TestCase): +class TestCli_Parse(TestCase): def setUp(self): task = MagicMock(Task) play_context = MagicMock() diff --git a/tests/unit/plugins/action/test_fact_diff.py b/tests/unit/plugins/action/test_fact_diff.py index b197356..457d6e9 100644 --- a/tests/unit/plugins/action/test_fact_diff.py +++ b/tests/unit/plugins/action/test_fact_diff.py @@ -9,7 +9,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import re -import unittest + +from unittest import TestCase from ansible.playbook.task import Task from ansible.template import Templar @@ -23,7 +24,7 @@ except ImportError: from mock import MagicMock # pyright: ignore[reportMissingModuleSource] -class TestUpdate_Fact(unittest.TestCase): +class TestUpdate_Fact(TestCase): def setUp(self): task = MagicMock(Task) # Ansible > 2.13 looks for check_mode in task diff --git a/tests/unit/plugins/action/test_update_fact.py b/tests/unit/plugins/action/test_update_fact.py index 3ec4a8f..a0653d2 100644 --- a/tests/unit/plugins/action/test_update_fact.py +++ b/tests/unit/plugins/action/test_update_fact.py @@ -9,7 +9,8 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type import copy -import unittest + +from unittest import TestCase from ansible.playbook.task import Task from ansible.template import Templar @@ -79,7 +80,7 @@ INVALID_JINJA = [ ] -class TestUpdate_Fact(unittest.TestCase): +class TestUpdate_Fact(TestCase): def setUp(self): task = MagicMock(Task) # Ansible > 2.13 looks for check_mode in task diff --git a/tests/unit/plugins/action/test_validate.py b/tests/unit/plugins/action/test_validate.py index 0176228..dc1f861 100644 --- a/tests/unit/plugins/action/test_validate.py +++ b/tests/unit/plugins/action/test_validate.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleActionFail from ansible.playbook.task import Task @@ -111,7 +111,7 @@ CRITERIA_FORMAT_SUPPORT_CHECK = { } -class TestValidate(unittest.TestCase): +class TestValidate(TestCase): def setUp(self): task = MagicMock(Task) play_context = MagicMock() diff --git a/tests/unit/plugins/filter/test_cidr_merge.py b/tests/unit/plugins/filter/test_cidr_merge.py index 9b1545c..8943d93 100644 --- a/tests/unit/plugins/filter/test_cidr_merge.py +++ b/tests/unit/plugins/filter/test_cidr_merge.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError @@ -30,7 +30,7 @@ VALID_DATA_SPAN = ["192.168.1.1", "192.168.1.2", "192.168.1.3", "192.168.1.4"] VALID_OUTPUT_SPAN = "192.168.1.0/29" -class TestCidrMerge(unittest.TestCase): +class TestCidrMerge(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_consolidate.py b/tests/unit/plugins/filter/test_consolidate.py index 729701c..e679967 100644 --- a/tests/unit/plugins/filter/test_consolidate.py +++ b/tests/unit/plugins/filter/test_consolidate.py @@ -8,14 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.consolidate import _consolidate -class TestConsolidate(unittest.TestCase): +class TestConsolidate(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_fact_diff.py b/tests/unit/plugins/filter/test_fact_diff.py index c4bdff0..91d2640 100644 --- a/tests/unit/plugins/filter/test_fact_diff.py +++ b/tests/unit/plugins/filter/test_fact_diff.py @@ -8,14 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.fact_diff import _fact_diff -class TestUpdate_Fact(unittest.TestCase): +class TestUpdate_Fact(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_from_xml.py b/tests/unit/plugins/filter/test_from_xml.py index a883592..4643f53 100644 --- a/tests/unit/plugins/filter/test_from_xml.py +++ b/tests/unit/plugins/filter/test_from_xml.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError, AnsibleFilterError @@ -26,7 +26,7 @@ OUTPUT = """{"netconf-state": \ {"@xmlns": "urn:ietf:params:xml:ns:yang:ietf-netconf-monitoring", "schemas": {"schema": null}}}""" -class TestFromXml(unittest.TestCase): +class TestFromXml(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_hwaddr.py b/tests/unit/plugins/filter/test_hwaddr.py index 1ddfd62..3e1dea2 100644 --- a/tests/unit/plugins/filter/test_hwaddr.py +++ b/tests/unit/plugins/filter/test_hwaddr.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.hwaddr import _hwaddr -class Test_hwaddr(unittest.TestCase): +class Test_hwaddr(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ip4_hex.py b/tests/unit/plugins/filter/test_ip4_hex.py index 449b3e1..0fb4345 100644 --- a/tests/unit/plugins/filter/test_ip4_hex.py +++ b/tests/unit/plugins/filter/test_ip4_hex.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.ip4_hex import _ip4_hex -class TestIpWrap(unittest.TestCase): +class TestIpWrap(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipaddr.py b/tests/unit/plugins/filter/test_ipaddr.py index 0193967..2849fb8 100644 --- a/tests/unit/plugins/filter/test_ipaddr.py +++ b/tests/unit/plugins/filter/test_ipaddr.py @@ -11,7 +11,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase import pytest @@ -36,7 +36,7 @@ from ansible_collections.ansible.utils.plugins.plugin_utils.base.ipaddr_utils im netaddr = pytest.importorskip("netaddr") -class TestIpFilter(unittest.TestCase): +class TestIpFilter(TestCase): def test_cidr_merge(self): with pytest.raises( AnsibleFilterError, diff --git a/tests/unit/plugins/filter/test_ipcut.py b/tests/unit/plugins/filter/test_ipcut.py index a03b3b3..c086833 100644 --- a/tests/unit/plugins/filter/test_ipcut.py +++ b/tests/unit/plugins/filter/test_ipcut.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.ipcut import _ipcut -class TestIpCut(unittest.TestCase): +class TestIpCut(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipmath.py b/tests/unit/plugins/filter/test_ipmath.py index 02e1553..9c36ea2 100644 --- a/tests/unit/plugins/filter/test_ipmath.py +++ b/tests/unit/plugins/filter/test_ipmath.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.ipmath import _ipmath -class TestIpAddr(unittest.TestCase): +class TestIpAddr(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipsubnet.py b/tests/unit/plugins/filter/test_ipsubnet.py index 4571b96..09885e6 100644 --- a/tests/unit/plugins/filter/test_ipsubnet.py +++ b/tests/unit/plugins/filter/test_ipsubnet.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase import pytest @@ -23,7 +23,7 @@ address = "192.168.144.5" subnet = "192.168.0.0/16" -class TestIpSubnet(unittest.TestCase): +class TestIpSubnet(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipv4.py b/tests/unit/plugins/filter/test_ipv4.py index ecd57a4..130ef6e 100644 --- a/tests/unit/plugins/filter/test_ipv4.py +++ b/tests/unit/plugins/filter/test_ipv4.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase import pytest @@ -41,7 +41,7 @@ VALID_OUTPUT1 = ["::ffff:192.24.2.1/128", "::ffff:192.168.32.0/120"] VALID_OUTPUT2 = ["192.24.2.1"] -class TestIp4(unittest.TestCase): +class TestIp4(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipv6.py b/tests/unit/plugins/filter/test_ipv6.py index 4f730f9..ad18bec 100644 --- a/tests/unit/plugins/filter/test_ipv6.py +++ b/tests/unit/plugins/filter/test_ipv6.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase import pytest @@ -44,7 +44,7 @@ VALID_OUTPUT1 = ["192.168.32.0/24", "192.24.2.1/32"] VALID_OUTPUT2 = ["::ffff:192.168.32.0", "::ffff:192.24.2.1", "fe80::100"] -class TestIp6(unittest.TestCase): +class TestIp6(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipv6form.py b/tests/unit/plugins/filter/test_ipv6form.py index b094d55..46b6e90 100644 --- a/tests/unit/plugins/filter/test_ipv6form.py +++ b/tests/unit/plugins/filter/test_ipv6form.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.ipv6form import _ipv6form -class TestIpv6Form(unittest.TestCase): +class TestIpv6Form(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_ipwrap.py b/tests/unit/plugins/filter/test_ipwrap.py index fd31d57..8694fdb 100644 --- a/tests/unit/plugins/filter/test_ipwrap.py +++ b/tests/unit/plugins/filter/test_ipwrap.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase import pytest @@ -46,7 +46,7 @@ VALID_OUTPUT = [ ] -class TestIpWrap(unittest.TestCase): +class TestIpWrap(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_keep_keys.py b/tests/unit/plugins/filter/test_keep_keys.py index 70f42f2..767d3bd 100644 --- a/tests/unit/plugins/filter/test_keep_keys.py +++ b/tests/unit/plugins/filter/test_keep_keys.py @@ -8,14 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.keep_keys import _keep_keys -class TestKeepKeys(unittest.TestCase): +class TestKeepKeys(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_macaddr.py b/tests/unit/plugins/filter/test_macaddr.py index adbc0cd..dc1e324 100644 --- a/tests/unit/plugins/filter/test_macaddr.py +++ b/tests/unit/plugins/filter/test_macaddr.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.macaddr import _macaddr -class Test_macaddr(unittest.TestCase): +class Test_macaddr(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_network_in_network.py b/tests/unit/plugins/filter/test_network_in_network.py index 54a080f..36746fb 100644 --- a/tests/unit/plugins/filter/test_network_in_network.py +++ b/tests/unit/plugins/filter/test_network_in_network.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.network_in_network import _network_in_network -class Test_network_in_network(unittest.TestCase): +class Test_network_in_network(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_network_in_usable.py b/tests/unit/plugins/filter/test_network_in_usable.py index 27ed21b..c71d17e 100644 --- a/tests/unit/plugins/filter/test_network_in_usable.py +++ b/tests/unit/plugins/filter/test_network_in_usable.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.network_in_usable import _network_in_usable -class Test_Network_In_Usable(unittest.TestCase): +class Test_Network_In_Usable(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_next_nth_usable.py b/tests/unit/plugins/filter/test_next_nth_usable.py index 615ca89..4f818e7 100644 --- a/tests/unit/plugins/filter/test_next_nth_usable.py +++ b/tests/unit/plugins/filter/test_next_nth_usable.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.next_nth_usable import _next_nth_usable -class Test_Next_Nth_Usable(unittest.TestCase): +class Test_Next_Nth_Usable(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_nthhost.py b/tests/unit/plugins/filter/test_nthhost.py index 96be24a..8d7b345 100644 --- a/tests/unit/plugins/filter/test_nthhost.py +++ b/tests/unit/plugins/filter/test_nthhost.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.nthhost import _nthhost -class Test_nthhost(unittest.TestCase): +class Test_nthhost(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_param_list_compare.py b/tests/unit/plugins/filter/test_param_list_compare.py index 2e6e471..4f7f18d 100644 --- a/tests/unit/plugins/filter/test_param_list_compare.py +++ b/tests/unit/plugins/filter/test_param_list_compare.py @@ -9,14 +9,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.param_list_compare import param_list_compare -class TestParam_list_compare_merge(unittest.TestCase): +class TestParam_list_compare_merge(TestCase): def test_valid_data(self): """Check passing valid data as per criteria""" diff --git a/tests/unit/plugins/filter/test_previous_nth_usable.py b/tests/unit/plugins/filter/test_previous_nth_usable.py index f2a2c6f..eeb2472 100644 --- a/tests/unit/plugins/filter/test_previous_nth_usable.py +++ b/tests/unit/plugins/filter/test_previous_nth_usable.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.previous_nth_usable import ( _previous_nth_usable, ) -class Test_previous_Nth_Usable(unittest.TestCase): +class Test_previous_Nth_Usable(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_reduce_on_network.py b/tests/unit/plugins/filter/test_reduce_on_network.py index 777409f..b0d714c 100644 --- a/tests/unit/plugins/filter/test_reduce_on_network.py +++ b/tests/unit/plugins/filter/test_reduce_on_network.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError from ansible_collections.ansible.utils.plugins.filter.reduce_on_network import _reduce_on_network -class Test_reduce_on_network(unittest.TestCase): +class Test_reduce_on_network(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_remove_keys.py b/tests/unit/plugins/filter/test_remove_keys.py index 92b3a59..6335533 100644 --- a/tests/unit/plugins/filter/test_remove_keys.py +++ b/tests/unit/plugins/filter/test_remove_keys.py @@ -8,14 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.remove_keys import _remove_keys -class TestReplaceKeys(unittest.TestCase): +class TestReplaceKeys(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_replace_keys.py b/tests/unit/plugins/filter/test_replace_keys.py index a27ec94..27b1b7f 100644 --- a/tests/unit/plugins/filter/test_replace_keys.py +++ b/tests/unit/plugins/filter/test_replace_keys.py @@ -8,14 +8,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError from ansible_collections.ansible.utils.plugins.filter.replace_keys import _replace_keys -class TestReplaceKeys(unittest.TestCase): +class TestReplaceKeys(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_slaac.py b/tests/unit/plugins/filter/test_slaac.py index e3d78ec..fe371a5 100644 --- a/tests/unit/plugins/filter/test_slaac.py +++ b/tests/unit/plugins/filter/test_slaac.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.filter.slaac import _slaac -class Test_slaac(unittest.TestCase): +class Test_slaac(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_to_xml.py b/tests/unit/plugins/filter/test_to_xml.py index f1ce6fb..e2c883a 100644 --- a/tests/unit/plugins/filter/test_to_xml.py +++ b/tests/unit/plugins/filter/test_to_xml.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError, AnsibleFilterError @@ -35,7 +35,7 @@ OUTPUT_SPACES = """ """ -class TestToXml(unittest.TestCase): +class TestToXml(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_usable_range.py b/tests/unit/plugins/filter/test_usable_range.py index 14450e8..8b12903 100644 --- a/tests/unit/plugins/filter/test_usable_range.py +++ b/tests/unit/plugins/filter/test_usable_range.py @@ -12,7 +12,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError @@ -73,7 +73,7 @@ VALID_OUTPUT_3 = { VALID_OUTPUT_4 = {"number_of_ips": 1, "usable_ips": ["2001:db8:abcd:12::"]} -class TestUsableRange(unittest.TestCase): +class TestUsableRange(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/filter/test_validate.py b/tests/unit/plugins/filter/test_validate.py index 6082d2e..5c7b1fd 100644 --- a/tests/unit/plugins/filter/test_validate.py +++ b/tests/unit/plugins/filter/test_validate.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleFilterError @@ -92,7 +92,7 @@ CRITERIA_IN_RATE_CHECK = { } -class TestValidate(unittest.TestCase): +class TestValidate(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/lookup/test_validate.py b/tests/unit/plugins/lookup/test_validate.py index 85bbc6b..ad94d4a 100644 --- a/tests/unit/plugins/lookup/test_validate.py +++ b/tests/unit/plugins/lookup/test_validate.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleLookupError @@ -92,7 +92,7 @@ CRITERIA_IN_RATE_CHECK = { } -class TestValidate(unittest.TestCase): +class TestValidate(TestCase): def setUp(self): self._lp = LookupModule() diff --git a/tests/unit/plugins/plugin_utils/test_index_of.py b/tests/unit/plugins/plugin_utils/test_index_of.py index bc426e4..c2d5270 100644 --- a/tests/unit/plugins/plugin_utils/test_index_of.py +++ b/tests/unit/plugins/plugin_utils/test_index_of.py @@ -10,14 +10,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.template import Templar from ansible_collections.ansible.utils.plugins.plugin_utils.index_of import index_of -class TestIndexOfFilter(unittest.TestCase): +class TestIndexOfFilter(TestCase): def setUp(self): self._tests = Templar(loader=None).environment.tests diff --git a/tests/unit/plugins/sub_plugins/cli_parsers/test_json_parser.py b/tests/unit/plugins/sub_plugins/cli_parsers/test_json_parser.py index 7111748..8cdd68f 100644 --- a/tests/unit/plugins/sub_plugins/cli_parsers/test_json_parser.py +++ b/tests/unit/plugins/sub_plugins/cli_parsers/test_json_parser.py @@ -8,11 +8,12 @@ __metaclass__ = type import json +from unittest import TestCase + from ansible_collections.ansible.utils.plugins.sub_plugins.cli_parser.json_parser import CliParser -from ansible_collections.ansible.utils.tests.unit.compat import unittest -class TestJsonParser(unittest.TestCase): +class TestJsonParser(TestCase): def test_json_parser(self): test_value = { "string": "This is a string", diff --git a/tests/unit/plugins/sub_plugins/cli_parsers/test_textfsm_parser.py b/tests/unit/plugins/sub_plugins/cli_parsers/test_textfsm_parser.py index 4e9936e..860c024 100644 --- a/tests/unit/plugins/sub_plugins/cli_parsers/test_textfsm_parser.py +++ b/tests/unit/plugins/sub_plugins/cli_parsers/test_textfsm_parser.py @@ -8,18 +8,19 @@ __metaclass__ = type import os +from unittest import TestCase + import pytest from ansible_collections.ansible.utils.plugins.sub_plugins.cli_parser.textfsm_parser import ( CliParser, ) -from ansible_collections.ansible.utils.tests.unit.compat import unittest textfsm = pytest.importorskip("textfsm") -class TestTextfsmParser(unittest.TestCase): +class TestTextfsmParser(TestCase): def test_textfsm_parser(self): nxos_cfg_path = os.path.join(os.path.dirname(__file__), "fixtures", "nxos_show_version.cfg") nxos_template_path = os.path.join( diff --git a/tests/unit/plugins/sub_plugins/cli_parsers/test_ttp_parser.py b/tests/unit/plugins/sub_plugins/cli_parsers/test_ttp_parser.py index 3f47bda..abbbe1e 100644 --- a/tests/unit/plugins/sub_plugins/cli_parsers/test_ttp_parser.py +++ b/tests/unit/plugins/sub_plugins/cli_parsers/test_ttp_parser.py @@ -8,16 +8,17 @@ __metaclass__ = type import os +from unittest import TestCase + import pytest from ansible_collections.ansible.utils.plugins.sub_plugins.cli_parser.ttp_parser import CliParser -from ansible_collections.ansible.utils.tests.unit.compat import unittest textfsm = pytest.importorskip("ttp") -class TestTextfsmParser(unittest.TestCase): +class TestTextfsmParser(TestCase): def test_ttp_parser(self): nxos_cfg_path = os.path.join(os.path.dirname(__file__), "fixtures", "nxos_show_version.cfg") nxos_template_path = os.path.join( diff --git a/tests/unit/plugins/sub_plugins/cli_parsers/test_xml_parser.py b/tests/unit/plugins/sub_plugins/cli_parsers/test_xml_parser.py index 817fb58..fe8c691 100644 --- a/tests/unit/plugins/sub_plugins/cli_parsers/test_xml_parser.py +++ b/tests/unit/plugins/sub_plugins/cli_parsers/test_xml_parser.py @@ -7,17 +7,17 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type from collections import OrderedDict +from unittest import TestCase import pytest from ansible_collections.ansible.utils.plugins.sub_plugins.cli_parser.xml_parser import CliParser -from ansible_collections.ansible.utils.tests.unit.compat import unittest xmltodict = pytest.importorskip("xmltodict") -class TestXmlParser(unittest.TestCase): +class TestXmlParser(TestCase): def test_valid_xml(self): xml = "text" xml_dict = OrderedDict( diff --git a/tests/unit/plugins/test/test_in_any_network.py b/tests/unit/plugins/test/test_in_any_network.py index 9e45958..0849320 100644 --- a/tests/unit/plugins/test/test_in_any_network.py +++ b/tests/unit/plugins/test/test_in_any_network.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError from ansible_collections.ansible.utils.plugins.test.in_any_network import _in_any_network -class TestInAnyNetwork(unittest.TestCase): +class TestInAnyNetwork(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_in_network.py b/tests/unit/plugins/test/test_in_network.py index 5ad621a..d742ff2 100644 --- a/tests/unit/plugins/test/test_in_network.py +++ b/tests/unit/plugins/test/test_in_network.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.in_network import _in_network -class TestInNetwork(unittest.TestCase): +class TestInNetwork(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_in_one_network.py b/tests/unit/plugins/test/test_in_one_network.py index 25276a9..76cf550 100644 --- a/tests/unit/plugins/test/test_in_one_network.py +++ b/tests/unit/plugins/test/test_in_one_network.py @@ -12,14 +12,14 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError from ansible_collections.ansible.utils.plugins.test.in_one_network import _in_one_network -class TestInOneNetwork(unittest.TestCase): +class TestInOneNetwork(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ip.py b/tests/unit/plugins/test/test_ip.py index 1c86290..5324d86 100644 --- a/tests/unit/plugins/test/test_ip.py +++ b/tests/unit/plugins/test/test_ip.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ip import _ip -class TestIp(unittest.TestCase): +class TestIp(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ip_address.py b/tests/unit/plugins/test/test_ip_address.py index b311597..eb04c30 100644 --- a/tests/unit/plugins/test/test_ip_address.py +++ b/tests/unit/plugins/test/test_ip_address.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ip_address import _ip_address -class TestIpAddress(unittest.TestCase): +class TestIpAddress(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv4.py b/tests/unit/plugins/test/test_ipv4.py index 3e21928..5284ed1 100644 --- a/tests/unit/plugins/test/test_ipv4.py +++ b/tests/unit/plugins/test/test_ipv4.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv4 import _ipv4 -class TestIpV4(unittest.TestCase): +class TestIpV4(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv4_address.py b/tests/unit/plugins/test/test_ipv4_address.py index 536f372..57a9045 100644 --- a/tests/unit/plugins/test/test_ipv4_address.py +++ b/tests/unit/plugins/test/test_ipv4_address.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv4_address import _ipv4_address -class TestIpV4Address(unittest.TestCase): +class TestIpV4Address(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv4_hostmask.py b/tests/unit/plugins/test/test_ipv4_hostmask.py index 69a659e..4ecac3f 100644 --- a/tests/unit/plugins/test/test_ipv4_hostmask.py +++ b/tests/unit/plugins/test/test_ipv4_hostmask.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv4_hostmask import _ipv4_hostmask -class TestIpV4Hostmask(unittest.TestCase): +class TestIpV4Hostmask(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv4_netmask.py b/tests/unit/plugins/test/test_ipv4_netmask.py index 82e2951..d4470d1 100644 --- a/tests/unit/plugins/test/test_ipv4_netmask.py +++ b/tests/unit/plugins/test/test_ipv4_netmask.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv4_netmask import _ipv4_netmask -class TestIpV4Netmask(unittest.TestCase): +class TestIpV4Netmask(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv6.py b/tests/unit/plugins/test/test_ipv6.py index 3ab24b8..16abe7d 100644 --- a/tests/unit/plugins/test/test_ipv6.py +++ b/tests/unit/plugins/test/test_ipv6.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv6 import _ipv6 -class TestIpV6(unittest.TestCase): +class TestIpV6(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv6_address.py b/tests/unit/plugins/test/test_ipv6_address.py index 52ecd46..4581506 100644 --- a/tests/unit/plugins/test/test_ipv6_address.py +++ b/tests/unit/plugins/test/test_ipv6_address.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv6_address import _ipv6_address -class TestIpV6Address(unittest.TestCase): +class TestIpV6Address(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv6_ipv4_mapped.py b/tests/unit/plugins/test/test_ipv6_ipv4_mapped.py index 22e63e2..8ac83f4 100644 --- a/tests/unit/plugins/test/test_ipv6_ipv4_mapped.py +++ b/tests/unit/plugins/test/test_ipv6_ipv4_mapped.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv6_ipv4_mapped import _ipv6_ipv4_mapped -class TestIpV6IpV4Mapped(unittest.TestCase): +class TestIpV6IpV4Mapped(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv6_sixtofour.py b/tests/unit/plugins/test/test_ipv6_sixtofour.py index afcbc7f..7875f17 100644 --- a/tests/unit/plugins/test/test_ipv6_sixtofour.py +++ b/tests/unit/plugins/test/test_ipv6_sixtofour.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv6_sixtofour import _ipv6_sixtofour -class TestIpV6SixToFour(unittest.TestCase): +class TestIpV6SixToFour(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_ipv6_teredo.py b/tests/unit/plugins/test/test_ipv6_teredo.py index d016725..c0b77bb 100644 --- a/tests/unit/plugins/test/test_ipv6_teredo.py +++ b/tests/unit/plugins/test/test_ipv6_teredo.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.ipv6_teredo import _ipv6_teredo -class TestIpV6Teredo(unittest.TestCase): +class TestIpV6Teredo(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_loopback.py b/tests/unit/plugins/test/test_loopback.py index 04a03b8..bc62c25 100644 --- a/tests/unit/plugins/test/test_loopback.py +++ b/tests/unit/plugins/test/test_loopback.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.loopback import _loopback -class TestLoopback(unittest.TestCase): +class TestLoopback(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_mac.py b/tests/unit/plugins/test/test_mac.py index de1236a..8487699 100644 --- a/tests/unit/plugins/test/test_mac.py +++ b/tests/unit/plugins/test/test_mac.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.mac import _mac -class TestMac(unittest.TestCase): +class TestMac(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_multicast.py b/tests/unit/plugins/test/test_multicast.py index 6fe7901..bf9d0fd 100644 --- a/tests/unit/plugins/test/test_multicast.py +++ b/tests/unit/plugins/test/test_multicast.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.multicast import _multicast -class TestMulticast(unittest.TestCase): +class TestMulticast(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_private.py b/tests/unit/plugins/test/test_private.py index 3d8c6f3..6622ed3 100644 --- a/tests/unit/plugins/test/test_private.py +++ b/tests/unit/plugins/test/test_private.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.private import _private -class TestPrivate(unittest.TestCase): +class TestPrivate(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_public.py b/tests/unit/plugins/test/test_public.py index b391324..37936ae 100644 --- a/tests/unit/plugins/test/test_public.py +++ b/tests/unit/plugins/test/test_public.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.public import _public -class TestPublic(unittest.TestCase): +class TestPublic(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_reserved.py b/tests/unit/plugins/test/test_reserved.py index 60be18f..5dfcbb5 100644 --- a/tests/unit/plugins/test/test_reserved.py +++ b/tests/unit/plugins/test/test_reserved.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.reserved import _reserved -class TestReserved(unittest.TestCase): +class TestReserved(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_resolvable.py b/tests/unit/plugins/test/test_resolvable.py index 900a86a..02e7202 100644 --- a/tests/unit/plugins/test/test_resolvable.py +++ b/tests/unit/plugins/test/test_resolvable.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.resolvable import _resolvable -class TestResolvable(unittest.TestCase): +class TestResolvable(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_subnet_of.py b/tests/unit/plugins/test/test_subnet_of.py index de35ec6..fcf76a0 100644 --- a/tests/unit/plugins/test/test_subnet_of.py +++ b/tests/unit/plugins/test/test_subnet_of.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.subnet_of import _subnet_of -class TestSubnetOf(unittest.TestCase): +class TestSubnetOf(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_supernet_of.py b/tests/unit/plugins/test/test_supernet_of.py index e375b3a..f1a58da 100644 --- a/tests/unit/plugins/test/test_supernet_of.py +++ b/tests/unit/plugins/test/test_supernet_of.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.supernet_of import _supernet_of -class TestSupernetOf(unittest.TestCase): +class TestSupernetOf(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_unspecified.py b/tests/unit/plugins/test/test_unspecified.py index 8151e89..98799fd 100644 --- a/tests/unit/plugins/test/test_unspecified.py +++ b/tests/unit/plugins/test/test_unspecified.py @@ -12,12 +12,12 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible_collections.ansible.utils.plugins.test.unspecified import _unspecified -class TestUnspecified(unittest.TestCase): +class TestUnspecified(TestCase): def setUp(self): pass diff --git a/tests/unit/plugins/test/test_validate.py b/tests/unit/plugins/test/test_validate.py index f70125e..0cef135 100644 --- a/tests/unit/plugins/test/test_validate.py +++ b/tests/unit/plugins/test/test_validate.py @@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -import unittest +from unittest import TestCase from ansible.errors import AnsibleError @@ -92,7 +92,7 @@ CRITERIA_IN_RATE_CHECK = { } -class TestValidate(unittest.TestCase): +class TestValidate(TestCase): def setUp(self): pass