From 449b91d489997226818e4055ae8e0cb502af3fac Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 12 Feb 2023 20:59:51 +0100 Subject: [PATCH] Remove unnecessary test imports. (#583) --- tests/unit/compat/builtins.py | 2 +- tests/unit/compat/mock.py | 6 +++--- tests/unit/plugins/connection/test_docker.py | 2 -- tests/unit/plugins/inventory/test_docker_containers.py | 8 -------- tests/unit/plugins/module_utils/_api/test_errors.py | 3 +-- tests/unit/plugins/module_utils/test__scramble.py | 1 - tests/unit/plugins/module_utils/test_copy.py | 1 - tests/unit/plugins/modules/test_docker_image.py | 5 +---- 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py index b0cc6186..d548601d 100644 --- a/tests/unit/compat/builtins.py +++ b/tests/unit/compat/builtins.py @@ -13,7 +13,7 @@ __metaclass__ = type # One unittest needs to import builtins via __import__() so we need to have # the string that represents it try: - import __builtin__ + import __builtin__ # noqa: F401, pylint: disable=unused-import except ImportError: BUILTINS = 'builtins' else: diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py index 515b94a3..6ef80a7c 100644 --- a/tests/unit/compat/mock.py +++ b/tests/unit/compat/mock.py @@ -9,7 +9,7 @@ __metaclass__ = type ''' Compat module for Python3.x's unittest.mock module ''' -import sys +import sys # noqa: F401, pylint: disable=unused-import # Python 2.7 @@ -20,11 +20,11 @@ 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 * + from unittest.mock import * # noqa: F401, pylint: disable=unused-import except ImportError: # Python 2 # pylint: disable=wildcard-import,unused-wildcard-import try: - from mock import * + from mock import * # noqa: F401, pylint: disable=unused-import except ImportError: print('You need the mock library installed on python2.x to run tests') diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index 682c3212..5ae6a8e1 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -7,13 +7,11 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from io import StringIO -import pytest from ansible_collections.community.docker.tests.unit.compat import mock from ansible_collections.community.docker.tests.unit.compat import unittest from ansible.errors import AnsibleError from ansible.playbook.play_context import PlayContext -from ansible_collections.community.docker.plugins.connection.docker import Connection as DockerConnection from ansible.plugins.loader import connection_loader diff --git a/tests/unit/plugins/inventory/test_docker_containers.py b/tests/unit/plugins/inventory/test_docker_containers.py index 74721bfe..ea16c0d9 100644 --- a/tests/unit/plugins/inventory/test_docker_containers.py +++ b/tests/unit/plugins/inventory/test_docker_containers.py @@ -6,17 +6,9 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import json -import textwrap - import pytest -from ansible_collections.community.docker.tests.unit.compat.mock import MagicMock - -from ansible import constants as C -from ansible.errors import AnsibleError from ansible.inventory.data import InventoryData -from ansible.inventory.manager import InventoryManager from ansible_collections.community.docker.plugins.inventory.docker_containers import InventoryModule diff --git a/tests/unit/plugins/module_utils/_api/test_errors.py b/tests/unit/plugins/module_utils/_api/test_errors.py index 96b5bd9e..2cc114ed 100644 --- a/tests/unit/plugins/module_utils/_api/test_errors.py +++ b/tests/unit/plugins/module_utils/_api/test_errors.py @@ -20,11 +20,10 @@ if sys.version_info < (2, 7): pytestmark = pytest.mark.skip('Python 2.6 is not supported') from ansible_collections.community.docker.plugins.module_utils._api.errors import ( - APIError, ContainerError, DockerException, + APIError, DockerException, create_unexpected_kwargs_error, create_api_error_from_http_exception, ) -from .fake_api import FAKE_CONTAINER_ID, FAKE_IMAGE_ID class APIErrorTest(unittest.TestCase): diff --git a/tests/unit/plugins/module_utils/test__scramble.py b/tests/unit/plugins/module_utils/test__scramble.py index 5718fe34..ff004306 100644 --- a/tests/unit/plugins/module_utils/test__scramble.py +++ b/tests/unit/plugins/module_utils/test__scramble.py @@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type import pytest -import tarfile from ansible_collections.community.docker.plugins.module_utils._scramble import ( scramble, diff --git a/tests/unit/plugins/module_utils/test_copy.py b/tests/unit/plugins/module_utils/test_copy.py index 4962cf73..3668573b 100644 --- a/tests/unit/plugins/module_utils/test_copy.py +++ b/tests/unit/plugins/module_utils/test_copy.py @@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type import pytest -import tarfile from ansible_collections.community.docker.plugins.module_utils.copy import ( _stream_generator_to_fileobj, diff --git a/tests/unit/plugins/modules/test_docker_image.py b/tests/unit/plugins/modules/test_docker_image.py index 7755c7cc..3401837f 100644 --- a/tests/unit/plugins/modules/test_docker_image.py +++ b/tests/unit/plugins/modules/test_docker_image.py @@ -9,10 +9,7 @@ import pytest from ansible_collections.community.docker.plugins.modules.docker_image import ImageManager -from ansible_collections.community.docker.plugins.module_utils.image_archive import ( - api_image_id, - ImageArchiveInvalidException -) +from ansible_collections.community.docker.plugins.module_utils.image_archive import api_image_id from ..test_support.docker_image_archive_stubbing import ( write_imitation_archive,