Skip to content

Commit 6fc1b76

Browse files
Inconnu08Inconnu08
committed
Lint: fix errcheck in multiple packages mholt#2541
- handler_test - redirect_test - requestid_test - rewrite_test - fileserver_test
1 parent 688138b commit 6fc1b76

File tree

5 files changed

+49
-20
lines changed

5 files changed

+49
-20
lines changed

‎caddyhttp/push/handler_test.go

+15-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package push
1717
import (
1818
"errors"
1919
"io/ioutil"
20+
"log"
2021
"net/http"
2122
"net/http/httptest"
2223
"os"
@@ -67,7 +68,9 @@ func TestMiddlewareWillPushResources(t *testing.T) {
6768
pushingWriter := &MockedPusher{ResponseWriter: writer}
6869

6970
// when
70-
middleware.ServeHTTP(pushingWriter, request)
71+
if _, err := middleware.ServeHTTP(pushingWriter, request); err != nil {
72+
log.Println("[ERROR] failed to serve HTTP: ", err)
73+
}
7174

7275
// then
7376
expectedPushedResources := map[string]*http.PushOptions{
@@ -111,7 +114,9 @@ func TestMiddlewareWillPushResourcesWithMergedHeaders(t *testing.T) {
111114
pushingWriter := &MockedPusher{ResponseWriter: writer}
112115

113116
// when
114-
middleware.ServeHTTP(pushingWriter, request)
117+
if _, err := middleware.ServeHTTP(pushingWriter, request); err != nil {
118+
log.Println("[ERROR] failed to serve HTTP: ", err)
119+
}
115120

116121
// then
117122
expectedPushedResources := map[string]*http.PushOptions{
@@ -156,7 +161,9 @@ func TestMiddlewareShouldntDoRecursivePush(t *testing.T) {
156161
pushingWriter := &MockedPusher{ResponseWriter: writer}
157162

158163
// when
159-
middleware.ServeHTTP(pushingWriter, request)
164+
if _, err := middleware.ServeHTTP(pushingWriter, request); err != nil {
165+
log.Println("[ERROR] failed to serve HTTP: ", err)
166+
}
160167

161168
// then
162169
if len(pushingWriter.pushed) > 0 {
@@ -190,7 +197,9 @@ func TestMiddlewareShouldStopPushingOnError(t *testing.T) {
190197
pushingWriter := &MockedPusher{ResponseWriter: writer, returnedError: errors.New("Cannot push right now")}
191198

192199
// when
193-
middleware.ServeHTTP(pushingWriter, request)
200+
if _, err := middleware.ServeHTTP(pushingWriter, request); err != nil {
201+
log.Println("[ERROR] failed to serve HTTP: ", err)
202+
}
194203

195204
// then
196205
expectedPushedResources := map[string]*http.PushOptions{
@@ -406,7 +415,7 @@ func TestMiddlewareShouldPushIndexFile(t *testing.T) {
406415

407416
pushingWriter := &MockedPusher{
408417
ResponseWriter: httptest.NewRecorder(),
409-
returnedError: errors.New("Cannot push right now"),
418+
returnedError: errors.New("cannot push right now"),
410419
}
411420

412421
// when
@@ -461,7 +470,7 @@ func TestMiddlewareShouldNotPushIndexFileWhenNotARule(t *testing.T) {
461470

462471
pushingWriter := &MockedPusher{
463472
ResponseWriter: httptest.NewRecorder(),
464-
returnedError: errors.New("Cannot push right now"),
473+
returnedError: errors.New("cannot push right now"),
465474
}
466475

467476
// when

‎caddyhttp/redirect/redirect_test.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"context"
2020
"crypto/tls"
2121
"io/ioutil"
22+
"log"
2223
"net/http"
2324
"net/http/httptest"
2425
"strings"
@@ -84,7 +85,9 @@ func TestRedirect(t *testing.T) {
8485
}
8586

8687
rec := httptest.NewRecorder()
87-
re.ServeHTTP(rec, req)
88+
if _, err := re.ServeHTTP(rec, req); err != nil {
89+
log.Println("[ERROR] failed to serve HTTP: ", err)
90+
}
8891

8992
if rec.Header().Get("Location") != test.expectedLocation {
9093
t.Errorf("Test %d: Expected Location header to be %q but was %q",
@@ -117,7 +120,9 @@ func TestParametersRedirect(t *testing.T) {
117120
req = req.WithContext(ctx)
118121

119122
rec := httptest.NewRecorder()
120-
re.ServeHTTP(rec, req)
123+
if _, err := re.ServeHTTP(rec, req); err != nil {
124+
log.Println("[ERROR] failed to serve HTTP: ", err)
125+
}
121126

122127
if got, want := rec.Header().Get("Location"), "http://example.com/a?b=c"; got != want {
123128
t.Fatalf("Test 1: expected location header %s but was %s", want, got)
@@ -158,7 +163,9 @@ func TestMetaRedirect(t *testing.T) {
158163
}
159164

160165
rec := httptest.NewRecorder()
161-
re.ServeHTTP(rec, req)
166+
if _, err := re.ServeHTTP(rec, req); err != nil {
167+
log.Println("[ERROR] failed to serve HTTP: ", err)
168+
}
162169

163170
body, err := ioutil.ReadAll(rec.Body)
164171
if err != nil {

‎caddyhttp/requestid/requestid_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package requestid
1616

1717
import (
18+
"log"
1819
"net/http"
1920
"net/http/httptest"
2021
"testing"
@@ -39,7 +40,9 @@ func TestRequestIDHandler(t *testing.T) {
3940
}
4041
rec := httptest.NewRecorder()
4142

42-
handler.ServeHTTP(rec, req)
43+
if _, err := handler.ServeHTTP(rec, req); err != nil {
44+
log.Println("[ERROR] failed to serve HTTP: ", err)
45+
}
4346
}
4447

4548
func TestRequestIDFromHeader(t *testing.T) {
@@ -63,5 +66,7 @@ func TestRequestIDFromHeader(t *testing.T) {
6366
req.Header.Set(headerName, headerValue)
6467
rec := httptest.NewRecorder()
6568

66-
handler.ServeHTTP(rec, req)
69+
if _, err := handler.ServeHTTP(rec, req); err != nil {
70+
log.Println("[ERROR] failed to serve HTTP: ", err)
71+
}
6772
}

‎caddyhttp/rewrite/rewrite_test.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package rewrite
1717
import (
1818
"context"
1919
"fmt"
20+
"log"
2021
"net/http"
2122
"net/http/httptest"
2223
"strings"
@@ -123,7 +124,9 @@ func TestRewrite(t *testing.T) {
123124
req = req.WithContext(ctx)
124125

125126
rec := httptest.NewRecorder()
126-
rw.ServeHTTP(rec, req)
127+
if _, err := rw.ServeHTTP(rec, req); err != nil {
128+
log.Println("[ERROR] failed to serve HTTP: ", err)
129+
}
127130

128131
if got, want := rec.Body.String(), test.expectedTo; got != want {
129132
t.Errorf("Test %d: Expected URL to be '%s' but was '%s'", i, want, got)
@@ -162,7 +165,9 @@ func TestWordpress(t *testing.T) {
162165
req = req.WithContext(ctx)
163166

164167
rec := httptest.NewRecorder()
165-
rw.ServeHTTP(rec, req)
168+
if _, err := rw.ServeHTTP(rec, req); err != nil {
169+
log.Println("[ERROR] failed to serve HTTP: ", err)
170+
}
166171

167172
if got, want := rec.Body.String(), test.expectedTo; got != want {
168173
t.Errorf("Test %d: Expected URL to be '%s' but was '%s'", i, want, got)
@@ -171,6 +176,6 @@ func TestWordpress(t *testing.T) {
171176
}
172177

173178
func urlPrinter(w http.ResponseWriter, r *http.Request) (int, error) {
174-
fmt.Fprint(w, r.URL.String())
179+
_, _ = fmt.Fprint(w, r.URL.String())
175180
return 0, nil
176181
}

‎caddyhttp/staticfiles/fileserver_test.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"errors"
2020
"io/ioutil"
21+
"log"
2122
"net/http"
2223
"net/http/httptest"
2324
"os"
@@ -35,7 +36,7 @@ func TestServeHTTP(t *testing.T) {
3536
tmpWebRootDir := beforeServeHTTPTest(t)
3637
defer afterServeHTTPTest(t, tmpWebRootDir)
3738

38-
fileserver := FileServer{
39+
fileServer := FileServer{
3940
Root: http.Dir(filepath.Join(tmpWebRootDir, webrootName)),
4041
Hide: []string{"dir/hidden.html"},
4142
IndexPages: DefaultIndexPages,
@@ -288,7 +289,7 @@ func TestServeHTTP(t *testing.T) {
288289
}
289290

290291
// perform the test
291-
status, err := fileserver.ServeHTTP(responseRecorder, request)
292+
status, err := fileServer.ServeHTTP(responseRecorder, request)
292293
etag := responseRecorder.Header().Get("Etag")
293294
body := responseRecorder.Body.String()
294295
vary := responseRecorder.Header().Get("Vary")
@@ -357,7 +358,9 @@ func beforeServeHTTPTest(t *testing.T) string {
357358
parentDir := filepath.Dir(absFile)
358359
_, err = os.Stat(parentDir)
359360
if err != nil {
360-
os.MkdirAll(parentDir, os.ModePerm)
361+
if err := os.MkdirAll(parentDir, os.ModePerm); err != nil {
362+
log.Println("[ERROR] MkdirAll failed: ", err)
363+
}
361364
}
362365

363366
// now create the test files
@@ -371,7 +374,7 @@ func beforeServeHTTPTest(t *testing.T) string {
371374
if err != nil {
372375
t.Fatalf("Failed to write to %s. Error was: %v", absFile, err)
373376
}
374-
f.Close()
377+
_ = f.Close()
375378

376379
// and set the last modified time
377380
err = os.Chtimes(absFile, fixedTime, fixedTime)
@@ -511,7 +514,7 @@ func TestServeHTTPFailingStat(t *testing.T) {
511514

512515
for i, test := range tests {
513516
// initialize a file server. The FileSystem will not fail, but calls to the Stat method of the returned File object will
514-
fileserver := FileServer{Root: failingFS{err: nil, fileImpl: failingFile{err: test.statErr}}}
517+
fileServer := FileServer{Root: failingFS{err: nil, fileImpl: failingFile{err: test.statErr}}}
515518

516519
// prepare the request and response
517520
request, err := http.NewRequest("GET", "https://foo/", nil)
@@ -520,7 +523,7 @@ func TestServeHTTPFailingStat(t *testing.T) {
520523
}
521524
responseRecorder := httptest.NewRecorder()
522525

523-
status, actualErr := fileserver.ServeHTTP(responseRecorder, request)
526+
status, actualErr := fileServer.ServeHTTP(responseRecorder, request)
524527

525528
// check the status
526529
if status != test.expectedStatus {

0 commit comments

Comments
 (0)