diff --git a/test/units/module_utils/basic/test_set_mode_if_different.py b/test/units/module_utils/basic/test_set_mode_if_different.py index fcc4691ed52..406b194aead 100644 --- a/test/units/module_utils/basic/test_set_mode_if_different.py +++ b/test/units/module_utils/basic/test_set_mode_if_different.py @@ -10,11 +10,6 @@ __metaclass__ = type import os from itertools import product -try: - import builtins -except ImportError: - import __builtin__ as builtins - import pytest diff --git a/test/units/module_utils/facts/base.py b/test/units/module_utils/facts/base.py index edaf3495dc6..28a2bf8773c 100644 --- a/test/units/module_utils/facts/base.py +++ b/test/units/module_utils/facts/base.py @@ -19,8 +19,6 @@ from __future__ import (absolute_import, division) __metaclass__ = type -import os - from units.compat import unittest from units.compat.mock import Mock, patch diff --git a/test/units/module_utils/xenserver/test_gather_vm_params_and_facts.py b/test/units/module_utils/xenserver/test_gather_vm_params_and_facts.py index 835c4e6cf16..510daa1eac0 100644 --- a/test/units/module_utils/xenserver/test_gather_vm_params_and_facts.py +++ b/test/units/module_utils/xenserver/test_gather_vm_params_and_facts.py @@ -9,7 +9,6 @@ __metaclass__ = type import pytest -from .FakeAnsibleModule import FailJsonException from .common import testcase_bad_xenapi_refs diff --git a/test/units/module_utils/xenserver/test_misc.py b/test/units/module_utils/xenserver/test_misc.py index c5724efb48f..8a8d4eaeef9 100644 --- a/test/units/module_utils/xenserver/test_misc.py +++ b/test/units/module_utils/xenserver/test_misc.py @@ -7,9 +7,6 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type -from .FakeAnsibleModule import FailJsonException - - def test_xapi_to_module_vm_power_state_bad_power_state(xenserver): """Tests that None is returned on bad power state.""" assert xenserver.xapi_to_module_vm_power_state("bad") is None diff --git a/test/units/module_utils/xenserver/test_netaddr_functions.py b/test/units/module_utils/xenserver/test_netaddr_functions.py index 3393d08a9c9..33af72a14fd 100644 --- a/test/units/module_utils/xenserver/test_netaddr_functions.py +++ b/test/units/module_utils/xenserver/test_netaddr_functions.py @@ -9,7 +9,6 @@ __metaclass__ = type import pytest -from .FakeAnsibleModule import FailJsonException from ansible.module_utils.common.network import is_mac testcase_is_valid_mac_addr = [ diff --git a/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py b/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py index ef98c7c6cb2..3ca3c061c10 100644 --- a/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py +++ b/test/units/modules/cloud/amazon/test_aws_direct_connect_connection.py @@ -17,7 +17,6 @@ from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import aws_direct_connect_connection -from ansible.module_utils.ec2 import get_aws_connection_info, boto3_conn class FakeModule(object): diff --git a/test/units/modules/cloud/amazon/test_cloudformation.py b/test/units/modules/cloud/amazon/test_cloudformation.py index d472169dd95..99fa5d87723 100644 --- a/test/units/modules/cloud/amazon/test_cloudformation.py +++ b/test/units/modules/cloud/amazon/test_cloudformation.py @@ -16,7 +16,6 @@ # along with Ansible. If not, see . import pytest -from mock import patch from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import cloudformation as cfn_module diff --git a/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py b/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py index d86a6a6f43e..13b81de1a66 100644 --- a/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py +++ b/test/units/modules/cloud/amazon/test_ec2_vpc_vpn.py @@ -19,7 +19,6 @@ import pytest import os from units.utils.amazon_placebo_fixtures import placeboify, maybe_sleep from ansible.modules.cloud.amazon import ec2_vpc_vpn -from ansible.module_utils._text import to_text from ansible.module_utils.ec2 import get_aws_connection_info, boto3_conn, boto3_tag_list_to_ansible_dict diff --git a/test/units/modules/cloud/kubevirt/test_kubevirt_rs.py b/test/units/modules/cloud/kubevirt/test_kubevirt_rs.py index 970e09724ba..1806b7bad90 100644 --- a/test/units/modules/cloud/kubevirt/test_kubevirt_rs.py +++ b/test/units/modules/cloud/kubevirt/test_kubevirt_rs.py @@ -6,7 +6,6 @@ from units.modules.utils import set_module_args from units.utils.kubevirt_fixtures import base_fixture, RESOURCE_DEFAULT_ARGS, AnsibleExitJson from ansible.module_utils.k8s.raw import KubernetesRawModule -from ansible.module_utils.kubevirt import KubeVirtRawModule from ansible.modules.cloud.kubevirt import kubevirt_rs as mymodule KIND = 'VirtualMachineInstanceReplicaSet' diff --git a/test/units/modules/monitoring/test_circonus_annotation.py b/test/units/modules/monitoring/test_circonus_annotation.py index d53fe0bf5b5..63494c0ebd8 100644 --- a/test/units/modules/monitoring/test_circonus_annotation.py +++ b/test/units/modules/monitoring/test_circonus_annotation.py @@ -7,7 +7,6 @@ import uuid from urllib3.response import HTTPResponse from units.compat.mock import patch -from ansible.module_utils import basic from ansible.module_utils._text import to_bytes from ansible.modules.monitoring import circonus_annotation from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/test/units/modules/monitoring/test_pagerduty_alert.py b/test/units/modules/monitoring/test_pagerduty_alert.py index c91fb6b3596..cc177bd6d53 100644 --- a/test/units/modules/monitoring/test_pagerduty_alert.py +++ b/test/units/modules/monitoring/test_pagerduty_alert.py @@ -1,8 +1,6 @@ from units.compat import unittest from ansible.modules.monitoring import pagerduty_alert -from ansible.module_utils.six.moves.urllib.parse import urlunparse - class PagerDutyAlertsTest(unittest.TestCase): def _assert_incident_api(self, module, url, method, headers): diff --git a/test/units/modules/net_tools/nios/test_nios_host_record.py b/test/units/modules/net_tools/nios/test_nios_host_record.py index 994e54b4869..0a317288d1c 100644 --- a/test/units/modules/net_tools/nios/test_nios_host_record.py +++ b/test/units/modules/net_tools/nios/test_nios_host_record.py @@ -20,7 +20,6 @@ __metaclass__ = type from ansible.modules.net_tools.nios import nios_host_record from ansible.module_utils.net_tools.nios import api -from units.modules.utils import set_module_args from units.compat.mock import patch, MagicMock, Mock from .test_nios_module import TestNiosModule, load_fixture diff --git a/test/units/modules/net_tools/nios/test_nios_network.py b/test/units/modules/net_tools/nios/test_nios_network.py index f83fe4bdccf..859e24d0a6b 100644 --- a/test/units/modules/net_tools/nios/test_nios_network.py +++ b/test/units/modules/net_tools/nios/test_nios_network.py @@ -21,7 +21,6 @@ __metaclass__ = type from ansible.module_utils.net_tools.nios import api from ansible.modules.net_tools.nios import nios_network from units.compat.mock import patch, MagicMock, Mock -from units.modules.utils import set_module_args from .test_nios_module import TestNiosModule, load_fixture diff --git a/test/units/modules/network/cnos/cnos_module.py b/test/units/modules/network/cnos/cnos_module.py index e31cedd7cc3..467ea08f33a 100644 --- a/test/units/modules/network/cnos/cnos_module.py +++ b/test/units/modules/network/cnos/cnos_module.py @@ -26,7 +26,6 @@ import tempfile from units.compat import unittest from units.compat.mock import patch from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') diff --git a/test/units/modules/network/enos/enos_module.py b/test/units/modules/network/enos/enos_module.py index a7af81c3c2a..ab6a752c7ec 100644 --- a/test/units/modules/network/enos/enos_module.py +++ b/test/units/modules/network/enos/enos_module.py @@ -25,7 +25,6 @@ import json from units.compat import unittest from units.compat.mock import patch from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') diff --git a/test/units/modules/network/f5/test_bigip_appsvcs_extension.py b/test/units/modules/network/f5/test_bigip_appsvcs_extension.py index 125d2128892..4f61a23f156 100644 --- a/test/units/modules/network/f5/test_bigip_appsvcs_extension.py +++ b/test/units/modules/network/f5/test_bigip_appsvcs_extension.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigip_appsvcs_extension import ApiParameters from library.modules.bigip_appsvcs_extension import ModuleParameters from library.modules.bigip_appsvcs_extension import ModuleManager from library.modules.bigip_appsvcs_extension import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigip_appsvcs_extension import ApiParameters from ansible.modules.network.f5.bigip_appsvcs_extension import ModuleParameters from ansible.modules.network.f5.bigip_appsvcs_extension import ModuleManager from ansible.modules.network.f5.bigip_appsvcs_extension import ArgumentSpec @@ -37,7 +34,6 @@ except ImportError: # Ansible 2.8 imports from units.compat import unittest from units.compat.mock import Mock - from units.compat.mock import patch from units.modules.utils import set_module_args diff --git a/test/units/modules/network/f5/test_bigip_cli_alias.py b/test/units/modules/network/f5/test_bigip_cli_alias.py index c0408358fdb..6c980cdb02c 100644 --- a/test/units/modules/network/f5/test_bigip_cli_alias.py +++ b/test/units/modules/network/f5/test_bigip_cli_alias.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # Ansible 2.8 imports from units.compat import unittest from units.compat.mock import Mock - from units.compat.mock import patch from units.modules.utils import set_module_args diff --git a/test/units/modules/network/f5/test_bigiq_application_fasthttp.py b/test/units/modules/network/f5/test_bigiq_application_fasthttp.py index acaad34f266..67004494506 100644 --- a/test/units/modules/network/f5/test_bigiq_application_fasthttp.py +++ b/test/units/modules/network/f5/test_bigiq_application_fasthttp.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_fasthttp import ApiParameters from library.modules.bigiq_application_fasthttp import ModuleParameters from library.modules.bigiq_application_fasthttp import ModuleManager from library.modules.bigiq_application_fasthttp import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_fasthttp import ApiParameters from ansible.modules.network.f5.bigiq_application_fasthttp import ModuleParameters from ansible.modules.network.f5.bigiq_application_fasthttp import ModuleManager from ansible.modules.network.f5.bigiq_application_fasthttp import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_application_fastl4_tcp.py b/test/units/modules/network/f5/test_bigiq_application_fastl4_tcp.py index 4e2f13edebc..cd057565d6e 100644 --- a/test/units/modules/network/f5/test_bigiq_application_fastl4_tcp.py +++ b/test/units/modules/network/f5/test_bigiq_application_fastl4_tcp.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_fastl4_tcp import ApiParameters from library.modules.bigiq_application_fastl4_tcp import ModuleParameters from library.modules.bigiq_application_fastl4_tcp import ModuleManager from library.modules.bigiq_application_fastl4_tcp import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_fastl4_tcp import ApiParameters from ansible.modules.network.f5.bigiq_application_fastl4_tcp import ModuleParameters from ansible.modules.network.f5.bigiq_application_fastl4_tcp import ModuleManager from ansible.modules.network.f5.bigiq_application_fastl4_tcp import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_application_fastl4_udp.py b/test/units/modules/network/f5/test_bigiq_application_fastl4_udp.py index b091cd8e9fe..934876b36d6 100644 --- a/test/units/modules/network/f5/test_bigiq_application_fastl4_udp.py +++ b/test/units/modules/network/f5/test_bigiq_application_fastl4_udp.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_fastl4_udp import ApiParameters from library.modules.bigiq_application_fastl4_udp import ModuleParameters from library.modules.bigiq_application_fastl4_udp import ModuleManager from library.modules.bigiq_application_fastl4_udp import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_fastl4_udp import ApiParameters from ansible.modules.network.f5.bigiq_application_fastl4_udp import ModuleParameters from ansible.modules.network.f5.bigiq_application_fastl4_udp import ModuleManager from ansible.modules.network.f5.bigiq_application_fastl4_udp import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_application_http.py b/test/units/modules/network/f5/test_bigiq_application_http.py index b2ac95dd8f5..5bb25af2cb3 100644 --- a/test/units/modules/network/f5/test_bigiq_application_http.py +++ b/test/units/modules/network/f5/test_bigiq_application_http.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_http import ApiParameters from library.modules.bigiq_application_http import ModuleParameters from library.modules.bigiq_application_http import ModuleManager from library.modules.bigiq_application_http import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_http import ApiParameters from ansible.modules.network.f5.bigiq_application_http import ModuleParameters from ansible.modules.network.f5.bigiq_application_http import ModuleManager from ansible.modules.network.f5.bigiq_application_http import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_application_https_offload.py b/test/units/modules/network/f5/test_bigiq_application_https_offload.py index ef35aac7860..ebac1d82067 100644 --- a/test/units/modules/network/f5/test_bigiq_application_https_offload.py +++ b/test/units/modules/network/f5/test_bigiq_application_https_offload.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_https_offload import ApiParameters from library.modules.bigiq_application_https_offload import ModuleParameters from library.modules.bigiq_application_https_offload import ModuleManager from library.modules.bigiq_application_https_offload import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_https_offload import ApiParameters from ansible.modules.network.f5.bigiq_application_https_offload import ModuleParameters from ansible.modules.network.f5.bigiq_application_https_offload import ModuleManager from ansible.modules.network.f5.bigiq_application_https_offload import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_application_https_waf.py b/test/units/modules/network/f5/test_bigiq_application_https_waf.py index 9d99f473747..0a6abfdab6b 100644 --- a/test/units/modules/network/f5/test_bigiq_application_https_waf.py +++ b/test/units/modules/network/f5/test_bigiq_application_https_waf.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_application_https_waf import ApiParameters from library.modules.bigiq_application_https_waf import ModuleParameters from library.modules.bigiq_application_https_waf import ModuleManager from library.modules.bigiq_application_https_waf import ArgumentSpec @@ -30,7 +29,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_application_https_waf import ApiParameters from ansible.modules.network.f5.bigiq_application_https_waf import ModuleParameters from ansible.modules.network.f5.bigiq_application_https_waf import ModuleManager from ansible.modules.network.f5.bigiq_application_https_waf import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_device_info.py b/test/units/modules/network/f5/test_bigiq_device_info.py index c8b328bdc5a..14273dfb38f 100644 --- a/test/units/modules/network/f5/test_bigiq_device_info.py +++ b/test/units/modules/network/f5/test_bigiq_device_info.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # Ansible 2.8 imports from units.compat import unittest from units.compat.mock import Mock - from units.compat.mock import patch from units.modules.utils import set_module_args diff --git a/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py b/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py index fe310e69a68..387757a1e05 100644 --- a/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py +++ b/test/units/modules/network/f5/test_bigiq_regkey_license_assignment.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_regkey_license_assignment import ApiParameters from library.modules.bigiq_regkey_license_assignment import ModuleParameters from library.modules.bigiq_regkey_license_assignment import ModuleManager from library.modules.bigiq_regkey_license_assignment import ArgumentSpec @@ -29,7 +28,6 @@ try: from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_regkey_license_assignment import ApiParameters from ansible.modules.network.f5.bigiq_regkey_license_assignment import ModuleParameters from ansible.modules.network.f5.bigiq_regkey_license_assignment import ModuleManager from ansible.modules.network.f5.bigiq_regkey_license_assignment import ArgumentSpec diff --git a/test/units/modules/network/f5/test_bigiq_regkey_pool.py b/test/units/modules/network/f5/test_bigiq_regkey_pool.py index d81a0a17162..0d368e22f32 100644 --- a/test/units/modules/network/f5/test_bigiq_regkey_pool.py +++ b/test/units/modules/network/f5/test_bigiq_regkey_pool.py @@ -25,7 +25,6 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: @@ -37,7 +36,6 @@ except ImportError: # Ansible 2.8 imports from units.compat import unittest from units.compat.mock import Mock - from units.compat.mock import patch from units.modules.utils import set_module_args diff --git a/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py b/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py index 2a9070a2bb0..406c2771156 100644 --- a/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py +++ b/test/units/modules/network/f5/test_bigiq_utility_license_assignment.py @@ -17,7 +17,6 @@ if sys.version_info < (2, 7): from ansible.module_utils.basic import AnsibleModule try: - from library.modules.bigiq_utility_license_assignment import ApiParameters from library.modules.bigiq_utility_license_assignment import ModuleParameters from library.modules.bigiq_utility_license_assignment import ModuleManager from library.modules.bigiq_utility_license_assignment import ArgumentSpec @@ -25,11 +24,9 @@ try: # In Ansible 2.8, Ansible changed import paths. from test.units.compat import unittest from test.units.compat.mock import Mock - from test.units.compat.mock import patch from test.units.modules.utils import set_module_args except ImportError: - from ansible.modules.network.f5.bigiq_utility_license_assignment import ApiParameters from ansible.modules.network.f5.bigiq_utility_license_assignment import ModuleParameters from ansible.modules.network.f5.bigiq_utility_license_assignment import ModuleManager from ansible.modules.network.f5.bigiq_utility_license_assignment import ArgumentSpec @@ -37,7 +34,6 @@ except ImportError: # Ansible 2.8 imports from units.compat import unittest from units.compat.mock import Mock - from units.compat.mock import patch from units.modules.utils import set_module_args diff --git a/test/units/modules/network/fortios/test_fortios_switch_controller_switch_profile.py b/test/units/modules/network/fortios/test_fortios_switch_controller_switch_profile.py index b847ce2f2e4..5704b55d66c 100644 --- a/test/units/modules/network/fortios/test_fortios_switch_controller_switch_profile.py +++ b/test/units/modules/network/fortios/test_fortios_switch_controller_switch_profile.py @@ -17,8 +17,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import os -import json import pytest from mock import ANY from ansible.module_utils.network.fortios.fortios import FortiOSHandler diff --git a/test/units/modules/network/fortios/test_fortios_switch_controller_virtual_port_pool.py b/test/units/modules/network/fortios/test_fortios_switch_controller_virtual_port_pool.py index ffbc0c59a3b..175c27aa180 100644 --- a/test/units/modules/network/fortios/test_fortios_switch_controller_virtual_port_pool.py +++ b/test/units/modules/network/fortios/test_fortios_switch_controller_virtual_port_pool.py @@ -17,8 +17,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import os -import json import pytest from mock import ANY from ansible.module_utils.network.fortios.fortios import FortiOSHandler diff --git a/test/units/modules/network/fortios/test_fortios_switch_controller_vlan.py b/test/units/modules/network/fortios/test_fortios_switch_controller_vlan.py index 1085127362c..695e15a1010 100644 --- a/test/units/modules/network/fortios/test_fortios_switch_controller_vlan.py +++ b/test/units/modules/network/fortios/test_fortios_switch_controller_vlan.py @@ -17,8 +17,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import os -import json import pytest from mock import ANY from ansible.module_utils.network.fortios.fortios import FortiOSHandler diff --git a/test/units/modules/network/icx/test_icx_ping.py b/test/units/modules/network/icx/test_icx_ping.py index c997369330e..c9b99d8be1a 100644 --- a/test/units/modules/network/icx/test_icx_ping.py +++ b/test/units/modules/network/icx/test_icx_ping.py @@ -7,7 +7,6 @@ from units.compat.mock import patch from ansible.modules.network.icx import icx_ping from units.modules.utils import set_module_args from .icx_module import TestICXModule, load_fixture -import traceback class TestICXPingModule(TestICXModule): diff --git a/test/units/modules/network/netact/test_netact_cm_command.py b/test/units/modules/network/netact/test_netact_cm_command.py index 591a8b24c90..727b7109235 100644 --- a/test/units/modules/network/netact/test_netact_cm_command.py +++ b/test/units/modules/network/netact/test_netact_cm_command.py @@ -29,7 +29,6 @@ __metaclass__ = type from units.compat import unittest from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes from ansible.modules.network.netact import netact_cm_command from units.compat.mock import patch diff --git a/test/units/modules/network/netvisor/nvos_module.py b/test/units/modules/network/netvisor/nvos_module.py index 614d59440ac..5c2d635fd94 100644 --- a/test/units/modules/network/netvisor/nvos_module.py +++ b/test/units/modules/network/netvisor/nvos_module.py @@ -12,7 +12,6 @@ import tempfile from units.compat import unittest from units.compat.mock import patch from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') diff --git a/test/units/modules/network/nso/nso_module.py b/test/units/modules/network/nso/nso_module.py index ac3cf0a6575..72a28e02e6a 100644 --- a/test/units/modules/network/nso/nso_module.py +++ b/test/units/modules/network/nso/nso_module.py @@ -23,7 +23,6 @@ import json from units.compat import unittest from units.compat.mock import patch from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures') diff --git a/test/units/modules/packaging/os/test_redhat_subscription.py b/test/units/modules/packaging/os/test_redhat_subscription.py index 63e20572092..50c714b1e78 100644 --- a/test/units/modules/packaging/os/test_redhat_subscription.py +++ b/test/units/modules/packaging/os/test_redhat_subscription.py @@ -12,9 +12,6 @@ from ansible.modules.packaging.os import redhat_subscription import pytest -import os -import tempfile - TESTED_MODULE = redhat_subscription.__name__ diff --git a/test/units/modules/packaging/os/test_rhn_channel.py b/test/units/modules/packaging/os/test_rhn_channel.py index aea22e3f335..28ca99fa3a4 100644 --- a/test/units/modules/packaging/os/test_rhn_channel.py +++ b/test/units/modules/packaging/os/test_rhn_channel.py @@ -2,7 +2,6 @@ # Copyright (c) 2017 Pierre-Louis Bonicoli # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from itertools import product import json from ansible.modules.packaging.os import rhn_channel diff --git a/test/units/modules/remote_management/lxca/test_lxca_nodes.py b/test/units/modules/remote_management/lxca/test_lxca_nodes.py index a2ae2b6a82b..152967d5318 100644 --- a/test/units/modules/remote_management/lxca/test_lxca_nodes.py +++ b/test/units/modules/remote_management/lxca/test_lxca_nodes.py @@ -2,8 +2,6 @@ import json import pytest from units.compat import mock -from ansible.module_utils import basic -from ansible.module_utils._text import to_bytes from ansible.modules.remote_management.lxca import lxca_nodes from ansible.module_utils.remote_management.lxca.common import setup_conn from ansible.module_utils.remote_management.lxca.common import close_conn diff --git a/test/units/modules/remote_management/oneview/test_oneview_enclosure_facts.py b/test/units/modules/remote_management/oneview/test_oneview_enclosure_facts.py index 9504df3abae..0743f66c512 100644 --- a/test/units/modules/remote_management/oneview/test_oneview_enclosure_facts.py +++ b/test/units/modules/remote_management/oneview/test_oneview_enclosure_facts.py @@ -2,7 +2,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from units.compat import unittest -from oneview_module_loader import OneViewModuleBase from ansible.modules.remote_management.oneview.oneview_enclosure_facts import EnclosureFactsModule from hpe_test_utils import FactsParamsTestCase diff --git a/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group.py b/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group.py index b96a29faa3c..913828c1f42 100644 --- a/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group.py +++ b/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group.py @@ -4,7 +4,6 @@ from copy import deepcopy from units.compat import unittest, mock -from oneview_module_loader import OneViewModuleBase from ansible.modules.remote_management.oneview.oneview_logical_interconnect_group import LogicalInterconnectGroupModule from hpe_test_utils import OneViewBaseTestCase diff --git a/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group_facts.py b/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group_facts.py index 825aa537840..510ba19e8f5 100644 --- a/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group_facts.py +++ b/test/units/modules/remote_management/oneview/test_oneview_logical_interconnect_group_facts.py @@ -2,7 +2,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from units.compat import unittest -from oneview_module_loader import OneViewModuleBase from ansible.modules.remote_management.oneview.oneview_logical_interconnect_group_facts import LogicalInterconnectGroupFactsModule from hpe_test_utils import FactsParamsTestCase diff --git a/test/units/modules/storage/hpe3par/test_ss_3par_cpg.py b/test/units/modules/storage/hpe3par/test_ss_3par_cpg.py index 35c11fa3bfe..fa2844615ea 100644 --- a/test/units/modules/storage/hpe3par/test_ss_3par_cpg.py +++ b/test/units/modules/storage/hpe3par/test_ss_3par_cpg.py @@ -10,7 +10,6 @@ sys.modules['hpe3par_sdk.client'] = mock.Mock() sys.modules['hpe3parclient'] = mock.Mock() sys.modules['hpe3parclient.exceptions'] = mock.Mock() from ansible.modules.storage.hpe3par import ss_3par_cpg -from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.storage.hpe3par import hpe3par diff --git a/test/units/modules/storage/netapp/test_netapp_e_facts.py b/test/units/modules/storage/netapp/test_netapp_e_facts.py index 311f3de087c..0729e64a838 100644 --- a/test/units/modules/storage/netapp/test_netapp_e_facts.py +++ b/test/units/modules/storage/netapp/test_netapp_e_facts.py @@ -5,7 +5,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type from ansible.modules.storage.netapp.netapp_e_facts import Facts -from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args +from units.modules.utils import AnsibleFailJson, ModuleTestCase, set_module_args from units.compat import mock diff --git a/test/units/modules/storage/netapp/test_netapp_e_iscsi_interface.py b/test/units/modules/storage/netapp/test_netapp_e_iscsi_interface.py index 19afe881a82..dc7d353a1a1 100644 --- a/test/units/modules/storage/netapp/test_netapp_e_iscsi_interface.py +++ b/test/units/modules/storage/netapp/test_netapp_e_iscsi_interface.py @@ -1,18 +1,11 @@ # (c) 2018, NetApp Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from mock import MagicMock - -from ansible.module_utils import netapp -from ansible.modules.storage.netapp import netapp_e_host -from ansible.modules.storage.netapp.netapp_e_host import Host from ansible.modules.storage.netapp.netapp_e_iscsi_interface import IscsiInterface from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args __metaclass__ = type import mock -from units.compat.mock import patch -from ansible.module_utils._text import to_bytes class IscsiInterfaceTest(ModuleTestCase): diff --git a/test/units/modules/storage/netapp/test_netapp_e_iscsi_target.py b/test/units/modules/storage/netapp/test_netapp_e_iscsi_target.py index b46fe300b5a..9d800cfd131 100644 --- a/test/units/modules/storage/netapp/test_netapp_e_iscsi_target.py +++ b/test/units/modules/storage/netapp/test_netapp_e_iscsi_target.py @@ -2,8 +2,6 @@ # (c) 2018, NetApp Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from mock import MagicMock - from ansible.modules.storage.netapp.netapp_e_iscsi_target import IscsiTarget from units.modules.utils import AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/test/units/modules/storage/netapp/test_netapp_e_mgmt_interface.py b/test/units/modules/storage/netapp/test_netapp_e_mgmt_interface.py index e7b930713b1..7901dcee993 100644 --- a/test/units/modules/storage/netapp/test_netapp_e_mgmt_interface.py +++ b/test/units/modules/storage/netapp/test_netapp_e_mgmt_interface.py @@ -2,8 +2,6 @@ # (c) 2018, NetApp Inc. # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -from mock import MagicMock - from ansible.modules.storage.netapp.netapp_e_mgmt_interface import MgmtInterface from units.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase, set_module_args diff --git a/test/units/modules/storage/netapp/test_netapp_e_syslog.py b/test/units/modules/storage/netapp/test_netapp_e_syslog.py index ff8e3a96729..e71d4c6b5da 100644 --- a/test/units/modules/storage/netapp/test_netapp_e_syslog.py +++ b/test/units/modules/storage/netapp/test_netapp_e_syslog.py @@ -2,7 +2,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from ansible.modules.storage.netapp.netapp_e_syslog import Syslog -from ansible.module_utils.six.moves.urllib.error import HTTPError from units.modules.utils import AnsibleFailJson, ModuleTestCase, set_module_args __metaclass__ = type diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py index f94037e9115..ba5d9245fd5 100644 --- a/test/units/playbook/role/test_role.py +++ b/test/units/playbook/role/test_role.py @@ -25,7 +25,6 @@ from units.compat.mock import patch, MagicMock from ansible.errors import AnsibleError, AnsibleParserError from ansible.module_utils.common._collections_compat import Container from ansible.playbook.block import Block -from ansible.playbook.task import Task from units.mock.loader import DictDataLoader from units.mock.path import mock_unfrackpath_noop diff --git a/test/units/playbook/test_play.py b/test/units/playbook/test_play.py index d0848c236a4..7ca88b40b05 100644 --- a/test/units/playbook/test_play.py +++ b/test/units/playbook/test_play.py @@ -23,9 +23,7 @@ from units.compat import unittest from units.compat.mock import patch, MagicMock from ansible.errors import AnsibleParserError -from ansible.playbook.block import Block from ansible.playbook.play import Play -from ansible.playbook.role import Role from units.mock.loader import DictDataLoader from units.mock.path import mock_unfrackpath_noop diff --git a/test/units/playbook/test_playbook.py b/test/units/playbook/test_playbook.py index 5c5217e5cc7..3cd745a7d5a 100644 --- a/test/units/playbook/test_playbook.py +++ b/test/units/playbook/test_playbook.py @@ -20,7 +20,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from units.compat import unittest -from units.compat.mock import MagicMock from ansible.errors import AnsibleParserError from ansible.playbook import Playbook from ansible.vars.manager import VariableManager diff --git a/test/units/plugins/action/test_synchronize.py b/test/units/plugins/action/test_synchronize.py index 7fa1ece1f4c..7d40f7b70e2 100644 --- a/test/units/plugins/action/test_synchronize.py +++ b/test/units/plugins/action/test_synchronize.py @@ -15,8 +15,6 @@ import os import unittest import yaml -from pprint import pprint - import ansible.plugins from units.compat.mock import patch, MagicMock from ansible.plugins.action.synchronize import ActionModule diff --git a/test/units/plugins/connection/test_netconf.py b/test/units/plugins/connection/test_netconf.py index 0f4cc648e40..d4b0556dc89 100644 --- a/test/units/plugins/connection/test_netconf.py +++ b/test/units/plugins/connection/test_netconf.py @@ -23,11 +23,8 @@ __metaclass__ = type import sys import pytest -from io import StringIO - from units.compat import unittest from units.compat.mock import patch, MagicMock, PropertyMock -from ansible.errors import AnsibleConnectionFailure from ansible.playbook.play_context import PlayContext pytest.importorskip("ncclient") diff --git a/test/units/plugins/connection/test_network_cli.py b/test/units/plugins/connection/test_network_cli.py index 3761a67a4fb..103ee99a76d 100644 --- a/test/units/plugins/connection/test_network_cli.py +++ b/test/units/plugins/connection/test_network_cli.py @@ -23,8 +23,6 @@ __metaclass__ = type import re import json -from io import StringIO - from units.compat import unittest from units.compat.mock import patch, MagicMock diff --git a/test/units/plugins/connection/test_winrm.py b/test/units/plugins/connection/test_winrm.py index f59d75e707b..fd40a3f2f4b 100644 --- a/test/units/plugins/connection/test_winrm.py +++ b/test/units/plugins/connection/test_winrm.py @@ -10,7 +10,7 @@ import pytest from io import StringIO -from units.compat.mock import patch, MagicMock +from units.compat.mock import MagicMock from ansible.errors import AnsibleConnectionFailure from ansible.module_utils._text import to_bytes from ansible.playbook.play_context import PlayContext diff --git a/test/units/plugins/filter/test_ipaddr.py b/test/units/plugins/filter/test_ipaddr.py index e7dd89ab11f..6b7d7039543 100644 --- a/test/units/plugins/filter/test_ipaddr.py +++ b/test/units/plugins/filter/test_ipaddr.py @@ -22,7 +22,7 @@ import pytest from units.compat import unittest from ansible.errors import AnsibleFilterError -from ansible.plugins.filter.ipaddr import (ipaddr, _netmask_query, nthhost, next_nth_usable, ipsubnet, +from ansible.plugins.filter.ipaddr import (ipaddr, next_nth_usable, ipsubnet, previous_nth_usable, network_in_usable, network_in_network, cidr_merge, ipmath) netaddr = pytest.importorskip('netaddr') diff --git a/test/units/plugins/filter/test_network.py b/test/units/plugins/filter/test_network.py index 0b3fbd7138a..8f135ab9df9 100644 --- a/test/units/plugins/filter/test_network.py +++ b/test/units/plugins/filter/test_network.py @@ -26,8 +26,6 @@ from units.compat import unittest from ansible.plugins.filter.network import (HAS_PASSLIB, parse_xml, type5_pw, hash_salt, comp_type5, vlan_parser) -from ansible.errors import AnsibleFilterError - fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures', 'network') with open(os.path.join(fixture_path, 'show_vlans_xml_output.txt')) as f: diff --git a/test/units/plugins/httpapi/test_checkpoint.py b/test/units/plugins/httpapi/test_checkpoint.py index 7d4695487bc..93480b5f8ad 100644 --- a/test/units/plugins/httpapi/test_checkpoint.py +++ b/test/units/plugins/httpapi/test_checkpoint.py @@ -6,8 +6,6 @@ import json from ansible.module_utils.six.moves.urllib.error import HTTPError from units.compat import mock from units.compat import unittest -from units.compat.builtins import BUILTINS -from units.compat.mock import patch from ansible.errors import AnsibleConnectionFailure from ansible.module_utils.connection import ConnectionError diff --git a/test/units/plugins/lookup/test_aws_secret.py b/test/units/plugins/lookup/test_aws_secret.py index 3cee8c77fac..7748085d6e5 100644 --- a/test/units/plugins/lookup/test_aws_secret.py +++ b/test/units/plugins/lookup/test_aws_secret.py @@ -20,7 +20,6 @@ from __future__ import (absolute_import, division, print_function) import pytest import datetime -from copy import copy from ansible.errors import AnsibleError diff --git a/test/units/plugins/lookup/test_password.py b/test/units/plugins/lookup/test_password.py index 98921b948d8..f8fcfed7946 100644 --- a/test/units/plugins/lookup/test_password.py +++ b/test/units/plugins/lookup/test_password.py @@ -39,7 +39,6 @@ from ansible.module_utils.six.moves import builtins from ansible.module_utils._text import to_bytes from ansible.plugins.loader import PluginLoader from ansible.plugins.lookup import password -from ansible.utils import encrypt DEFAULT_CHARS = sorted([u'ascii_letters', u'digits', u".,:-_"]) diff --git a/test/units/plugins/strategy/test_strategy_base.py b/test/units/plugins/strategy/test_strategy_base.py index 578acaae361..ed318ee50ba 100644 --- a/test/units/plugins/strategy/test_strategy_base.py +++ b/test/units/plugins/strategy/test_strategy_base.py @@ -25,13 +25,11 @@ import uuid from units.compat import unittest from units.compat.mock import patch, MagicMock -from ansible.errors import AnsibleParserError 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 from ansible.plugins.strategy import StrategyBase diff --git a/test/units/plugins/terminal/test_slxos.py b/test/units/plugins/terminal/test_slxos.py index f1d9235b4e9..59879715e94 100644 --- a/test/units/plugins/terminal/test_slxos.py +++ b/test/units/plugins/terminal/test_slxos.py @@ -19,8 +19,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from os import path - from mock import MagicMock from units.compat import unittest diff --git a/test/units/template/test_safe_eval.py b/test/units/template/test_safe_eval.py index af308b052ce..8b62cb44771 100644 --- a/test/units/template/test_safe_eval.py +++ b/test/units/template/test_safe_eval.py @@ -23,7 +23,6 @@ import sys from collections import defaultdict from units.compat import unittest -from units.compat.mock import MagicMock from ansible.template.safe_eval import safe_eval