Skip to content

Commit 865812d

Browse files
janosjanos
committed
Adjust file-server tests
1 parent 4267b58 commit 865812d

File tree

2 files changed

+30
-83
lines changed

2 files changed

+30
-83
lines changed

‎file-server/server.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
9191
s.httpError(w, r, err)
9292
return
9393
}
94-
defer func() { _ = f.Close() }()
94+
defer f.Close() //nolint:errcheck
9595

9696
d, err := f.Stat()
9797
if err != nil {
@@ -118,7 +118,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
118118
index := strings.TrimSuffix(p, "/") + s.IndexPage
119119
ff, err := s.open(index)
120120
if err == nil {
121-
defer func() { _ = ff.Close() }()
121+
defer ff.Close() //nolint:errcheck
122122
dd, err := ff.Stat()
123123
if err == nil {
124124
d = dd
@@ -189,7 +189,7 @@ func (s *Server) hash(p string) (h string, cont bool, err error) {
189189
cont = true
190190
return
191191
}
192-
defer func() { _ = f.Close() }()
192+
defer f.Close() //nolint:errcheck
193193

194194
d, err := f.Stat()
195195
if err != nil {

‎file-server/server_test.go‎

Lines changed: 27 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestServer(t *testing.T) {
2828
t.Fatal(err)
2929
}
3030
_, fn := filepath.Split(f.Name())
31-
_ = f.Close()
31+
f.Close() //nolint:errcheck
3232

3333
r := httptest.NewRequest("", "/assets/"+fn, nil)
3434
w := httptest.NewRecorder()
@@ -55,9 +55,13 @@ func TestServerAltDir(t *testing.T) {
5555
t.Fatal(err)
5656
}
5757
_, fn := filepath.Split(f.Name())
58-
_ = f.Close()
58+
f.Close() //nolint:errcheck
5959

60-
altDir := t.TempDir()
60+
altDir, err := os.MkdirTemp("", "file-server-test-alt")
61+
if err != nil {
62+
t.Error(err)
63+
}
64+
defer os.RemoveAll(dir) //nolint:errcheck
6165

6266
content = "file alt content"
6367

@@ -144,9 +148,7 @@ func TestServerServeIndexPage(t *testing.T) {
144148
if err != nil {
145149
t.Error(err)
146150
}
147-
if err := f.Close(); err != nil {
148-
t.Fatal(err)
149-
}
151+
f.Close() //nolint:errcheck
150152

151153
r := httptest.NewRequest("", "/assets", nil)
152154
w := httptest.NewRecorder()
@@ -174,9 +176,7 @@ func TestServerRedirectIndexPage(t *testing.T) {
174176
if err != nil {
175177
t.Error(err)
176178
}
177-
if err := f.Close(); err != nil {
178-
t.Fatal(err)
179-
}
179+
f.Close() //nolint:errcheck
180180

181181
r := httptest.NewRequest("", "/assets/index.html", nil)
182182
w := httptest.NewRecorder()
@@ -209,9 +209,7 @@ func TestServerRedirectTrailingSlashDir(t *testing.T) {
209209
if err != nil {
210210
t.Error(err)
211211
}
212-
if err := f.Close(); err != nil {
213-
t.Fatal(err)
214-
}
212+
f.Close() //nolint:errcheck
215213

216214
r := httptest.NewRequest("", "/assets", nil)
217215
w := httptest.NewRecorder()
@@ -246,10 +244,7 @@ func TestServerRedirectTrailingSlashDirFile(t *testing.T) {
246244
t.Error(err)
247245
}
248246
_, fn := filepath.Split(f.Name())
249-
250-
if err := f.Close(); err != nil {
251-
t.Fatal(err)
252-
}
247+
f.Close() //nolint:errcheck
253248

254249
r := httptest.NewRequest("", "/assets/"+fn+"/", nil)
255250
w := httptest.NewRecorder()
@@ -284,10 +279,7 @@ func TestServerHasher(t *testing.T) {
284279
t.Error(err)
285280
}
286281
_, fn := filepath.Split(f.Name())
287-
288-
if err := f.Close(); err != nil {
289-
t.Fatal(err)
290-
}
282+
f.Close() //nolint:errcheck
291283

292284
h := New("/assets", dir, &Options{
293285
Hasher: MD5Hasher{8},
@@ -318,10 +310,7 @@ func TestServerHasherRedirect(t *testing.T) {
318310
t.Error(err)
319311
}
320312
_, fn := filepath.Split(f.Name())
321-
322-
if err := f.Close(); err != nil {
323-
t.Fatal(err)
324-
}
313+
f.Close() //nolint:errcheck
325314

326315
r := httptest.NewRequest("", "/assets/"+fn, nil)
327316
w := httptest.NewRecorder()
@@ -354,10 +343,7 @@ func TestServerHasherWithExtension(t *testing.T) {
354343
if err != nil {
355344
t.Error(err)
356345
}
357-
358-
if err := f.Close(); err != nil {
359-
t.Fatal(err)
360-
}
346+
f.Close() //nolint:errcheck
361347

362348
r := httptest.NewRequest("", "/assets/data.d10b4c3f.txt", nil)
363349
w := httptest.NewRecorder()
@@ -386,10 +372,7 @@ func TestServerHasherRedirectWithExtension(t *testing.T) {
386372
t.Error(err)
387373
}
388374
_, fn := filepath.Split(f.Name())
389-
390-
if err := f.Close(); err != nil {
391-
t.Fatal(err)
392-
}
375+
f.Close() //nolint:errcheck
393376

394377
r := httptest.NewRequest("", "/assets/"+fn, nil)
395378
w := httptest.NewRecorder()
@@ -422,10 +405,7 @@ func TestServerHasherNoRegularFile(t *testing.T) {
422405
if err != nil {
423406
t.Error(err)
424407
}
425-
426-
if err := f.Close(); err != nil {
427-
t.Fatal(err)
428-
}
408+
f.Close() //nolint:errcheck
429409

430410
r := httptest.NewRequest("", "/assets", nil)
431411
w := httptest.NewRecorder()
@@ -453,10 +433,7 @@ func TestServerHasherRedirectTrailingSlash(t *testing.T) {
453433
if err != nil {
454434
t.Error(err)
455435
}
456-
457-
if err := f.Close(); err != nil {
458-
t.Fatal(err)
459-
}
436+
f.Close() //nolint:errcheck
460437

461438
r := httptest.NewRequest("", "/assets/data.d10b4c3f.txt/", nil)
462439
w := httptest.NewRecorder()
@@ -490,10 +467,7 @@ func TestServerHasherRedirectTrailingSlashCanonicalPath(t *testing.T) {
490467
if err != nil {
491468
t.Error(err)
492469
}
493-
494-
if err := f.Close(); err != nil {
495-
t.Fatal(err)
496-
}
470+
f.Close() //nolint:errcheck
497471

498472
r := httptest.NewRequest("", "/assets/data.txt/", nil)
499473
w := httptest.NewRecorder()
@@ -535,10 +509,7 @@ func TestServerInternalServerError(t *testing.T) {
535509
if err != nil {
536510
t.Error(err)
537511
}
538-
539-
if err := f.Close(); err != nil {
540-
t.Fatal(err)
541-
}
512+
f.Close() //nolint:errcheck
542513

543514
h := New("/assets", dir, &Options{
544515
Hasher: faultyHasher{},
@@ -567,10 +538,7 @@ func TestServerInternalServerErrorCustom(t *testing.T) {
567538
if err != nil {
568539
t.Error(err)
569540
}
570-
571-
if err := f.Close(); err != nil {
572-
t.Fatal(err)
573-
}
541+
f.Close() //nolint:errcheck
574542

575543
content := "Test"
576544
h := New("/assets", dir, &Options{
@@ -620,10 +588,7 @@ func TestServerHasherNullHasher(t *testing.T) {
620588
t.Error(err)
621589
}
622590
_, fn := filepath.Split(f.Name())
623-
624-
if err := f.Close(); err != nil {
625-
t.Fatal(err)
626-
}
591+
f.Close() //nolint:errcheck
627592

628593
r := httptest.NewRequest("", "/assets/"+fn, nil)
629594
w := httptest.NewRecorder()
@@ -652,10 +617,7 @@ func TestServerHashedPath(t *testing.T) {
652617
t.Error(err)
653618
}
654619
_, fn := filepath.Split(f.Name())
655-
656-
if err := f.Close(); err != nil {
657-
t.Fatal(err)
658-
}
620+
f.Close() //nolint:errcheck
659621

660622
p, err := New("/assets", dir, &Options{
661623
Hasher: MD5Hasher{8},
@@ -685,10 +647,7 @@ func TestServerNoHasher(t *testing.T) {
685647
t.Error(err)
686648
}
687649
_, fn := filepath.Split(f.Name())
688-
689-
if err := f.Close(); err != nil {
690-
t.Fatal(err)
691-
}
650+
f.Close() //nolint:errcheck
692651

693652
p, err := New("/assets", dir, nil).HashedPath(fn)
694653

@@ -713,10 +672,7 @@ func TestServerHashedPathError(t *testing.T) {
713672
if err != nil {
714673
t.Error(err)
715674
}
716-
717-
if err := f.Close(); err != nil {
718-
t.Fatal(err)
719-
}
675+
f.Close() //nolint:errcheck
720676

721677
p, err := New("/assets", dir, &Options{
722678
Hasher: faultyHasher{},
@@ -743,10 +699,7 @@ func TestServerGetHashedPath(t *testing.T) {
743699
if err != nil {
744700
t.Error(err)
745701
}
746-
747-
if err := f.Close(); err != nil {
748-
t.Fatal(err)
749-
}
702+
f.Close() //nolint:errcheck
750703

751704
h := New("/assets", dir, &Options{
752705
Hasher: MD5Hasher{8},
@@ -780,10 +733,7 @@ func TestServerHashedPathFromFilename(t *testing.T) {
780733
if err != nil {
781734
t.Error(err)
782735
}
783-
784-
if err := f.Close(); err != nil {
785-
t.Fatal(err)
786-
}
736+
f.Close() //nolint:errcheck
787737

788738
h := New("/assets", dir, &Options{
789739
Hasher: MD5Hasher{8},
@@ -837,10 +787,7 @@ func TestServerHashedPathFromFilenameWithFilenames(t *testing.T) {
837787
if err != nil {
838788
t.Error(err)
839789
}
840-
841-
if err := f.Close(); err != nil {
842-
t.Fatal(err)
843-
}
790+
f.Close() //nolint:errcheck
844791

845792
h := New("/assets", dir, &Options{
846793
Hasher: MD5Hasher{8},

0 commit comments

Comments
 (0)