From b8e1c2f05cf793cf13901c41f3155ac6dafaa8b0 Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Fri, 15 Aug 2025 17:43:10 +0000 Subject: [PATCH 1/2] fix: increase timeout for watch workspace agent devcontainers test Fixes https://github.com/coder/internal/issues/907 When running in a CI environment, the process of setting up the agent + coderd + creating the websocket connection can sometimes take up to 10 seconds, by which time we timeout. To resolve this we up the timeout from `WaitShort` to `WaitLong`. --- coderd/workspaceagents_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 948123598de9f..83ba73a52788d 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -1579,8 +1579,10 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) { t.Parallel() var ( - ctx = testutil.Context(t, testutil.WaitShort) + 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) @@ -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() { From f2852de83abe770631c3684cf819866f7425f343 Mon Sep 17 00:00:00 2001 From: Danielle Maywood Date: Fri, 15 Aug 2025 17:47:45 +0000 Subject: [PATCH 2/2] fix: run the formatter --- coderd/workspaceagents_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index 83ba73a52788d..a11efebc9ee62 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -1579,12 +1579,12 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) { t.Parallel() var ( - ctx = testutil.Context(t, testutil.WaitLong) - logger = slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug) + 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) + mCtrl = gomock.NewController(t) + mCCLI = acmock.NewMockContainerCLI(mCtrl) client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{Logger: &logger}) user = coderdtest.CreateFirstUser(t, client) pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy