Merge remote-tracking branch 'origin/main' into fix/web-app-prometheus/blackbox-targets/792

tests/unit/python/plugins/filter/test_dotenv_quote.py

@@ -68,7 +68,9 @@ class TestDotenvQuoteModeAware(unittest.TestCase):
     """
 
     def setUp(self):
-        env = jinja2.Environment(autoescape=False)  # noqa: S701 - test renders a .env value, not HTML
+        env = jinja2.Environment(
+            autoescape=jinja2.select_autoescape(default_for_string=False)
+        )
         env.filters["dotenv_quote"] = FilterModule().filters()["dotenv_quote"]
         self.env = env
 

tests/unit/python/plugins/lookup/test_alert_rule_roles.py

@@ -17,7 +17,6 @@ import unittest.mock as mock
 from pathlib import Path
 
 import plugins.lookup.alert_rule_roles as module
-from plugins.lookup.alert_rule_roles import LookupModule
 
 
 class _Templar:
@@ -29,7 +28,7 @@ class _Templar:
 
 
 def _make_lookup(vars_=None):
-    lm = LookupModule()
+    lm = module.LookupModule()
     lm._templar = _Templar(vars_ or {})
     lm._loader = mock.MagicMock()
     return lm

tests/unit/python/plugins/lookup/test_compose_volumes_realign.py

@@ -40,7 +40,9 @@ def _render(**answers) -> str:
     def _lookup(_plugin, _app, key):
         return values[key]
 
-    env = jinja2.Environment(autoescape=False)  # noqa: S701 - renders SQL, HTML escaping would corrupt the literals
+    env = jinja2.Environment(
+        autoescape=jinja2.select_autoescape(default_for_string=False)
+    )
     return env.from_string(read_text(str(_TEMPLATE))).render(
         lookup=_lookup, application_id="web-app-x"
     )

tests/unit/python/plugins/lookup/test_mcp_client_bearer.py

@@ -10,8 +10,7 @@ from __future__ import annotations
 
 import importlib.util
 import unittest
-from unittest import mock
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from ansible.errors import AnsibleError
 
@@ -40,7 +39,7 @@ class TestMcpClientBearerLookup(unittest.TestCase):
     def _run(self, terms, credential, role_credentials=None, users=None):
         lookup = self.mod.LookupModule()
         lookup._templar = _DummyTemplar()
-        lookup._loader = mock.MagicMock()
+        lookup._loader = MagicMock()
 
         class _StubConfig:
             def run(self, terms_, variables=None, **kwargs):

tests/unit/python/plugins/lookup/test_mcp_credential.py

@@ -9,8 +9,7 @@ from __future__ import annotations
 
 import importlib.util
 import unittest
-from unittest import mock
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 from ansible.errors import AnsibleError
 
@@ -39,7 +38,7 @@ class TestMcpCredentialLookup(unittest.TestCase):
     def _run(self, terms, owner="mcp-web-app-gitea", users=None):
         lookup = self.mod.LookupModule()
         lookup._templar = _DummyTemplar()
-        lookup._loader = mock.MagicMock()
+        lookup._loader = MagicMock()
 
         class _StubConfig:
             def run(self, terms_, variables=None, **kwargs):

tests/unit/python/plugins/lookup/test_redirect_uris.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import unittest
-from unittest import mock
+import unittest.mock as mock
 
 from ansible.errors import AnsibleError