Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up unused imports in unit tests #79893

Merged
merged 1 commit into from Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/units/_vendor/test_vendor.py
Expand Up @@ -9,7 +9,7 @@
import pytest
import sys

from unittest.mock import MagicMock, NonCallableMagicMock, patch
from unittest.mock import patch


def reset_internal_vendor_package():
Expand Down
2 changes: 1 addition & 1 deletion test/units/compat/mock.py
Expand Up @@ -6,7 +6,7 @@
__metaclass__ = type

try:
from unittest.mock import (
from unittest.mock import ( # pylint: disable=unused-import
call,
patch,
mock_open,
Expand Down
2 changes: 1 addition & 1 deletion test/units/config/test_manager.py
Expand Up @@ -10,7 +10,7 @@
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
Expand Down
10 changes: 10 additions & 0 deletions 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()
2 changes: 0 additions & 2 deletions test/units/executor/module_common/test_modify_module.py
Expand Up @@ -9,8 +9,6 @@

from ansible.executor.module_common import modify_module

from test_module_common import templar


FAKE_OLD_MODULE = b'''#!/usr/bin/python
import sys
Expand Down
9 changes: 0 additions & 9 deletions test/units/executor/module_common/test_module_common.py
Expand Up @@ -89,15 +89,6 @@ def test_slurp_file_with_newlines(self, mocker):
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):
Expand Down
2 changes: 1 addition & 1 deletion test/units/executor/test_task_executor.py
Expand Up @@ -25,7 +25,7 @@
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
Expand Down
3 changes: 1 addition & 2 deletions test/units/galaxy/test_collection.py
Expand Up @@ -20,10 +20,9 @@

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
Expand Down
1 change: 0 additions & 1 deletion test/units/galaxy/test_collection_install.py
Expand Up @@ -18,7 +18,6 @@

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

Expand Down
3 changes: 0 additions & 3 deletions 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

Expand Down
1 change: 0 additions & 1 deletion test/units/module_utils/basic/test_sanitize_keys.py
Expand Up @@ -6,7 +6,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

import pytest
from ansible.module_utils.basic import sanitize_keys


Expand Down
5 changes: 1 addition & 4 deletions test/units/module_utils/basic/test_set_cwd.py
Expand Up @@ -8,12 +8,9 @@

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
Expand Down
1 change: 0 additions & 1 deletion test/units/module_utils/common/arg_spec/test_aliases.py
Expand Up @@ -9,7 +9,6 @@

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 = [
Expand Down
Expand Up @@ -9,7 +9,6 @@
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


Expand Down
6 changes: 1 addition & 5 deletions test/units/module_utils/facts/test_sysctl.py
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion test/units/module_utils/urls/test_fetch_file.py
Expand Up @@ -10,7 +10,6 @@
from ansible.module_utils.urls import fetch_file

import pytest
from units.compat.mock import MagicMock


class FakeTemporaryFile:
Expand Down
2 changes: 0 additions & 2 deletions test/units/module_utils/urls/test_prepare_multipart.py
Expand Up @@ -7,8 +7,6 @@

import os

from io import StringIO

from email.message import Message

import pytest
Expand Down
5 changes: 0 additions & 5 deletions test/units/modules/test_async_wrapper.py
Expand Up @@ -9,13 +9,8 @@
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:

Expand Down
1 change: 0 additions & 1 deletion test/units/modules/test_hostname.py
Expand Up @@ -6,7 +6,6 @@
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
Expand Down
2 changes: 1 addition & 1 deletion test/units/playbook/role/test_role.py
Expand Up @@ -24,7 +24,7 @@
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
Expand Down
1 change: 0 additions & 1 deletion test/units/playbook/test_collectionsearch.py
Expand Up @@ -22,7 +22,6 @@
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

Expand Down
2 changes: 0 additions & 2 deletions test/units/playbook/test_play_context.py
Expand Up @@ -12,10 +12,8 @@
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


Expand Down
2 changes: 1 addition & 1 deletion test/units/plugins/action/test_pause.py
Expand Up @@ -11,7 +11,7 @@
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__'
Expand Down
1 change: 0 additions & 1 deletion test/units/plugins/connection/test_local.py
Expand Up @@ -21,7 +21,6 @@
__metaclass__ = type

from io import StringIO
import pytest

from units.compat import unittest
from ansible.plugins.connection import local
Expand Down
1 change: 0 additions & 1 deletion test/units/plugins/connection/test_ssh.py
Expand Up @@ -24,7 +24,6 @@
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
Expand Down
2 changes: 0 additions & 2 deletions test/units/plugins/filter/test_core.py
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test/units/plugins/strategy/test_strategy.py
Expand Up @@ -27,7 +27,6 @@
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
Expand Down
2 changes: 0 additions & 2 deletions test/units/template/test_templar.py
Expand Up @@ -22,11 +22,9 @@
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
Expand Down
@@ -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():
Expand Down
@@ -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