Fixes linter issues in testutils package

lib/testutils/httpmultibin/httpmultibin.go

@@ -56,7 +56,7 @@ func GetTLSClientConfig(t testing.TB, srv *httptest.Server) *tls.Config {
 		RootCAs:            certs,
 		InsecureSkipVerify: false,
 		Renegotiation:      tls.RenegotiateFreelyAsClient,
-		MinVersion:         tls.VersionTLS10,
+		MinVersion:         tls.VersionTLS13,
 	}
 }
 
@@ -67,7 +67,8 @@ const httpDomain = "httpbin.local"
 // https://golang.org/src/net/http/internal/testcert.go?s=399:410#L10
 const httpsDomain = "example.com"
 
-// HTTPMultiBin can be used as a local alternative of httpbin.org. It offers both http and https servers, as well as real domains
+// HTTPMultiBin can be used as a local alternative of httpbin.org.
+// It offers both http and https servers, as well as real domains
 type HTTPMultiBin struct {
 	Mux             *http.ServeMux
 	ServerHTTP      *httptest.Server
@@ -331,7 +332,7 @@ func NewHTTPMultiBin(t testing.TB) *HTTPMultiBin {
 	// Initialize the HTTP2 server, with a copy of the https tls config
 	http2Srv := httptest.NewUnstartedServer(cmux)
 	http2Srv.EnableHTTP2 = true
-	http2Srv.TLS = &(*tlsConfig) // copy it
+	http2Srv.TLS = tlsConfig
 	http2Srv.TLS.NextProtos = []string{http2.NextProtoTLS}
 	require.NoError(t, err)
 	http2Srv.StartTLS()
@@ -377,24 +378,24 @@ func NewHTTPMultiBin(t testing.TB) *HTTPMultiBin {
 		Replacer: strings.NewReplacer(
 			"HTTPBIN_IP_URL", httpSrv.URL,
 			"HTTPBIN_DOMAIN", httpDomain,
-			"HTTPBIN_URL", fmt.Sprintf("http://%s:%s", httpDomain, httpURL.Port()),
-			"WSBIN_URL", fmt.Sprintf("ws://%s:%s", httpDomain, httpURL.Port()),
+			"HTTPBIN_URL", fmt.Sprintf("http://%s", net.JoinHostPort(httpDomain, httpURL.Port())),
+			"WSBIN_URL", fmt.Sprintf("ws://%s", net.JoinHostPort(httpDomain, httpURL.Port())),
 			"HTTPBIN_IP", httpIP.String(),
 			"HTTPBIN_PORT", httpURL.Port(),
 			"HTTPSBIN_IP_URL", httpsSrv.URL,
 			"HTTPSBIN_DOMAIN", httpsDomain,
-			"HTTPSBIN_URL", fmt.Sprintf("https://%s:%s", httpsDomain, httpsURL.Port()),
-			"WSSBIN_URL", fmt.Sprintf("wss://%s:%s", httpsDomain, httpsURL.Port()),
+			"HTTPSBIN_URL", fmt.Sprintf("https://%s", net.JoinHostPort(httpsDomain, httpsURL.Port())),
+			"WSSBIN_URL", fmt.Sprintf("wss://%s", net.JoinHostPort(httpsDomain, httpsURL.Port())),
 			"HTTPSBIN_IP", httpsIP.String(),
 			"HTTPSBIN_PORT", httpsURL.Port(),
 
 			"HTTP2BIN_IP_URL", http2Srv.URL,
 			"HTTP2BIN_DOMAIN", httpsDomain,
-			"HTTP2BIN_URL", fmt.Sprintf("https://%s:%s", httpsDomain, http2URL.Port()),
+			"HTTP2BIN_URL", fmt.Sprintf("https://%s", net.JoinHostPort(httpsDomain, http2URL.Port())),
 			"HTTP2BIN_IP", http2IP.String(),
 			"HTTP2BIN_PORT", http2URL.Port(),
 
-			"GRPCBIN_ADDR", fmt.Sprintf("%s:%s", httpsDomain, http2URL.Port()),
+			"GRPCBIN_ADDR", net.JoinHostPort(httpsDomain, http2URL.Port()),
 		),
 		TLSClientConfig: tlsConfig,
 		Dialer:          dialer,

lib/testutils/minirunner/minirunner.go

@@ -1,3 +1,5 @@
+// Package minirunner provides a mock implementation of the lib.Runner
+// We use it in tests
 package minirunner
 
 import (
@@ -94,7 +96,7 @@ func (r MiniRunner) GetDefaultGroup() *lib.Group {
 
 // IsExecutable satisfies lib.Runner, but is mocked for MiniRunner since
 // it doesn't deal with JS.
-func (r MiniRunner) IsExecutable(name string) bool {
+func (r MiniRunner) IsExecutable(_ string) bool {
 	return true
 }
 
@@ -119,7 +121,7 @@ func (r *MiniRunner) HandleSummary(ctx context.Context, s *lib.Summary) (map[str
 	if r.HandleSummaryFn != nil {
 		return r.HandleSummaryFn(ctx, s)
 	}
-	return nil, nil
+	return nil, nil //nolint:nilnil
 }
 
 // VU is a mock VU, spawned by a MiniRunner.

lib/testutils/mockoutput/mockoutput.go

@@ -1,3 +1,4 @@
+// Package mockoutput implements a mock output for testing purposes.
 package mockoutput
 
 import (

lib/testutils/mockresolver/resolver.go

@@ -1,3 +1,4 @@
+// Package mockresolver provides a mock implementation of netext.Resolver.
 package mockresolver
 
 import (