Skip to content

test(file_utils): patch _UMASK directly with monkeypatch in umask tests #1105

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

Open
neverbiasu wants to merge 4 commits into
base: main
Choose a base branch
from
+10 −16
Open

test(file_utils): patch _UMASK directly with monkeypatch in umask tests #1105

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de0f291
test(file_utils): patch _UMASK directly instead of mutating process u…
neverbiasu Nov 4, 2026
79243dc
style: format test_file_utils with ruff
neverbiasu Nov 4, 2026
e1d6b5e
Merge branch 'main' into fix/issue-1071-test-umask-monkeypatch
neverbiasu Nov 6, 2026
41aad0f
Merge branch 'main' into fix/issue-1071-test-umask-monkeypatch
neverbiasu Nov 8, 2026
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
26 changes: 10 additions & 16 deletions tests/comfy_cli/test_file_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,12 @@ def test_atomic_write_text_preserves_existing_mode(tmp_path):


@pytest.mark.skipif(sys.platform == "win32", reason="POSIX file-mode semantics")
def test_atomic_write_text_new_file_uses_umask_default(tmp_path):
def test_atomic_write_text_new_file_uses_umask_default(tmp_path, monkeypatch):
# A new destination gets the umask-derived default, not mkstemp's hardcoded 0600.
old_umask = os.umask(0o022)
try:
target = tmp_path / "fresh.json"
atomic_write_text(target, "data")
assert stat.S_IMODE(os.stat(target).st_mode) == (0o666 & ~0o022)
finally:
os.umask(old_umask)
monkeypatch.setattr(file_utils, "_UMASK", 0o022)
target = tmp_path / "fresh.json"
atomic_write_text(target, "data")
assert stat.S_IMODE(os.stat(target).st_mode) == (0o666 & ~0o022)


def test_atomic_write_text_cleans_up_tmp_on_failure(tmp_path, monkeypatch):
Expand Down Expand Up @@ -303,16 +300,13 @@ def boom(src, dst):


@pytest.mark.skipif(sys.platform == "win32", reason="POSIX file-mode semantics")
def test_atomic_write_bytes_new_file_uses_umask_default(tmp_path):
def test_atomic_write_bytes_new_file_uses_umask_default(tmp_path, monkeypatch):
# The templates gallery cache relies on this: the old inline mkstemp left it
# at 0600, and the switch to the umask-derived default is intended.
old_umask = os.umask(0o022)
try:
target = tmp_path / "fresh.bin"
atomic_write_bytes(target, b"data")
assert stat.S_IMODE(os.stat(target).st_mode) == (0o666 & ~0o022)
finally:
os.umask(old_umask)
monkeypatch.setattr(file_utils, "_UMASK", 0o022)
target = tmp_path / "fresh.bin"
atomic_write_bytes(target, b"data")
assert stat.S_IMODE(os.stat(target).st_mode) == (0o666 & ~0o022)


# ---------------------------------------------------------------------------
Expand Down
Loading