From 4e8df9a4b85ac485cad961d9196a4993c01151e0 Mon Sep 17 00:00:00 2001
From: Andrey Klychkov <aaklychkov@mail.ru>
Date: Fri, 26 Jul 2019 17:53:31 +0300
Subject: [PATCH] unit tests: remove unused imports (#59636)
---
test/units/cli/test_galaxy.py | 3 +--
test/units/executor/test_play_iterator.py | 2 --
test/units/executor/test_task_executor.py | 3 +--
test/units/executor/test_task_queue_manager_callbacks.py | 1 -
test/units/module_utils/basic/test_argument_spec.py | 5 ++---
test/units/module_utils/basic/test_imports.py | 2 +-
test/units/module_utils/basic/test_platform_distribution.py | 2 --
test/units/module_utils/facts/network/test_fc_wwn.py | 2 +-
.../module_utils/facts/network/test_iscsi_get_initiator.py | 2 +-
test/units/module_utils/gcp/test_auth.py | 3 +--
test/units/module_utils/gcp/test_utils.py | 2 --
.../module_utils/json_utils/test_filter_non_json_lines.py | 2 --
test/units/module_utils/net_tools/nios/test_api.py | 1 -
test/units/module_utils/network/nos/test_nos.py | 1 -
test/units/module_utils/network/slxos/test_slxos.py | 1 -
test/units/module_utils/test_known_hosts.py | 3 ---
16 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/test/units/cli/test_galaxy.py b/test/units/cli/test_galaxy.py
index c1ceb422ee0..c63dc3e21fc 100644
--- a/test/units/cli/test_galaxy.py
+++ b/test/units/cli/test_galaxy.py
@@ -31,13 +31,12 @@ import yaml
import ansible.constants as C
from ansible import context
-from ansible.cli.arguments import option_helpers as opt_help
from ansible.cli.galaxy import GalaxyCLI
from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text
from ansible.utils import context_objects as co
from units.compat import unittest
-from units.compat.mock import call, patch, MagicMock
+from units.compat.mock import patch, MagicMock
@pytest.fixture(autouse='function')
diff --git a/test/units/executor/test_play_iterator.py b/test/units/executor/test_play_iterator.py
index 496d78b82f6..4b4205f1197 100644
--- a/test/units/executor/test_play_iterator.py
+++ b/test/units/executor/test_play_iterator.py
@@ -22,10 +22,8 @@ __metaclass__ = type
from units.compat import unittest
from units.compat.mock import patch, MagicMock
-from ansible.errors import AnsibleError, AnsibleParserError
from ansible.executor.play_iterator import HostState, PlayIterator
from ansible.playbook import Playbook
-from ansible.playbook.task import Task
from ansible.playbook.play_context import PlayContext
from units.mock.loader import DictDataLoader
diff --git a/test/units/executor/test_task_executor.py b/test/units/executor/test_task_executor.py
index a02e9f0a41d..6d44d7685da 100644
--- a/test/units/executor/test_task_executor.py
+++ b/test/units/executor/test_task_executor.py
@@ -21,9 +21,8 @@ __metaclass__ = type
from units.compat import unittest
from units.compat.mock import patch, MagicMock
-from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.errors import AnsibleError
from ansible.executor.task_executor import TaskExecutor, remove_omit
-from ansible.playbook.play_context import PlayContext
from ansible.plugins.loader import action_loader, lookup_loader
from ansible.parsing.yaml.objects import AnsibleUnicode
diff --git a/test/units/executor/test_task_queue_manager_callbacks.py b/test/units/executor/test_task_queue_manager_callbacks.py
index b23c9580de0..6c0ceee0ecd 100644
--- a/test/units/executor/test_task_queue_manager_callbacks.py
+++ b/test/units/executor/test_task_queue_manager_callbacks.py
@@ -21,7 +21,6 @@ from __future__ import (absolute_import, division, print_function)
from units.compat import unittest
from units.compat.mock import MagicMock
-from ansible import context
from ansible.executor.task_queue_manager import TaskQueueManager
from ansible.playbook import Playbook
from ansible.plugins.callback import CallbackBase
diff --git a/test/units/module_utils/basic/test_argument_spec.py b/test/units/module_utils/basic/test_argument_spec.py
index c081ff2f62b..d51d579a1fe 100644
--- a/test/units/module_utils/basic/test_argument_spec.py
+++ b/test/units/module_utils/basic/test_argument_spec.py
@@ -12,12 +12,11 @@ import os
import pytest
-from units.compat.mock import MagicMock, patch
+from units.compat.mock import MagicMock
from ansible.module_utils import basic
-from ansible.module_utils.six import string_types, integer_types
+from ansible.module_utils.six import integer_types
from ansible.module_utils.six.moves import builtins
-from units.mock.procenv import ModuleTestCase, swap_stdin_and_argv
MOCK_VALIDATOR_FAIL = MagicMock(side_effect=TypeError("bad conversion"))
# Data is argspec, argument, expected
diff --git a/test/units/module_utils/basic/test_imports.py b/test/units/module_utils/basic/test_imports.py
index 011326e18a7..9d8ae68dd3e 100644
--- a/test/units/module_utils/basic/test_imports.py
+++ b/test/units/module_utils/basic/test_imports.py
@@ -12,7 +12,7 @@ import sys
from units.mock.procenv import ModuleTestCase
from units.compat import unittest
-from units.compat.mock import patch, MagicMock
+from units.compat.mock import patch
from ansible.module_utils.six.moves import builtins
realimport = builtins.__import__
diff --git a/test/units/module_utils/basic/test_platform_distribution.py b/test/units/module_utils/basic/test_platform_distribution.py
index 5a80fa71470..a59386b2d26 100644
--- a/test/units/module_utils/basic/test_platform_distribution.py
+++ b/test/units/module_utils/basic/test_platform_distribution.py
@@ -9,8 +9,6 @@ __metaclass__ = type
import pytest
-from units.mock.procenv import ModuleTestCase
-
from units.compat.mock import patch
from ansible.module_utils.six.moves import builtins
diff --git a/test/units/module_utils/facts/network/test_fc_wwn.py b/test/units/module_utils/facts/network/test_fc_wwn.py
index d058a6d4728..b98ae3789e6 100644
--- a/test/units/module_utils/facts/network/test_fc_wwn.py
+++ b/test/units/module_utils/facts/network/test_fc_wwn.py
@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type
from ansible.module_utils.facts.network import fc_wwn
-from units.compat.mock import Mock, patch
+from units.compat.mock import Mock
# AIX lsdev
diff --git a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py
index 9b668022cb2..2048ba2a000 100644
--- a/test/units/module_utils/facts/network/test_iscsi_get_initiator.py
+++ b/test/units/module_utils/facts/network/test_iscsi_get_initiator.py
@@ -6,7 +6,7 @@ from __future__ import absolute_import, division, print_function
__metaclass__ = type
from ansible.module_utils.facts.network import iscsi
-from units.compat.mock import Mock, patch
+from units.compat.mock import Mock
# AIX # lsattr -E -l iscsi0
diff --git a/test/units/module_utils/gcp/test_auth.py b/test/units/module_utils/gcp/test_auth.py
index b158d81ca3f..ee834a8ef04 100644
--- a/test/units/module_utils/gcp/test_auth.py
+++ b/test/units/module_utils/gcp/test_auth.py
@@ -16,7 +16,6 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import os
-import sys
import pytest
@@ -95,7 +94,7 @@ class GCPAuthTestCase(unittest.TestCase):
# of this function
module = FakeModule()
with mock.patch("ansible.module_utils.gcp.open",
- mock.mock_open(read_data='foobar'), create=True) as m:
+ mock.mock_open(read_data='foobar'), create=True):
# pem condition, warning is suppressed with the return_value
credentials_file = '/foopath/pem.pem'
with self.assertRaises(ValueError):
diff --git a/test/units/module_utils/gcp/test_utils.py b/test/units/module_utils/gcp/test_utils.py
index 46cb39d02f3..454a81a5d2f 100644
--- a/test/units/module_utils/gcp/test_utils.py
+++ b/test/units/module_utils/gcp/test_utils.py
@@ -15,8 +15,6 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
-import os
-import sys
from units.compat import mock, unittest
from ansible.module_utils.gcp import check_min_pkg_version, GCPUtils, GCPInvalidURLError
diff --git a/test/units/module_utils/json_utils/test_filter_non_json_lines.py b/test/units/module_utils/json_utils/test_filter_non_json_lines.py
index 9d6e3657e7a..eca4d7d2efd 100644
--- a/test/units/module_utils/json_utils/test_filter_non_json_lines.py
+++ b/test/units/module_utils/json_utils/test_filter_non_json_lines.py
@@ -20,8 +20,6 @@
from __future__ import (absolute_import, division)
__metaclass__ = type
-import json
-
from units.compat import unittest
from ansible.module_utils.json_utils import _filter_non_json_lines
diff --git a/test/units/module_utils/net_tools/nios/test_api.py b/test/units/module_utils/net_tools/nios/test_api.py
index bbedf5442f9..688da86b4ac 100644
--- a/test/units/module_utils/net_tools/nios/test_api.py
+++ b/test/units/module_utils/net_tools/nios/test_api.py
@@ -4,7 +4,6 @@
from __future__ import absolute_import, division, print_function
__metaclass__ = type
-import sys
import copy
from units.compat import unittest
diff --git a/test/units/module_utils/network/nos/test_nos.py b/test/units/module_utils/network/nos/test_nos.py
index f1bff7684fd..9a0ee28e478 100644
--- a/test/units/module_utils/network/nos/test_nos.py
+++ b/test/units/module_utils/network/nos/test_nos.py
@@ -19,7 +19,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from os import path
import json
from mock import MagicMock, patch, call
diff --git a/test/units/module_utils/network/slxos/test_slxos.py b/test/units/module_utils/network/slxos/test_slxos.py
index ab00a415b5a..3bb807ce99e 100644
--- a/test/units/module_utils/network/slxos/test_slxos.py
+++ b/test/units/module_utils/network/slxos/test_slxos.py
@@ -19,7 +19,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-from os import path
import json
from mock import MagicMock, patch, call
diff --git a/test/units/module_utils/test_known_hosts.py b/test/units/module_utils/test_known_hosts.py
index ba5869d3d5b..04ace4268e5 100644
--- a/test/units/module_utils/test_known_hosts.py
+++ b/test/units/module_utils/test_known_hosts.py
@@ -6,9 +6,6 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
-import json
-import os.path
-
import pytest
from ansible.module_utils import known_hosts