From 2014f4623dee3f0a22ca7615a5f7638f04e239d7 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 24 May 2021 14:24:09 -0700 Subject: [PATCH] Move require.NoError() to t.Cleanup() --- internal/testutil/tlsserver.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/testutil/tlsserver.go b/internal/testutil/tlsserver.go index c55e07de..13e39324 100644 --- a/internal/testutil/tlsserver.go +++ b/internal/testutil/tlsserver.go @@ -43,17 +43,19 @@ func TLSTestServerWithCert(t *testing.T, handler http.HandlerFunc, certificate * l, err := net.Listen("tcp", "127.0.0.1:0") require.NoError(t, err) + serverShutdownChan := make(chan error) go func() { // Empty certFile and keyFile will use certs from Server.TLSConfig. - serveErr := server.ServeTLS(l, "", "") - if !errors.Is(serveErr, http.ErrServerClosed) { - t.Log("Got an unexpected error while starting the fake http server!") - require.NoError(t, serveErr) - } + serverShutdownChan <- server.ServeTLS(l, "", "") }() t.Cleanup(func() { _ = server.Close() + serveErr := <-serverShutdownChan + if !errors.Is(serveErr, http.ErrServerClosed) { + t.Log("Got an unexpected error while starting the fake http server!") + require.NoError(t, serveErr) + } }) return l.Addr().String()