Skip to content

Commit 7465f37

Browse files
committed
chore: change RunTLS test to use require.Eventually/httptest
1 parent 6a7c0cb commit 7465f37

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

serve_test.go

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ import (
99
"crypto/x509/pkix"
1010
"encoding/pem"
1111
"errors"
12-
"fmt"
1312
"io"
1413
"math/big"
15-
"net"
1614
"net/http"
1715
"net/http/httptest"
1816
"os"
@@ -485,29 +483,13 @@ func TestServer_RunTLS(t *testing.T) {
485483
cancel()
486484
}()
487485

488-
// wait for the server to start
489-
conn, err := net.DialTimeout("tcp", s.Server.Addr, 5*time.Second)
490-
if err != nil {
491-
t.Fatal(err)
492-
}
493-
defer conn.Close()
494-
495-
client := &http.Client{Transport: &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
496-
req, err := http.NewRequest("GET", fmt.Sprintf("https://%s/test", s.Server.Addr), nil)
497-
if err != nil {
498-
t.Fatal(err)
499-
}
500-
req.Header.Set("Accept", "text/plain")
486+
require.Eventually(t, func() bool {
487+
req := httptest.NewRequest("GET", "https://localhost:3005/test", nil)
488+
w := httptest.NewRecorder()
489+
s.Mux.ServeHTTP(w, req)
501490

502-
resp, err := client.Do(req)
503-
if err != nil {
504-
t.Fatal(err)
505-
}
506-
body, err := io.ReadAll(resp.Body)
507-
if err != nil {
508-
t.Fatal(err)
509-
}
510-
require.Equal(t, []byte("OK"), body)
491+
return w.Body.String() == `OK`
492+
}, 5*time.Second, 500*time.Millisecond)
511493
})
512494
}
513495
}

0 commit comments

Comments
 (0)