Reformat code with black and isort.

This commit is contained in:
Felix Fontein
2025-10-06 18:34:59 +02:00
parent f45232635c
commit d65d37e9e9
132 changed files with 17581 additions and 14729 deletions
+52 -45
View File
@@ -5,31 +5,34 @@
from __future__ import annotations
import pytest
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
make_untrusted as _make_untrusted,
make_trusted as _make_trusted,
is_trusted as _is_trusted,
SUPPORTS_DATA_TAGGING,
)
from ansible_collections.community.docker.plugins.plugin_utils.unsafe import (
make_unsafe,
)
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
SUPPORTS_DATA_TAGGING,
)
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
is_trusted as _is_trusted,
)
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
make_trusted as _make_trusted,
)
from ansible_collections.community.internal_test_tools.tests.unit.utils.trust import (
make_untrusted as _make_untrusted,
)
TEST_MAKE_UNSAFE = [
(
_make_trusted('text'),
_make_trusted("text"),
[],
[
(),
],
),
(
_make_trusted('{{text}}'),
_make_trusted("{{text}}"),
[
(),
],
@@ -37,59 +40,63 @@ TEST_MAKE_UNSAFE = [
),
(
{
_make_trusted('skey'): _make_trusted('value'),
_make_trusted('ukey'): _make_trusted('{{value}}'),
_make_trusted("skey"): _make_trusted("value"),
_make_trusted("ukey"): _make_trusted("{{value}}"),
1: [
_make_trusted('value'),
_make_trusted('{{value}}'),
_make_trusted("value"),
_make_trusted("{{value}}"),
{
1.0: _make_trusted('{{value}}'),
2.0: _make_trusted('value'),
1.0: _make_trusted("{{value}}"),
2.0: _make_trusted("value"),
},
],
},
[
('ukey', ),
("ukey",),
(1, 1),
(1, 2, 1.0),
],
[
('skey', ),
("skey",),
(1, 0),
(1, 2, 2.0),
],
),
(
[_make_trusted('value'), _make_trusted('{{value}}')],
[_make_trusted("value"), _make_trusted("{{value}}")],
[
(1, ),
(1,),
],
[
(0, ),
(0,),
],
),
]
if not SUPPORTS_DATA_TAGGING:
TEST_MAKE_UNSAFE.extend([
(
_make_trusted(b"text"),
[],
[
(),
],
),
(
_make_trusted(b"{{text}}"),
[
(),
],
[],
),
])
TEST_MAKE_UNSAFE.extend(
[
(
_make_trusted(b"text"),
[],
[
(),
],
),
(
_make_trusted(b"{{text}}"),
[
(),
],
[],
),
]
)
@pytest.mark.parametrize("value, check_unsafe_paths, check_safe_paths", TEST_MAKE_UNSAFE)
@pytest.mark.parametrize(
"value, check_unsafe_paths, check_safe_paths", TEST_MAKE_UNSAFE
)
def test_make_unsafe(value, check_unsafe_paths, check_safe_paths):
unsafe_value = make_unsafe(value)
assert unsafe_value == value
@@ -108,16 +115,16 @@ def test_make_unsafe(value, check_unsafe_paths, check_safe_paths):
def test_make_unsafe_idempotence():
assert make_unsafe(None) is None
unsafe_str = _make_untrusted('{{test}}')
unsafe_str = _make_untrusted("{{test}}")
assert id(make_unsafe(unsafe_str)) == id(unsafe_str)
safe_str = _make_trusted('{{test}}')
safe_str = _make_trusted("{{test}}")
assert id(make_unsafe(safe_str)) != id(safe_str)
def test_make_unsafe_dict_key():
value = {
_make_trusted('test'): 2,
_make_trusted("test"): 2,
}
if not SUPPORTS_DATA_TAGGING:
value[_make_trusted(b"test")] = 1
@@ -127,7 +134,7 @@ def test_make_unsafe_dict_key():
assert _is_trusted(obj)
value = {
_make_trusted('{{test}}'): 2,
_make_trusted("{{test}}"): 2,
}
if not SUPPORTS_DATA_TAGGING:
value[_make_trusted(b"{{test}}")] = 1
@@ -138,7 +145,7 @@ def test_make_unsafe_dict_key():
def test_make_unsafe_set():
value = set([_make_trusted('test')])
value = set([_make_trusted("test")])
if not SUPPORTS_DATA_TAGGING:
value.add(_make_trusted(b"test"))
unsafe_value = make_unsafe(value)
@@ -146,7 +153,7 @@ def test_make_unsafe_set():
for obj in unsafe_value:
assert _is_trusted(obj)
value = set([_make_trusted('{{test}}')])
value = set([_make_trusted("{{test}}")])
if not SUPPORTS_DATA_TAGGING:
value.add(_make_trusted(b"{{test}}"))
unsafe_value = make_unsafe(value)