eric/weatherreporter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Clean up comparison test workers

Browse Source
This commit is contained in:
Eric Rakestraw
2026-08-13 03:34:08 +00:00
parent 166c4ce53b
commit 57aa27c9de
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
internal/app/comparison_execution_test.go
View File

@@ -20,12 +20,9 @@ func TestExecuteComparisonProfilesRunsOrderedProfilesConcurrently(t *testing.T)
prepared, prompt := preparedDailyProfile(t) prepared, prompt := preparedDailyProfile(t)
profiles := comparisonProfiles(10) profiles := comparisonProfiles(10)
executor := newBarrierExecutor(profiles) executor := newBarrierExecutor(profiles)
results := make(chan comparisonExecutionResult, 1) results := startComparisonExecution(t, context.Background(), comparisonExecutionRequest{
go func() { Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
results <- executeComparisonProfiles(context.Background(), comparisonExecutionRequest{ }, executor)
Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
})
}()
waitForProfileStarts(t, executor, profiles, results) waitForProfileStarts(t, executor, profiles, results)
if executor.maximumInFlight() < 2 { if executor.maximumInFlight() < 2 {
t.Fatalf("maximum in-flight executions = %d, want overlap", executor.maximumInFlight()) t.Fatalf("maximum in-flight executions = %d, want overlap", executor.maximumInFlight())
@@ -58,12 +55,9 @@ func TestExecuteComparisonProfilesContinuesAfterProfileFailure(t *testing.T) {
profiles := comparisonProfiles(3) profiles := comparisonProfiles(3)
executor := newBarrierExecutor(profiles) executor := newBarrierExecutor(profiles)
executor.setError(profiles[1].ProfileID, errors.New("provider response body must not escape")) executor.setError(profiles[1].ProfileID, errors.New("provider response body must not escape"))
results := make(chan comparisonExecutionResult, 1) results := startComparisonExecution(t, context.Background(), comparisonExecutionRequest{
go func() { Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
results <- executeComparisonProfiles(context.Background(), comparisonExecutionRequest{ }, executor)
Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
})
}()
waitForProfileStarts(t, executor, profiles, results) waitForProfileStarts(t, executor, profiles, results)
for _, profile := range profiles { for _, profile := range profiles {
executor.release(profile.ProfileID) executor.release(profile.ProfileID)
@@ -84,12 +78,9 @@ func TestExecuteComparisonProfilesPropagatesCancellationAndJoins(t *testing.T) {
executor := newBarrierExecutor(profiles) executor := newBarrierExecutor(profiles)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
results := make(chan comparisonExecutionResult, 1) results := startComparisonExecution(t, ctx, comparisonExecutionRequest{
go func() { Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
results <- executeComparisonProfiles(ctx, comparisonExecutionRequest{ }, executor)
Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", Executor: executor,
})
}()
waitForProfileStarts(t, executor, profiles, results) waitForProfileStarts(t, executor, profiles, results)
cancel() cancel()
result := <-results result := <-results
@@ -114,12 +105,9 @@ func TestExecuteComparisonProfilesUsesDistinctDeterministicDebugReferences(t *te
t.Fatalf("NewPromptDebugWriter() error = %v", err) t.Fatalf("NewPromptDebugWriter() error = %v", err)
} }
executor := newBarrierExecutor(profiles) executor := newBarrierExecutor(profiles)
results := make(chan comparisonExecutionResult, 1) results := startComparisonExecution(t, context.Background(), comparisonExecutionRequest{
go func() { Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", DebugWriter: debugWriter, Executor: executor,
results <- executeComparisonProfiles(context.Background(), comparisonExecutionRequest{ }, executor)
Prepared: prepared, Inspection: comparisonInspection(prompt, profiles), ComparisonID: "comparison_daily", DebugWriter: debugWriter, Executor: executor,
})
}()
waitForProfileStarts(t, executor, profiles, results) waitForProfileStarts(t, executor, profiles, results)
for _, profile := range profiles { for _, profile := range profiles {
executor.release(profile.ProfileID) executor.release(profile.ProfileID)
@@ -254,9 +242,32 @@ func (e *barrierExecutor) inFlightCount() int {
return e.inFlight return e.inFlight
} }
const comparisonExecutionTestTimeout = 5 * time.Second
func startComparisonExecution(t *testing.T, ctx context.Context, request comparisonExecutionRequest, executor *barrierExecutor) <-chan comparisonExecutionResult {
t.Helper()
results := make(chan comparisonExecutionResult, 1)
finished := make(chan struct{})
t.Cleanup(func() {
executor.releaseAll()
timeout := time.NewTimer(comparisonExecutionTestTimeout)
defer timeout.Stop()
select {
case <-finished:
case <-timeout.C:
t.Error("comparison execution workers did not finish after release")
}
})
go func() {
defer close(finished)
results <- executeComparisonProfiles(ctx, request)
}()
return results
}
func waitForProfileStarts(t *testing.T, executor *barrierExecutor, profiles []ComparisonProfileInspection, results <-chan comparisonExecutionResult) { func waitForProfileStarts(t *testing.T, executor *barrierExecutor, profiles []ComparisonProfileInspection, results <-chan comparisonExecutionResult) {
t.Helper() t.Helper()
timeout := time.NewTimer(5 * time.Second) timeout := time.NewTimer(comparisonExecutionTestTimeout)
defer timeout.Stop() defer timeout.Stop()
seen := map[string]struct{}{} seen := map[string]struct{}{}
for range profiles { for range profiles {