electron-rare/Aperant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: correct MergeOrchestrator mock patch path in test_workspace_commands

Browse Source 
MergeOrchestrator is imported as `from merge import MergeOrchestrator`
inside _detect_parallel_task_conflicts(), so the correct patch path
is `merge.MergeOrchestrator`, not `cli.workspace_commands.MergeOrchestrator`.

This fixes AttributeError in TestDetectParallelTaskConflicts tests.
This commit is contained in:
StillKnotKnown
2026-02-09 12:31:36 +02:00
parent de38364fcb
commit d445342055
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/cli/test_workspace_commands.py
+4 -4
View File
@@ -320,7 +320,7 @@ class TestDetectParallelTaskConflicts:
project_dir.mkdir()
with patch(
"cli.workspace_commands.MergeOrchestrator"
"merge.MergeOrchestrator"
) as mock_orchestrator_class:
mock_orchestrator = MagicMock()
mock_orchestrator_class.return_value = mock_orchestrator
@@ -339,7 +339,7 @@ class TestDetectParallelTaskConflicts:
project_dir.mkdir()
with patch(
"cli.workspace_commands.MergeOrchestrator"
"merge.MergeOrchestrator"
) as mock_orchestrator_class:
mock_orchestrator = MagicMock()
mock_orchestrator_class.return_value = mock_orchestrator
@@ -367,7 +367,7 @@ class TestDetectParallelTaskConflicts:
project_dir.mkdir()
with patch(
"cli.workspace_commands.MergeOrchestrator"
"merge.MergeOrchestrator"
) as mock_orchestrator_class:
mock_orchestrator = MagicMock()
mock_orchestrator_class.return_value = mock_orchestrator
@@ -393,7 +393,7 @@ class TestDetectParallelTaskConflicts:
project_dir.mkdir()
with patch(
"cli.workspace_commands.MergeOrchestrator",
"merge.MergeOrchestrator",
side_effect=Exception("Merge orchestrator failed"),
):
result = _detect_parallel_task_conflicts(