Skip to content

Commit 4ca69af

Browse files
fix: increase timeout for watch workspace agent devcontainers test (#19376)
1 parent 2ea807f commit 4ca69af

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

coderd/workspaceagents_test.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1579,10 +1579,12 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) {
15791579
t.Parallel()
15801580

15811581
var (
1582-
ctx = testutil.Context(t, testutil.WaitShort)
1583-
logger = slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
1584-
mCtrl = gomock.NewController(t)
1585-
mCCLI = acmock.NewMockContainerCLI(mCtrl)
1582+
ctx = testutil.Context(t, testutil.WaitLong)
1583+
logger = slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).Leveled(slog.LevelDebug)
1584+
mClock = quartz.NewMock(t)
1585+
updaterTickerTrap = mClock.Trap().TickerFunc("updaterLoop")
1586+
mCtrl = gomock.NewController(t)
1587+
mCCLI = acmock.NewMockContainerCLI(mCtrl)
15861588

15871589
client, db = coderdtest.NewWithDatabase(t, &coderdtest.Options{Logger: &logger})
15881590
user = coderdtest.CreateFirstUser(t, client)
@@ -1621,6 +1623,7 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) {
16211623
o.Logger = logger.Named("agent")
16221624
o.Devcontainers = true
16231625
o.DevcontainerAPIOptions = []agentcontainers.Option{
1626+
agentcontainers.WithClock(mClock),
16241627
agentcontainers.WithContainerCLI(mCCLI),
16251628
agentcontainers.WithWatcher(watcher.NewNoop()),
16261629
}
@@ -1631,6 +1634,9 @@ func TestWatchWorkspaceAgentDevcontainers(t *testing.T) {
16311634
require.Len(t, resources[0].Agents, 1, "expected one agent")
16321635
agentID := resources[0].Agents[0].ID
16331636

1637+
updaterTickerTrap.MustWait(ctx).MustRelease(ctx)
1638+
defer updaterTickerTrap.Close()
1639+
16341640
containers, closer, err := client.WatchWorkspaceAgentContainers(ctx, agentID)
16351641
require.NoError(t, err)
16361642
defer func() {

0 commit comments

Comments
 (0)