From 8c96860231c8588e1ebeb47fbeff9f9ef54c887f Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Wed, 12 Jun 2024 15:45:11 +0400 Subject: [PATCH] fix: fix flake in TestWorkspaceAgent_Metadata_CatchMemoryLeak --- coderd/workspaceagents_test.go | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index f50a886205cdf..a2915d2633f13 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -1350,7 +1350,7 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) { agentClient := agentsdk.New(client.URL) agentClient.SetSessionToken(r.AgentToken) - ctx, cancel := context.WithCancel(testutil.Context(t, testutil.WaitSuperLong)) + ctx := testutil.Context(t, testutil.WaitSuperLong) conn, err := agentClient.ConnectRPC(ctx) require.NoError(t, err) defer func() { @@ -1404,20 +1404,21 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) { postDone := testutil.Go(t, func() { for { + select { + case <-metadataDone: + return + default: + } // We need to send two separate metadata updates to trigger the // memory leak. foo2 will cause the number of foo1 to be doubled, etc. - err = post(ctx, "foo1", "hi") + err := post(ctx, "foo1", "hi") if err != nil { - if !xerrors.Is(err, context.Canceled) { - assert.NoError(t, err, "post metadata foo1") - } + assert.NoError(t, err, "post metadata foo1") return } err = post(ctx, "foo2", "bye") if err != nil { - if !xerrors.Is(err, context.Canceled) { - assert.NoError(t, err, "post metadata foo1") - } + assert.NoError(t, err, "post metadata foo1") return } } @@ -1436,13 +1437,8 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) { // testing it is not straightforward. db.err.Store(&wantErr) - select { - case <-ctx.Done(): - t.Fatal("timeout waiting for SSE to close") - case <-metadataDone: - } - cancel() - <-postDone + testutil.RequireRecvCtx(ctx, t, metadataDone) + testutil.RequireRecvCtx(ctx, t, postDone) } func TestWorkspaceAgent_Startup(t *testing.T) { 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