Skip to content

fix(agent/agentcontainers): fix TestAPI/IgnoreCustomization flake #18863

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
merged 3 commits into from
Jul 15, 2025
Merged

fix(agent/agentcontainers): fix TestAPI/IgnoreCustomization flake #18863

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af13572
fix(agent/agentcontainers): resolve flake
DanielleMaywood Jul 14, 2025
cd45e06
chore: we have eventually
DanielleMaywood Jul 14, 2025
d99373f
fix: thanks copilot
DanielleMaywood Jul 14, 2025
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
Next Next commit
fix(agent/agentcontainers): resolve flake
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Jul 14, 2025
commit af135725ce1680a8c5870c671eb23e00ca1f43bd
34 changes: 30 additions & 4 deletions agent/agentcontainers/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2883,8 +2883,21 @@ func TestAPI(t *testing.T) {
Op: fsnotify.Write,
})

err = api.RefreshContainers(ctx)
require.NoError(t, err)
// Retry RefreshContainers until subagent injection succeeds
// This handles the race condition where the watcher loop may not have
// finished processing the config change yet
var subAgentCreated bool
for i := 0; i < 10; i++ {
err = api.RefreshContainers(ctx)
require.NoError(t, err)

if len(fakeSAC.created) > 0 {
subAgentCreated = true
break
}
time.Sleep(10 * time.Millisecond)
}
require.True(t, subAgentCreated, "subagent should be created after config change")

t.Log("Phase 2: Cont, waiting for sub agent to exit")
exitSubAgentOnce.Do(func() {
Expand Down Expand Up @@ -2919,8 +2932,21 @@ func TestAPI(t *testing.T) {
Op: fsnotify.Write,
})

err = api.RefreshContainers(ctx)
require.NoError(t, err)
// Retry RefreshContainers until subagent injection succeeds
// This handles the race condition where the watcher loop may not have
// finished processing the config change yet
subAgentCreated = false
for i := 0; i < 10; i++ {
err = api.RefreshContainers(ctx)
require.NoError(t, err)

if len(fakeSAC.created) > 0 {
subAgentCreated = true
break
}
time.Sleep(10 * time.Millisecond)
}
require.True(t, subAgentCreated, "subagent should be created after config change")

req = httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
rec = httptest.NewRecorder()
Expand Down