Skip to content

Add unit tests for osism/tasks/conductor/utils #2210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ideaship merged 1 commit into from
Apr 27, 2026
Merged

Add unit tests for osism/tasks/conductor/utils #2210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion osism/tasks/conductor/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import urllib3
import yaml

DELETE_SENTINEL = "DELETE"


def deep_compare(a, b, updates):
"""
Expand All @@ -31,7 +33,7 @@ def deep_compare(a, b, updates):

def deep_merge(a, b):
for key, value in b.items():
if value == "DELETE":
if value == DELETE_SENTINEL:
# NOTE: Use special string to remove keys
a.pop(key, None)
elif (
Expand Down
11 changes: 9 additions & 2 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,15 @@ class VaultLib:
def __init__(self, *args, **kwargs):
pass

def is_encrypted(self, *args, **kwargs):
return False
def is_encrypted(self, data, *args, **kwargs):
if isinstance(data, str):
data = data.encode("utf-8", errors="ignore")
return isinstance(data, (bytes, bytearray)) and bytes(data).startswith(
b"$ANSIBLE_VAULT"
)

def decrypt(self, *args, **kwargs):
return b""

class VaultSecret:
def __init__(self, *args, **kwargs):
Expand Down
Loading