mirror of
https://github.com/ansible-collections/community.docker.git
synced 2026-03-15 19:58:28 +00:00
Remove unnecessary test imports. (#583)
This commit is contained in:
parent
983b2b4783
commit
449b91d489
@ -13,7 +13,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:
|
||||||
|
|||||||
@ -9,7 +9,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
|
||||||
|
|
||||||
@ -20,11 +20,11 @@ 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')
|
||||||
|
|||||||
@ -7,13 +7,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
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,17 +6,9 @@ from __future__ import (absolute_import, division, print_function)
|
|||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
|
|
||||||
import json
|
|
||||||
import textwrap
|
|
||||||
|
|
||||||
import pytest
|
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.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
|
||||||
|
|
||||||
|
|||||||
@ -20,11 +20,10 @@ if sys.version_info < (2, 7):
|
|||||||
pytestmark = pytest.mark.skip('Python 2.6 is not supported')
|
pytestmark = pytest.mark.skip('Python 2.6 is not supported')
|
||||||
|
|
||||||
from ansible_collections.community.docker.plugins.module_utils._api.errors import (
|
from ansible_collections.community.docker.plugins.module_utils._api.errors import (
|
||||||
APIError, ContainerError, DockerException,
|
APIError, DockerException,
|
||||||
create_unexpected_kwargs_error,
|
create_unexpected_kwargs_error,
|
||||||
create_api_error_from_http_exception,
|
create_api_error_from_http_exception,
|
||||||
)
|
)
|
||||||
from .fake_api import FAKE_CONTAINER_ID, FAKE_IMAGE_ID
|
|
||||||
|
|
||||||
|
|
||||||
class APIErrorTest(unittest.TestCase):
|
class APIErrorTest(unittest.TestCase):
|
||||||
|
|||||||
@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
|
|||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import tarfile
|
|
||||||
|
|
||||||
from ansible_collections.community.docker.plugins.module_utils._scramble import (
|
from ansible_collections.community.docker.plugins.module_utils._scramble import (
|
||||||
scramble,
|
scramble,
|
||||||
|
|||||||
@ -6,7 +6,6 @@ from __future__ import (absolute_import, division, print_function)
|
|||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import tarfile
|
|
||||||
|
|
||||||
from ansible_collections.community.docker.plugins.module_utils.copy import (
|
from ansible_collections.community.docker.plugins.module_utils.copy import (
|
||||||
_stream_generator_to_fileobj,
|
_stream_generator_to_fileobj,
|
||||||
|
|||||||
@ -9,10 +9,7 @@ import pytest
|
|||||||
|
|
||||||
from ansible_collections.community.docker.plugins.modules.docker_image import ImageManager
|
from ansible_collections.community.docker.plugins.modules.docker_image import ImageManager
|
||||||
|
|
||||||
from ansible_collections.community.docker.plugins.module_utils.image_archive import (
|
from ansible_collections.community.docker.plugins.module_utils.image_archive import api_image_id
|
||||||
api_image_id,
|
|
||||||
ImageArchiveInvalidException
|
|
||||||
)
|
|
||||||
|
|
||||||
from ..test_support.docker_image_archive_stubbing import (
|
from ..test_support.docker_image_archive_stubbing import (
|
||||||
write_imitation_archive,
|
write_imitation_archive,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user