From 8a0729228927a565f8803ec670a43deb5b3ca8a8 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 6 Feb 2020 10:53:40 +0000
Subject: [PATCH] Suppress some linter warnings in tests
---
serverutil/proxy_headers_test.go | 2 +-
serverutil/tls_test.go | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/serverutil/proxy_headers_test.go b/serverutil/proxy_headers_test.go
index 4ec647d..a81f347 100644
--- a/serverutil/proxy_headers_test.go
+++ b/serverutil/proxy_headers_test.go
@@ -15,7 +15,7 @@ func TestProxyHeaders(t *testing.T) {
if err != nil {
host = r.RemoteAddr
}
- io.WriteString(w, host)
+ io.WriteString(w, host) // nolint: errcheck
})
p1, err := newProxyHeaders(h, []string{"1.2.3.4/16"})
diff --git a/serverutil/tls_test.go b/serverutil/tls_test.go
index 9cf3ef9..02bec02 100644
--- a/serverutil/tls_test.go
+++ b/serverutil/tls_test.go
@@ -22,13 +22,13 @@ import (
func saveCertificate(cert *x509.Certificate, path string) {
data := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw})
- ioutil.WriteFile(path, data, 0644)
+ ioutil.WriteFile(path, data, 0644) // nolint: errcheck
}
func savePrivateKey(pkey *ecdsa.PrivateKey, path string) {
der, _ := x509.MarshalECPrivateKey(pkey)
data := pem.EncodeToMemory(&pem.Block{Type: "EC PRIVATE KEY", Bytes: der})
- ioutil.WriteFile(path, data, 0600)
+ ioutil.WriteFile(path, data, 0600) // nolint: errcheck
}
func generateTestCA(t testing.TB, dir string) (*x509.Certificate, *ecdsa.PrivateKey) {
@@ -46,8 +46,8 @@ func generateTestCA(t testing.TB, dir string) (*x509.Certificate, *ecdsa.Private
SignatureAlgorithm: x509.ECDSAWithSHA256,
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
BasicConstraintsValid: true,
- IsCA: true,
- MaxPathLen: 1,
+ IsCA: true,
+ MaxPathLen: 1,
}
der, err := x509.CreateCertificate(rand.Reader, &template, &template, pkey.Public(), pkey)
if err != nil {
@@ -148,10 +148,10 @@ func TestTLS_Serve(t *testing.T) {
},
}
h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- io.WriteString(w, "OK")
+ io.WriteString(w, "OK") // nolint: errcheck
})
- go Serve(h, config, ":19898")
+ go Serve(h, config, ":19898") // nolint: errcheck
time.Sleep(100 * time.Millisecond)
// A client without a certificate should get a transport-level error.
--
GitLab