From 4ca69af8679a0241c0126647f825590250a86be4 Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Fri, 15 Aug 2025 19:11:19 +0100 Subject: [PATCH] fix: increase timeout for watch workspace agent devcontainers test (#19376) --- coderd/workspaceagents_test.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 948123598d..a11efebc9e 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -1579,10 +1579,12 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) { t.Parallel() var ( - ctx = testutil.Context(t, testutil.WaitShort) - logger = slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug) - mCtrl = gomock.NewController(t) - mCCLI = acmock.NewMockContainerCLI(mCtrl) + ctx = testutil.Context(t, testutil.WaitLong) + logger = slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug) + mClock = quartz.NewMock(t) + updaterTickerTrap = mClock.Trap().TickerFunc("updaterLoop") + mCtrl = gomock.NewController(t) + mCCLI = acmock.NewMockContainerCLI(mCtrl) client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{Logger: &logger}) user = coderdtest.CreateFirstUser(t, client) @@ -1621,6 +1623,7 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) { o.Logger = logger.Named("agent") o.Devcontainers = true o.DevcontainerAPIOptions = []agentcontainers.Option{ + agentcontainers.WithClock(mClock), agentcontainers.WithContainerCLI(mCCLI), agentcontainers.WithWatcher(watcher.NewNoop()), } @@ -1631,6 +1634,9 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) { require.Len(t, resources[0].Agents, 1, "expected one agent") agentID := resources[0].Agents[0].ID + updaterTickerTrap.MustWait(ctx).MustRelease(ctx) + defer updaterTickerTrap.Close() + containers, closer, err := client.WatchWorkspaceAgentContainers(ctx, agentID) require.NoError(t, err) defer func() {