From 8e99d0c4da2580541bef621381b7e4983afd7e9e Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 12 Feb 2023 21:29:50 +0100 Subject: [PATCH] Remove unnecessary test imports. (#583) (#584) (cherry picked from commit 449b91d489997226818e4055ae8e0cb502af3fac) --- tests/unit/compat/builtins.py | 2 +- tests/unit/compat/mock.py | 6 +++--- tests/unit/compat/unittest.py | 4 ++-- tests/unit/plugins/connection/test_docker.py | 2 -- tests/unit/plugins/inventory/test_docker_containers.py | 8 -------- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/tests/unit/compat/builtins.py b/tests/unit/compat/builtins.py index f60ee678..629bfad7 100644 --- a/tests/unit/compat/builtins.py +++ b/tests/unit/compat/builtins.py @@ -26,7 +26,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 0972cd2e..9963e5a8 100644 --- a/tests/unit/compat/mock.py +++ b/tests/unit/compat/mock.py @@ -22,7 +22,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 @@ -33,12 +33,12 @@ 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/compat/unittest.py b/tests/unit/compat/unittest.py index 98f08ad6..6d898cc6 100644 --- a/tests/unit/compat/unittest.py +++ b/tests/unit/compat/unittest.py @@ -31,8 +31,8 @@ import sys if sys.version_info < (2, 7): try: # Need unittest2 on python2.6 - from unittest2 import * + from unittest2 import * # noqa: F401, pylint: disable=unused-import except ImportError: print('You need unittest2 installed on python2.6.x to run tests') else: - from unittest import * + from unittest import * # noqa: F401, pylint: disable=unused-import diff --git a/tests/unit/plugins/connection/test_docker.py b/tests/unit/plugins/connection/test_docker.py index e811c824..f37f54d9 100644 --- a/tests/unit/plugins/connection/test_docker.py +++ b/tests/unit/plugins/connection/test_docker.py @@ -20,13 +20,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 b729d9bd..8ae399ce 100644 --- a/tests/unit/plugins/inventory/test_docker_containers.py +++ b/tests/unit/plugins/inventory/test_docker_containers.py @@ -5,17 +5,9 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -import json -import textwrap - import pytest -from 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