Skip to content

refactor: simplify client server tests #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2023
Merged

refactor: simplify client server tests #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions client_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ type cstHandler struct{ *testing.T }
type cstServer struct {
*httptest.Server
URL string
t *testing.T
}

const (
Expand Down Expand Up @@ -463,7 +462,7 @@ func TestBadMethod(t *testing.T) {
}))
defer s.Close()

req, err := http.NewRequest(http.MethodPost, s.URL, strings.NewReader(""))
req, err := http.NewRequest(http.MethodPost, s.URL, http.NoBody)
if err != nil {
t.Fatalf("NewRequest returned error %v", err)
}
Expand Down Expand Up @@ -987,11 +986,9 @@ func TestNetDialConnect(t *testing.T) {
tlsClientConfig: nil,
},
{
name: "HTTP server, NetDialContext undefined, shall fallback to NetDial",
server: server,
netDial: func(network, addr string) (net.Conn, error) {
return net.Dial(network, addr)
},
name: "HTTP server, NetDialContext undefined, shall fallback to NetDial",
server: server,
netDial: net.Dial,
netDialContext: nil,
netDialTLSContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
return nil, errors.New("NetDialTLSContext should not be called")
Expand Down Expand Up @@ -1034,11 +1031,9 @@ func TestNetDialConnect(t *testing.T) {
tlsClientConfig: tlsConfig,
},
{
name: "HTTPS server, NetDialTLSContext and NetDialContext undefined, shall fallback to NetDial and do handshake",
server: tlsServer,
netDial: func(network, addr string) (net.Conn, error) {
return net.Dial(network, addr)
},
name: "HTTPS server, NetDialTLSContext and NetDialContext undefined, shall fallback to NetDial and do handshake",
server: tlsServer,
netDial: net.Dial,
netDialContext: nil,
netDialTLSContext: nil,
tlsClientConfig: tlsConfig,
Expand Down Expand Up @@ -1117,7 +1112,7 @@ func TestNextProtos(t *testing.T) {

// Asserts that Dialer.TLSClientConfig.NextProtos contains "h2"
// after the Client.Get call from net/http above.
var containsHTTP2 bool = false
containsHTTP2 := false
for _, proto := range d.TLSClientConfig.NextProtos {
if proto == "h2" {
containsHTTP2 = true
Expand Down