Remove unnecessary test imports. (#583) (#584)

(cherry picked from commit 449b91d489)
This commit is contained in:
Felix Fontein 2023-02-12 21:29:50 +01:00 committed by GitHub
parent 808063ddcd
commit 8e99d0c4da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 16 deletions

View File

@ -26,7 +26,7 @@ __metaclass__ = type
# One unittest needs to import builtins via __import__() so we need to have # One unittest needs to import builtins via __import__() so we need to have
# the string that represents it # the string that represents it
try: try:
import __builtin__ import __builtin__ # noqa: F401, pylint: disable=unused-import
except ImportError: except ImportError:
BUILTINS = 'builtins' BUILTINS = 'builtins'
else: else:

View File

@ -22,7 +22,7 @@ __metaclass__ = type
''' '''
Compat module for Python3.x's unittest.mock module Compat module for Python3.x's unittest.mock module
''' '''
import sys import sys # noqa: F401, pylint: disable=unused-import
# Python 2.7 # Python 2.7
@ -33,12 +33,12 @@ try:
# Allow wildcard import because we really do want to import all of mock's # Allow wildcard import because we really do want to import all of mock's
# symbols into this compat shim # symbols into this compat shim
# pylint: disable=wildcard-import,unused-wildcard-import # pylint: disable=wildcard-import,unused-wildcard-import
from unittest.mock import * from unittest.mock import * # noqa: F401, pylint: disable=unused-import
except ImportError: except ImportError:
# Python 2 # Python 2
# pylint: disable=wildcard-import,unused-wildcard-import # pylint: disable=wildcard-import,unused-wildcard-import
try: try:
from mock import * from mock import * # noqa: F401, pylint: disable=unused-import
except ImportError: except ImportError:
print('You need the mock library installed on python2.x to run tests') print('You need the mock library installed on python2.x to run tests')

View File

@ -31,8 +31,8 @@ import sys
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
try: try:
# Need unittest2 on python2.6 # Need unittest2 on python2.6
from unittest2 import * from unittest2 import * # noqa: F401, pylint: disable=unused-import
except ImportError: except ImportError:
print('You need unittest2 installed on python2.6.x to run tests') print('You need unittest2 installed on python2.6.x to run tests')
else: else:
from unittest import * from unittest import * # noqa: F401, pylint: disable=unused-import

View File

@ -20,13 +20,11 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
from io import StringIO 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 mock
from ansible_collections.community.docker.tests.unit.compat import unittest from ansible_collections.community.docker.tests.unit.compat import unittest
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.playbook.play_context import PlayContext 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 from ansible.plugins.loader import connection_loader

View File

@ -5,17 +5,9 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
import json
import textwrap
import pytest 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.data import InventoryData
from ansible.inventory.manager import InventoryManager
from ansible_collections.community.docker.plugins.inventory.docker_containers import InventoryModule from ansible_collections.community.docker.plugins.inventory.docker_containers import InventoryModule