Unit tests: clean up compat imports (#10902)

Clean up compat imports.
This commit is contained in:
Felix Fontein
2025-10-11 10:03:37 +02:00
committed by GitHub
parent a8977afb04
commit 74b6a0294a
127 changed files with 237 additions and 212 deletions

View File

@@ -5,8 +5,8 @@
from __future__ import annotations
import re
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch
import unittest
from unittest.mock import patch
from ansible.errors import AnsibleError
from ansible.plugins.loader import lookup_loader

View File

@@ -4,10 +4,9 @@
from __future__ import annotations
import json
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch
import unittest
from unittest.mock import patch
from ansible.errors import AnsibleLookupError
from ansible.plugins.loader import lookup_loader

View File

@@ -5,12 +5,12 @@
# Make coding more python3-ish
from __future__ import annotations
from ansible.template import Templar
from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted
from unittest import TestCase
from ansible.plugins.loader import lookup_loader
from ansible.template import Templar
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import make_trusted
class TestLookupModule(TestCase):

View File

@@ -5,12 +5,12 @@
# Make coding more python3-ish
from __future__ import annotations
from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import (
from unittest import TestCase
from unittest.mock import (
patch,
MagicMock,
)
from ansible_collections.community.general.plugins.lookup import dsv
from ansible.plugins.loader import lookup_loader

View File

@@ -5,9 +5,9 @@
from __future__ import annotations
import unittest
from unittest.mock import patch, MagicMock
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch, MagicMock
from ansible_collections.community.general.plugins.lookup import etcd3
from ansible.plugins.loader import lookup_loader

View File

@@ -3,16 +3,17 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from __future__ import annotations
import json
import types
import sys
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import (
import json
import sys
import types
import unittest
from unittest.mock import (
patch,
MagicMock,
mock_open,
)
from ansible.plugins.loader import lookup_loader
ENCODE_RESULT = 'Foobar'

View File

@@ -5,10 +5,9 @@
# Make coding more python3-ish
from __future__ import annotations
import unittest
from argparse import ArgumentParser
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch
from unittest.mock import patch
from ansible.errors import AnsibleError
from ansible.plugins.loader import lookup_loader

View File

@@ -4,8 +4,9 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from __future__ import annotations
from ansible_collections.community.internal_test_tools.tests.unit.compat import unittest
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import patch
import unittest
from unittest.mock import patch
from ansible_collections.community.internal_test_tools.tests.unit.mock.loader import DictDataLoader
from ansible.plugins import AnsiblePlugin

View File

@@ -3,12 +3,12 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from __future__ import annotations
from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import (
from unittest import TestCase
from unittest.mock import (
patch,
MagicMock,
)
from ansible_collections.community.general.plugins.lookup import revbitspss
from ansible.plugins.loader import lookup_loader

View File

@@ -5,13 +5,13 @@
# Make coding more python3-ish
from __future__ import annotations
from ansible_collections.community.internal_test_tools.tests.unit.compat.unittest import TestCase
from ansible_collections.community.internal_test_tools.tests.unit.compat.mock import (
from unittest import TestCase
from unittest.mock import (
patch,
DEFAULT,
MagicMock,
)
from ansible_collections.community.general.plugins.lookup import tss
from ansible.plugins.loader import lookup_loader