diff options
author | Matt Clay <matt@mystile.com> | 2023-02-02 15:52:38 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-02 15:52:38 -0800 |
commit | 25d859f8fb7587af158e8a78feb1f8b4b90ace07 (patch) | |
tree | e4a12c7a751ef51362e2b3986895352281d0b4c8 | |
parent | d637e87a9e462b513c5732bd85ba137d03616b36 (diff) | |
download | ansible-25d859f8fb7587af158e8a78feb1f8b4b90ace07.tar.gz |
Clean up unused imports in unit tests (#79893)
30 files changed, 21 insertions, 56 deletions
diff --git a/test/units/_vendor/test_vendor.py b/test/units/_vendor/test_vendor.py index 84b850e2d8..0d21ef0431 100644 --- a/test/units/_vendor/test_vendor.py +++ b/test/units/_vendor/test_vendor.py @@ -9,7 +9,7 @@ import pkgutil import pytest import sys -from unittest.mock import MagicMock, NonCallableMagicMock, patch +from unittest.mock import patch def reset_internal_vendor_package(): diff --git a/test/units/compat/mock.py b/test/units/compat/mock.py index 58dc78e074..031546093e 100644 --- a/test/units/compat/mock.py +++ b/test/units/compat/mock.py @@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type try: - from unittest.mock import ( + from unittest.mock import ( # pylint: disable=unused-import call, patch, mock_open, diff --git a/test/units/config/test_manager.py b/test/units/config/test_manager.py index 8ef4043742..9e6b669654 100644 --- a/test/units/config/test_manager.py +++ b/test/units/config/test_manager.py @@ -10,7 +10,7 @@ import os import os.path import pytest -from ansible.config.manager import ConfigManager, Setting, ensure_type, resolve_path, get_config_type +from ansible.config.manager import ConfigManager, ensure_type, resolve_path, get_config_type from ansible.errors import AnsibleOptionsError, AnsibleError from ansible.module_utils.six import integer_types, string_types from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode diff --git a/test/units/executor/module_common/conftest.py b/test/units/executor/module_common/conftest.py new file mode 100644 index 0000000000..f0eef12e57 --- /dev/null +++ b/test/units/executor/module_common/conftest.py @@ -0,0 +1,10 @@ +import pytest + + +@pytest.fixture +def templar(): + class FakeTemplar: + def template(self, template_string, *args, **kwargs): + return template_string + + return FakeTemplar() diff --git a/test/units/executor/module_common/test_modify_module.py b/test/units/executor/module_common/test_modify_module.py index a32d47c448..89e4a163f8 100644 --- a/test/units/executor/module_common/test_modify_module.py +++ b/test/units/executor/module_common/test_modify_module.py @@ -9,8 +9,6 @@ import pytest from ansible.executor.module_common import modify_module -from test_module_common import templar - FAKE_OLD_MODULE = b'''#!/usr/bin/python import sys diff --git a/test/units/executor/module_common/test_module_common.py b/test/units/executor/module_common/test_module_common.py index c2c1612532..390dc90135 100644 --- a/test/units/executor/module_common/test_module_common.py +++ b/test/units/executor/module_common/test_module_common.py @@ -89,15 +89,6 @@ class TestSlurp: assert amc._slurp('some_file') == '#!/usr/bin/python\ndef test(args):\nprint("hi")\n' -@pytest.fixture -def templar(): - class FakeTemplar: - def template(self, template_string, *args, **kwargs): - return template_string - - return FakeTemplar() - - class TestGetShebang: """Note: We may want to change the API of this function in the future. It isn't a great API""" def test_no_interpreter_set(self, templar): diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py index 315d26ae3a..8576d21b34 100644 --- a/test/units/executor/test_task_executor.py +++ b/test/units/executor/test_task_executor.py @@ -25,7 +25,7 @@ from units.compat import unittest from unittest.mock import patch, MagicMock from ansible.errors import AnsibleError from ansible.executor.task_executor import TaskExecutor, remove_omit -from ansible.plugins.loader import action_loader, lookup_loader, module_loader +from ansible.plugins.loader import action_loader, lookup_loader from ansible.parsing.yaml.objects import AnsibleUnicode from ansible.utils.unsafe_proxy import AnsibleUnsafeText, AnsibleUnsafeBytes from ansible.module_utils.six import text_type diff --git a/test/units/galaxy/test_collection.py b/test/units/galaxy/test_collection.py index b8a6d2ebfe..04a6a43436 100644 --- a/test/units/galaxy/test_collection.py +++ b/test/units/galaxy/test_collection.py @@ -20,10 +20,9 @@ from unittest.mock import MagicMock, mock_open, patch import ansible.constants as C from ansible import context -from ansible.cli.galaxy import GalaxyCLI, SERVER_DEF +from ansible.cli.galaxy import GalaxyCLI from ansible.errors import AnsibleError from ansible.galaxy import api, collection, token -from ansible.plugins.loader import init_plugin_loader from ansible.module_utils._text import to_bytes, to_native, to_text from ansible.module_utils.six.moves import builtins from ansible.utils import context_objects as co diff --git a/test/units/galaxy/test_collection_install.py b/test/units/galaxy/test_collection_install.py index 4a55b3815b..f8fb6d57ed 100644 --- a/test/units/galaxy/test_collection_install.py +++ b/test/units/galaxy/test_collection_install.py @@ -18,7 +18,6 @@ import yaml from io import BytesIO, StringIO from unittest.mock import MagicMock, patch -from unittest import mock import ansible.module_utils.six.moves.urllib.error as urllib_error diff --git a/test/units/module_utils/basic/test_command_nonexisting.py b/test/units/module_utils/basic/test_command_nonexisting.py index 6ed7f91b33..9f348ebb0a 100644 --- a/test/units/module_utils/basic/test_command_nonexisting.py +++ b/test/units/module_utils/basic/test_command_nonexisting.py @@ -1,13 +1,10 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import sys -import pytest import json import sys import pytest import subprocess -import ansible.module_utils.basic from ansible.module_utils._text import to_bytes from ansible.module_utils import basic diff --git a/test/units/module_utils/basic/test_sanitize_keys.py b/test/units/module_utils/basic/test_sanitize_keys.py index 180f86624f..3edb216b8b 100644 --- a/test/units/module_utils/basic/test_sanitize_keys.py +++ b/test/units/module_utils/basic/test_sanitize_keys.py @@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import pytest from ansible.module_utils.basic import sanitize_keys diff --git a/test/units/module_utils/basic/test_set_cwd.py b/test/units/module_utils/basic/test_set_cwd.py index 159236b75e..d413e50ad7 100644 --- a/test/units/module_utils/basic/test_set_cwd.py +++ b/test/units/module_utils/basic/test_set_cwd.py @@ -8,12 +8,9 @@ __metaclass__ = type import json import os -import shutil import tempfile -import pytest - -from units.compat.mock import patch, MagicMock +from units.compat.mock import patch from ansible.module_utils._text import to_bytes from ansible.module_utils import basic diff --git a/test/units/module_utils/common/arg_spec/test_aliases.py b/test/units/module_utils/common/arg_spec/test_aliases.py index 7d30fb0f0c..7522c769d7 100644 --- a/test/units/module_utils/common/arg_spec/test_aliases.py +++ b/test/units/module_utils/common/arg_spec/test_aliases.py @@ -9,7 +9,6 @@ import pytest from ansible.module_utils.errors import AnsibleValidationError, AnsibleValidationErrorMultiple from ansible.module_utils.common.arg_spec import ArgumentSpecValidator, ValidationResult -from ansible.module_utils.common.warnings import get_deprecation_messages, get_warning_messages # id, argument spec, parameters, expected parameters, deprecation, warning ALIAS_TEST_CASES = [ diff --git a/test/units/module_utils/common/validation/test_check_missing_parameters.py b/test/units/module_utils/common/validation/test_check_missing_parameters.py index 6cbcb8bff5..24ce3a8134 100644 --- a/test/units/module_utils/common/validation/test_check_missing_parameters.py +++ b/test/units/module_utils/common/validation/test_check_missing_parameters.py @@ -9,7 +9,6 @@ __metaclass__ = type import pytest from ansible.module_utils._text import to_native -from ansible.module_utils.common.validation import check_required_one_of from ansible.module_utils.common.validation import check_missing_parameters diff --git a/test/units/module_utils/facts/test_sysctl.py b/test/units/module_utils/facts/test_sysctl.py index c369b61080..0f1632bf91 100644 --- a/test/units/module_utils/facts/test_sysctl.py +++ b/test/units/module_utils/facts/test_sysctl.py @@ -20,13 +20,9 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import os - -import pytest - # for testing from units.compat import unittest -from units.compat.mock import patch, MagicMock, mock_open, Mock +from units.compat.mock import MagicMock from ansible.module_utils.facts.sysctl import get_sysctl diff --git a/test/units/module_utils/urls/test_fetch_file.py b/test/units/module_utils/urls/test_fetch_file.py index ed112270d9..ecb6b9f15d 100644 --- a/test/units/module_utils/urls/test_fetch_file.py +++ b/test/units/module_utils/urls/test_fetch_file.py @@ -10,7 +10,6 @@ import os from ansible.module_utils.urls import fetch_file import pytest -from units.compat.mock import MagicMock class FakeTemporaryFile: diff --git a/test/units/module_utils/urls/test_prepare_multipart.py b/test/units/module_utils/urls/test_prepare_multipart.py index 226d9edd02..ee320477e0 100644 --- a/test/units/module_utils/urls/test_prepare_multipart.py +++ b/test/units/module_utils/urls/test_prepare_multipart.py @@ -7,8 +7,6 @@ __metaclass__ = type import os -from io import StringIO - from email.message import Message import pytest diff --git a/test/units/modules/test_async_wrapper.py b/test/units/modules/test_async_wrapper.py index 37b1fda374..70f8db8d66 100644 --- a/test/units/modules/test_async_wrapper.py +++ b/test/units/modules/test_async_wrapper.py @@ -9,13 +9,8 @@ import json import shutil import tempfile -import pytest - -from units.compat.mock import patch, MagicMock from ansible.modules import async_wrapper -from pprint import pprint - class TestAsyncWrapper: diff --git a/test/units/modules/test_hostname.py b/test/units/modules/test_hostname.py index 9050fd04b0..2d12618626 100644 --- a/test/units/modules/test_hostname.py +++ b/test/units/modules/test_hostname.py @@ -6,7 +6,6 @@ import shutil import tempfile from units.compat.mock import patch, MagicMock, mock_open -from ansible.module_utils import basic from ansible.module_utils.common._utils import get_all_subclasses from ansible.modules import hostname from units.modules.utils import ModuleTestCase, set_module_args diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index fadce8f5dc..0690b11ff2 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -24,7 +24,7 @@ from collections.abc import Container from units.compat import unittest from unittest.mock import patch, MagicMock -from ansible.errors import AnsibleError, AnsibleParserError +from ansible.errors import AnsibleParserError from ansible.playbook.block import Block from units.mock.loader import DictDataLoader diff --git a/test/units/playbook/test_collectionsearch.py b/test/units/playbook/test_collectionsearch.py index be40d85e30..d16541b794 100644 --- a/test/units/playbook/test_collectionsearch.py +++ b/test/units/playbook/test_collectionsearch.py @@ -22,7 +22,6 @@ from ansible.errors import AnsibleParserError from ansible.playbook.play import Play from ansible.playbook.task import Task from ansible.playbook.block import Block -from ansible.playbook.collectionsearch import CollectionSearch import pytest diff --git a/test/units/playbook/test_play_context.py b/test/units/playbook/test_play_context.py index 7c24de515e..7461b45ffb 100644 --- a/test/units/playbook/test_play_context.py +++ b/test/units/playbook/test_play_context.py @@ -12,10 +12,8 @@ import pytest from ansible import constants as C from ansible import context from ansible.cli.arguments import option_helpers as opt_help -from ansible.errors import AnsibleError from ansible.playbook.play_context import PlayContext from ansible.playbook.play import Play -from ansible.plugins.loader import become_loader from ansible.utils import context_objects as co diff --git a/test/units/plugins/action/test_pause.py b/test/units/plugins/action/test_pause.py index 8ad6db7208..fc4325f46d 100644 --- a/test/units/plugins/action/test_pause.py +++ b/test/units/plugins/action/test_pause.py @@ -11,7 +11,7 @@ import io import pytest import sys -from ansible.plugins.action import pause # noqa: F401 +from ansible.plugins.action import pause # pylint: disable=unused-import from ansible.module_utils.six import PY2 builtin_import = 'builtins.__import__' diff --git a/test/units/plugins/connection/test_local.py b/test/units/plugins/connection/test_local.py index e55258550e..483a881b2e 100644 --- a/test/units/plugins/connection/test_local.py +++ b/test/units/plugins/connection/test_local.py @@ -21,7 +21,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from io import StringIO -import pytest from units.compat import unittest from ansible.plugins.connection import local diff --git a/test/units/plugins/connection/test_ssh.py b/test/units/plugins/connection/test_ssh.py index 662dff9192..1f01188af4 100644 --- a/test/units/plugins/connection/test_ssh.py +++ b/test/units/plugins/connection/test_ssh.py @@ -24,7 +24,6 @@ from io import StringIO import pytest -from ansible import constants as C from ansible.errors import AnsibleAuthenticationFailure from units.compat import unittest from unittest.mock import patch, MagicMock, PropertyMock diff --git a/test/units/plugins/filter/test_core.py b/test/units/plugins/filter/test_core.py index df4e4725de..8a626d9a75 100644 --- a/test/units/plugins/filter/test_core.py +++ b/test/units/plugins/filter/test_core.py @@ -3,8 +3,6 @@ # 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 jinja2.runtime import Undefined -from jinja2.exceptions import UndefinedError __metaclass__ = type import pytest diff --git a/test/units/plugins/strategy/test_strategy.py b/test/units/plugins/strategy/test_strategy.py index f935f4b59b..a225f0726a 100644 --- a/test/units/plugins/strategy/test_strategy.py +++ b/test/units/plugins/strategy/test_strategy.py @@ -27,7 +27,6 @@ from unittest.mock import patch, MagicMock from ansible.executor.process.worker import WorkerProcess from ansible.executor.task_queue_manager import TaskQueueManager from ansible.executor.task_result import TaskResult -from ansible.inventory.host import Host from ansible.module_utils.six.moves import queue as Queue from ansible.playbook.block import Block from ansible.playbook.handler import Handler diff --git a/test/units/template/test_templar.py b/test/units/template/test_templar.py index 53eba1d09a..02840e16fd 100644 --- a/test/units/template/test_templar.py +++ b/test/units/template/test_templar.py @@ -22,11 +22,9 @@ __metaclass__ = type from jinja2.runtime import Context from units.compat import unittest -from unittest.mock import patch from ansible import constants as C from ansible.errors import AnsibleError, AnsibleUndefinedVariable -from ansible.module_utils.six import string_types from ansible.plugins.loader import init_plugin_loader from ansible.template import Templar, AnsibleContext, AnsibleEnvironment, AnsibleUndefined from ansible.utils.unsafe_proxy import AnsibleUnsafe, wrap_var diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py index 9d30580f65..a85f422ab9 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/action/my_action.py @@ -1,7 +1,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ..module_utils.my_util import question +from ..module_utils.my_util import question # pylint: disable=unused-import def action_code(): diff --git a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py index 35e1381b53..463b133449 100644 --- a/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py +++ b/test/units/utils/collection_loader/fixtures/collections/ansible_collections/testns/testcoll/plugins/module_utils/my_other_util.py @@ -1,4 +1,4 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from .my_util import question +from .my_util import question # pylint: disable=unused-import |