From d445342055c58d89228c119677fa65d1c6845c19 Mon Sep 17 00:00:00 2001 From: StillKnotKnown Date: Thu, 5 Feb 2026 16:02:44 +0200 Subject: [PATCH] fix: correct MergeOrchestrator mock patch path in test_workspace_commands 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. --- tests/cli/test_workspace_commands.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/cli/test_workspace_commands.py b/tests/cli/test_workspace_commands.py index 93bd0d9a..91283988 100644 --- a/tests/cli/test_workspace_commands.py +++ b/tests/cli/test_workspace_commands.py @@ -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(