From af278af5291b62ac377124fdc2842210b53dac6b Mon Sep 17 00:00:00 2001 From: Andrew Crump Date: Thu, 18 Apr 2024 00:03:28 +0000 Subject: [PATCH] fix: race condition when starting server in test Signed-off-by: Matthew Kocher --- .../internal/proxy/firehose_handler_test.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/trafficcontroller/internal/proxy/firehose_handler_test.go b/src/trafficcontroller/internal/proxy/firehose_handler_test.go index fefd724e0..3fa9447c5 100644 --- a/src/trafficcontroller/internal/proxy/firehose_handler_test.go +++ b/src/trafficcontroller/internal/proxy/firehose_handler_test.go @@ -171,14 +171,17 @@ var _ = Describe("FirehoseHandler", func() { server := httptest.NewServer(handler) defer server.CloseClientConnections() - conn, _, err := websocket.DefaultDialer.Dial( - wsEndpoint(server, "/firehose/subscription-id"), - http.Header{"Authorization": []string{"token"}}, - ) - Expect(err).ToNot(HaveOccurred()) - f := func() error { - _, _, err := conn.ReadMessage() + conn, _, err := websocket.DefaultDialer.Dial( + wsEndpoint(server, "/firehose/subscription-id"), + http.Header{"Authorization": []string{"token"}}, + ) + if err != nil { + return err + } + defer conn.Close() + + _, _, err = conn.ReadMessage() return err } Eventually(f).Should(MatchError(&websocket.CloseError{