From 04985a1754ea9f7bf2133933fdca2f18dadb831b Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 19 Apr 2022 11:14:55 -0500 Subject: [PATCH] fix: Close TURN connections to resolve flake (#1079) --- coderd/turnconn/turnconn_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/coderd/turnconn/turnconn_test.go b/coderd/turnconn/turnconn_test.go index 346bfb2d42..6a8d0411cb 100644 --- a/coderd/turnconn/turnconn_test.go +++ b/coderd/turnconn/turnconn_test.go @@ -44,6 +44,9 @@ func TestTURNConn(t *testing.T) { Logger: logger.Named("client"), }) require.NoError(t, err) + defer func() { + _ = client.Close() + }() serverDialer, serverTURN := net.Pipe() turnServer.Accept(serverTURN, &net.TCPAddr{ @@ -62,6 +65,9 @@ func TestTURNConn(t *testing.T) { Logger: logger.Named("server"), }) require.NoError(t, err) + defer func() { + _ = server.Close() + }() exchange(t, client, server) _, err = client.Ping() @@ -71,12 +77,7 @@ func TestTURNConn(t *testing.T) { func exchange(t *testing.T, client, server *peer.Conn) { var wg sync.WaitGroup wg.Add(2) - t.Cleanup(func() { - _ = client.Close() - _ = server.Close() - - wg.Wait() - }) + t.Cleanup(wg.Wait) go func() { defer wg.Done() for {