From 32691e67e65c3b1f05bfd6c54c2db38a3b5efe54 Mon Sep 17 00:00:00 2001
From: Mathias Fredriksson <mafredri@gmail.com>
Date: Tue, 27 Feb 2024 19:58:10 +0200
Subject: [PATCH] test(agent/agentscripts): fix test flake in `TestEnv`
 (#12326)

---
 agent/agentscripts/agentscripts_test.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/agent/agentscripts/agentscripts_test.go b/agent/agentscripts/agentscripts_test.go
index b9c8ae9f04..2be7e76c54 100644
--- a/agent/agentscripts/agentscripts_test.go
+++ b/agent/agentscripts/agentscripts_test.go
@@ -69,12 +69,18 @@ func TestEnv(t *testing.T) {
 
 	ctx := testutil.Context(t, testutil.WaitLong)
 
-	testutil.Go(t, func() {
+	done := testutil.Go(t, func() {
 		err := runner.Execute(ctx, func(script codersdk.WorkspaceAgentScript) bool {
 			return true
 		})
 		assert.NoError(t, err)
 	})
+	defer func() {
+		select {
+		case <-ctx.Done():
+		case <-done:
+		}
+	}()
 
 	var log []agentsdk.Log
 	for {