Skip to content

fix(runs): make TestWatchActionUpdates_OnlyStreamsTargetAction deterministic #7231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SVilgelm merged 2 commits into from
Apr 17, 2026
+27 −9
Merged

fix(runs): make TestWatchActionUpdates_OnlyStreamsTargetAction deterministic #7231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b9a0ab
fix(runs): make TestWatchActionUpdates_OnlyStreamsTargetAction determ…
SVilgelm Apr 17, 2026
88eaa7e
fix(runs): replace sleep with deterministic subscriber check
SVilgelm Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions runs/repository/impl/action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,9 @@ func TestUpdateActionPhasePersistsAttemptsAndCacheStatus(t *testing.T) {
func TestWatchActionUpdates_OnlyStreamsTargetAction(t *testing.T) {
db := setupActionDB(t)
defer func() { db.Exec("DELETE FROM actions") }()
actionRepo, err := NewActionRepo(db, testDbConfig)
repo, err := NewActionRepo(db, testDbConfig)
require.NoError(t, err)
repoImpl := repo.(*actionRepo)

runID := &common.RunIdentifier{
Org: "org1",
Expand All @@ -133,21 +134,37 @@ func TestWatchActionUpdates_OnlyStreamsTargetAction(t *testing.T) {
otherActionID := &common.ActionIdentifier{Run: runID, Name: "other"}

ctx := context.Background()
_, err = actionRepo.CreateAction(ctx, models.NewActionModel(targetActionID), false)
require.NoError(t, err)
_, err = actionRepo.CreateAction(ctx, models.NewActionModel(otherActionID), false)
require.NoError(t, err)

// Start watcher before creating actions so we can deterministically
// drain the creation notification and avoid a race where the async
// NOTIFY arrives after the subscriber registers.
watchCtx, cancel := context.WithCancel(context.Background())
defer cancel()

updates := make(chan *models.Action, 2)
errs := make(chan error, 1)
go actionRepo.WatchActionUpdates(watchCtx, targetActionID, updates, errs)
go repo.WatchActionUpdates(watchCtx, targetActionID, updates, errs)

require.Eventually(t, func() bool {
repoImpl.mu.RLock()
defer repoImpl.mu.RUnlock()
return len(repoImpl.actionSubscribers) > 0
}, 2*time.Second, 10*time.Millisecond, "timed out waiting for watcher registration")

_, err = repo.CreateAction(ctx, models.NewActionModel(targetActionID), false)
require.NoError(t, err)
_, err = repo.CreateAction(ctx, models.NewActionModel(otherActionID), false)
require.NoError(t, err)

time.Sleep(1100 * time.Millisecond)
// Drain the creation notification for the target action.
select {
case <-updates:
case <-time.After(2 * time.Second):
t.Fatal("timed out waiting for creation notification")
}

err = actionRepo.UpdateActionPhase(ctx, otherActionID, common.ActionPhase_ACTION_PHASE_RUNNING, 1, core.CatalogCacheStatus_CACHE_DISABLED, nil)
// Update "other" — should NOT produce an update for "target".
err = repo.UpdateActionPhase(ctx, otherActionID, common.ActionPhase_ACTION_PHASE_RUNNING, 1, core.CatalogCacheStatus_CACHE_DISABLED, nil)
require.NoError(t, err)

select {
Expand All @@ -158,7 +175,8 @@ func TestWatchActionUpdates_OnlyStreamsTargetAction(t *testing.T) {
case <-time.After(1200 * time.Millisecond):
}

err = actionRepo.UpdateActionPhase(ctx, targetActionID, common.ActionPhase_ACTION_PHASE_RUNNING, 1, core.CatalogCacheStatus_CACHE_DISABLED, nil)
// Update "target" — should produce an update.
err = repo.UpdateActionPhase(ctx, targetActionID, common.ActionPhase_ACTION_PHASE_RUNNING, 1, core.CatalogCacheStatus_CACHE_DISABLED, nil)
require.NoError(t, err)

select {
Expand Down
Loading