ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 20:08:41 +00:00
Code Packages Projects Releases Wiki Activity

Avoid Python 2 compat (conditional) imports. (#1167)

Browse Source
This commit is contained in:
Felix Fontein 2025-10-13 22:31:59 +02:00 committed by GitHub
parent 6f9ebc3f14
commit 597162b153
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/plugins/connection/test_docker.py
View File

@ -4,15 +4,13 @@
from __future__ import annotations from __future__ import annotations
import unittest
from io import StringIO from io import StringIO
from unittest import mock
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.plugins.loader import connection_loader from ansible.plugins.loader import connection_loader
from ansible_collections.community.internal_test_tools.tests.unit.compat import (
mock,
unittest,
)
class TestDockerConnectionClass(unittest.TestCase): class TestDockerConnectionClass(unittest.TestCase):

5
tests/unit/plugins/inventory/test_docker_containers.py
View File

@ -4,13 +4,12 @@
from __future__ import annotations from __future__ import annotations
from unittest.mock import create_autospec
import pytest import pytest
from ansible.inventory.data import InventoryData from ansible.inventory.data import InventoryData
from ansible.parsing.dataloader import DataLoader from ansible.parsing.dataloader import DataLoader
from ansible.template import Templar from ansible.template import Templar
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import (
create_autospec,
)
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import ( from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
make_trusted, make_trusted,
) )

7
tests/unit/plugins/module_utils/_api/api/test_client.py
View File

@ -22,6 +22,7 @@ import time
import unittest import unittest
from http.server import BaseHTTPRequestHandler from http.server import BaseHTTPRequestHandler
from socketserver import ThreadingTCPServer from socketserver import ThreadingTCPServer
from unittest import mock
import pytest import pytest
import requests import requests
@ -41,12 +42,6 @@ from ansible_collections.community.docker.tests.unit.plugins.module_utils._api.c
from .. import fake_api from .. import fake_api
try:
from unittest import mock
except ImportError:
import mock
DEFAULT_TIMEOUT_SECONDS = constants.DEFAULT_TIMEOUT_SECONDS DEFAULT_TIMEOUT_SECONDS = constants.DEFAULT_TIMEOUT_SECONDS

7
tests/unit/plugins/module_utils/_api/test_auth.py
View File

@ -16,6 +16,7 @@ import random
import shutil import shutil
import tempfile import tempfile
import unittest import unittest
from unittest import mock
import pytest import pytest
@ -28,12 +29,6 @@ from ansible_collections.community.docker.plugins.module_utils._api.credentials.
) )
try:
from unittest import mock
except ImportError:
import mock
class RegressionTest(unittest.TestCase): class RegressionTest(unittest.TestCase):
def test_803_urlsafe_encode(self): def test_803_urlsafe_encode(self):
auth_data = {"username": "root", "password": "GR?XGR?XGR?XGR?X"} auth_data = {"username": "root", "password": "GR?XGR?XGR?XGR?X"}

8
tests/unit/plugins/module_utils/_api/transport/test_ssladapter.py
View File

@ -9,6 +9,7 @@
from __future__ import annotations from __future__ import annotations
import unittest import unittest
from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1
import pytest import pytest
@ -24,13 +25,6 @@ except ImportError:
else: else:
HAS_MATCH_HOSTNAME = True # pylint: disable=invalid-name HAS_MATCH_HOSTNAME = True # pylint: disable=invalid-name
try:
from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1
except ImportError:
OP_NO_SSLv2 = 0x1000000
OP_NO_SSLv3 = 0x2000000
OP_NO_TLSv1 = 0x4000000
class SSLAdapterTest(unittest.TestCase): class SSLAdapterTest(unittest.TestCase):
def test_only_uses_tls(self): def test_only_uses_tls(self):

7
tests/unit/plugins/module_utils/_api/utils/test_config.py
View File

@ -14,18 +14,13 @@ import shutil
import tempfile import tempfile
import typing as t import typing as t
import unittest import unittest
from unittest import mock
from pytest import fixture, mark from pytest import fixture, mark
from ansible_collections.community.docker.plugins.module_utils._api.utils import config from ansible_collections.community.docker.plugins.module_utils._api.utils import config
try:
from unittest import mock
except ImportError:
import mock
class FindConfigFileTest(unittest.TestCase): class FindConfigFileTest(unittest.TestCase):
mkdir: t.Callable[[str], os.PathLike[str]] mkdir: t.Callable[[str], os.PathLike[str]]