Skip to content

The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.

Fix test_base_path_changes leaking a reloaded cli_args singleton (#16053)

guill82db4037ce78
diff --git a/tests-unit/comfy_test/folder_path_test.py b/tests-unit/comfy_test/folder_path_test.py
index a0ef17a4c..d787dc635 100644
--- a/tests-unit/comfy_test/folder_path_test.py
+++ b/tests-unit/comfy_test/folder_path_test.py
@@ -1,6 +1,5 @@
### 🗻 This file is created through the spirit of Mount Fuji at its peak
# TODO(yoland): clean up this after I get back down
-import sys
import pytest
import os
import tempfile
@@ -9,8 +8,6 @@ from importlib import reload
import folder_paths
import comfy.cli_args
-from comfy.options import enable_args_parsing
-enable_args_parsing()
@pytest.fixture()
@@ -26,17 +23,13 @@ def temp_dir():
@pytest.fixture
-def set_base_dir():
+def set_base_dir(monkeypatch):
def _set_base_dir(base_dir):
- # Mock CLI args
- with patch.object(sys, 'argv', ["main.py", "--base-directory", base_dir]):
- reload(comfy.cli_args)
- reload(folder_paths)
- yield _set_base_dir
- # Reload the modules after each test to ensure isolation
- with patch.object(sys, 'argv', ["main.py"]):
- reload(comfy.cli_args)
+ monkeypatch.setattr(comfy.cli_args.args, "base_directory", base_dir)
reload(folder_paths)
+ yield _set_base_dir
+ monkeypatch.undo()
+ reload(folder_paths)
def test_get_directory_by_type(clear_folder_paths):
@@ -165,18 +158,15 @@ def test_base_path_change_clears_old(set_base_dir):
assert len(folder_paths.get_folder_paths(name)) == 2
-def test_models_directory_cli_and_getters(temp_dir):
+def test_models_directory_cli_and_getters(temp_dir, monkeypatch):
try:
- with patch.object(sys, 'argv', ["main.py", "--models-directory", temp_dir]):
- reload(comfy.cli_args)
- reload(folder_paths)
+ monkeypatch.setattr(comfy.cli_args.args, "models_directory", temp_dir)
+ reload(folder_paths)
assert folder_paths.models_dir == os.path.abspath(temp_dir)
with pytest.raises(Exception):
comfy.cli_args.is_valid_directory(os.path.join(temp_dir, "non_existent_folder_path"))
finally:
- with patch.object(sys, 'argv', ["main.py"]):
- reload(comfy.cli_args)
- reload(folder_paths)
-
+ monkeypatch.undo()
+ reload(folder_paths)