diff --git a/internal/server/concurrency_test.go b/internal/server/concurrency_test.go index 33d51d05..81aa2236 100644 --- a/internal/server/concurrency_test.go +++ b/internal/server/concurrency_test.go @@ -341,20 +341,23 @@ func TestRetryConflictsOnlyWithSameWorkspaceActiveRun(t *testing.T) { if err != nil || failed.Status != "failed" { t.Fatalf("original run did not fail as intended: %+v %v", failed, err) } - resolvedB, err := filepath.EvalSymlinks(b) + entered := make(chan struct{}, 4) + resolvedA, err := filepath.EvalSymlinks(a) if err != nil { t.Fatal(err) } - entered := make(chan struct{}, 4) - release := make(chan struct{}) + releaseA := make(chan struct{}) + releaseB := make(chan struct{}) r.execute = func(ctx context.Context, _ stage.Definition, input stage.Values) (stage.Result, error) { entered <- struct{}{} - if input["pwd"] == resolvedB { - select { - case <-release: - case <-ctx.Done(): - return stage.Result{}, ctx.Err() - } + release := releaseB + if input["pwd"] == resolvedA { + release = releaseA + } + select { + case <-release: + case <-ctx.Done(): + return stage.Result{}, ctx.Err() } return stage.Result{Outcome: "success", Output: stage.Values{}}, nil } @@ -366,6 +369,7 @@ func TestRetryConflictsOnlyWithSameWorkspaceActiveRun(t *testing.T) { if _, err := r.retry(protocol.Message{RunID: original.ID, RequestKey: "retry-a"}); err == nil || !strings.Contains(err.Error(), fmt.Sprintf("run %d is already active", activeA.ID)) || !strings.Contains(err.Error(), "different workspace") { t.Fatalf("retry did not conflict with same-workspace active run: %v", err) } + close(releaseA) // A different active workspace must not block the retry of the original. if _, err := r.start(protocol.Message{PipelineID: pipelineID, Version: 1, RequestKey: "active-b", Workspace: b, Input: map[string]any{"prompt": "task"}}); err != nil { t.Fatal(err) @@ -378,7 +382,7 @@ func TestRetryConflictsOnlyWithSameWorkspaceActiveRun(t *testing.T) { if retried.Workspace != failed.Workspace { t.Fatalf("retry did not reuse the original workspace: %q != %q", retried.Workspace, failed.Workspace) } - close(release) + close(releaseB) r.wg.Wait() }