Skip to content

Commit 72fbe46

Browse files
JRaspassJRaspass
authored
Fix non-constant format strings in t.Fatalf (#972)
This is a new go vet analysis pass that fires under go 1.24: $ go1.24rc2 vet ./... # github.com/go-chi/chi/v5 # [github.com/go-chi/chi/v5] ./mux_test.go:236:12: non-constant format string in call to (*testing.common).Fatalf ... The strings would be parsed as format strings which is not intended. See golang/go#60529 for details.
1 parent 877e876 commit 72fbe46

File tree

3 files changed

+68
-68
lines changed

3 files changed

+68
-68
lines changed

‎middleware/get_head_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,27 +38,27 @@ func TestGetHead(t *testing.T) {
3838
defer ts.Close()
3939

4040
if _, body := testRequest(t, ts, "GET", "/hi", nil); body != "bye" {
41-
t.Fatalf(body)
41+
t.Fatal(body)
4242
}
4343
if req, body := testRequest(t, ts, "HEAD", "/hi", nil); body != "" || req.Header.Get("X-Test") != "yes" {
44-
t.Fatalf(body)
44+
t.Fatal(body)
4545
}
4646
if _, body := testRequest(t, ts, "GET", "/", nil); body != "404 page not found\n" {
47-
t.Fatalf(body)
47+
t.Fatal(body)
4848
}
4949
if req, body := testRequest(t, ts, "HEAD", "/", nil); body != "" || req.StatusCode != 404 {
50-
t.Fatalf(body)
50+
t.Fatal(body)
5151
}
5252

5353
if _, body := testRequest(t, ts, "GET", "/articles/5", nil); body != "article:5" {
54-
t.Fatalf(body)
54+
t.Fatal(body)
5555
}
5656
if req, body := testRequest(t, ts, "HEAD", "/articles/5", nil); body != "" || req.Header.Get("X-Article") != "5" {
5757
t.Fatalf("expecting X-Article header '5' but got '%s'", req.Header.Get("X-Article"))
5858
}
5959

6060
if _, body := testRequest(t, ts, "GET", "/users/1", nil); body != "user:1" {
61-
t.Fatalf(body)
61+
t.Fatal(body)
6262
}
6363
if req, body := testRequest(t, ts, "HEAD", "/users/1", nil); body != "" || req.Header.Get("X-User") != "-" {
6464
t.Fatalf("expecting X-User header '-' but got '%s'", req.Header.Get("X-User"))

‎middleware/url_format_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ func TestURLFormat(t *testing.T) {
3636
defer ts.Close()
3737

3838
if _, resp := testRequest(t, ts, "GET", "/articles/1.json", nil); resp != "1" {
39-
t.Fatalf(resp)
39+
t.Fatal(resp)
4040
}
4141
if _, resp := testRequest(t, ts, "GET", "/articles/1.xml", nil); resp != "1" {
42-
t.Fatalf(resp)
42+
t.Fatal(resp)
4343
}
4444
if _, resp := testRequest(t, ts, "GET", "/samples/articles/samples.1.json", nil); resp != "1" {
45-
t.Fatalf(resp)
45+
t.Fatal(resp)
4646
}
4747
if _, resp := testRequest(t, ts, "GET", "/samples/articles/samples.1.xml", nil); resp != "1" {
48-
t.Fatalf(resp)
48+
t.Fatal(resp)
4949
}
5050
}
5151

@@ -64,6 +64,6 @@ func TestURLFormatInSubRouter(t *testing.T) {
6464
defer ts.Close()
6565

6666
if _, resp := testRequest(t, ts, "GET", "/articles/1/subroute.json", nil); resp != "1" {
67-
t.Fatalf(resp)
67+
t.Fatal(resp)
6868
}
6969
}

‎mux_test.go‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ func TestMuxMounts(t *testing.T) {
233233
defer ts.Close()
234234

235235
if _, body := testRequest(t, ts, "GET", "/sharing/aBc", nil); body != "/aBc" {
236-
t.Fatalf(body)
236+
t.Fatal(body)
237237
}
238238
if _, body := testRequest(t, ts, "GET", "/sharing/aBc/share", nil); body != "/aBc/share" {
239-
t.Fatalf(body)
239+
t.Fatal(body)
240240
}
241241
if _, body := testRequest(t, ts, "GET", "/sharing/aBc/share/twitter", nil); body != "/aBc/share/twitter" {
242-
t.Fatalf(body)
242+
t.Fatal(body)
243243
}
244244
}
245245

@@ -257,10 +257,10 @@ func TestMuxPlain(t *testing.T) {
257257
defer ts.Close()
258258

259259
if _, body := testRequest(t, ts, "GET", "/hi", nil); body != "bye" {
260-
t.Fatalf(body)
260+
t.Fatal(body)
261261
}
262262
if _, body := testRequest(t, ts, "GET", "/nothing-here", nil); body != "nothing here" {
263-
t.Fatalf(body)
263+
t.Fatal(body)
264264
}
265265
}
266266

@@ -273,11 +273,11 @@ func TestMuxEmptyRoutes(t *testing.T) {
273273
mux.Handle("/api*", apiRouter)
274274

275275
if _, body := testHandler(t, mux, "GET", "/", nil); body != "404 page not found\n" {
276-
t.Fatalf(body)
276+
t.Fatal(body)
277277
}
278278

279279
if _, body := testHandler(t, apiRouter, "GET", "/", nil); body != "404 page not found\n" {
280-
t.Fatalf(body)
280+
t.Fatal(body)
281281
}
282282
}
283283

@@ -304,13 +304,13 @@ func TestMuxTrailingSlash(t *testing.T) {
304304
defer ts.Close()
305305

306306
if _, body := testRequest(t, ts, "GET", "/accounts/admin", nil); body != "admin" {
307-
t.Fatalf(body)
307+
t.Fatal(body)
308308
}
309309
if _, body := testRequest(t, ts, "GET", "/accounts/admin/", nil); body != "admin" {
310-
t.Fatalf(body)
310+
t.Fatal(body)
311311
}
312312
if _, body := testRequest(t, ts, "GET", "/nothing-here", nil); body != "nothing here" {
313-
t.Fatalf(body)
313+
t.Fatal(body)
314314
}
315315
}
316316

@@ -371,24 +371,24 @@ func TestMuxNestedNotFound(t *testing.T) {
371371
defer ts.Close()
372372

373373
if _, body := testRequest(t, ts, "GET", "/hi", nil); body != "bye" {
374-
t.Fatalf(body)
374+
t.Fatal(body)
375375
}
376376
if _, body := testRequest(t, ts, "GET", "/nothing-here", nil); body != "root 404 mw with" {
377-
t.Fatalf(body)
377+
t.Fatal(body)
378378
}
379379
if _, body := testRequest(t, ts, "GET", "/admin1/sub", nil); body != "sub" {
380-
t.Fatalf(body)
380+
t.Fatal(body)
381381
}
382382
if _, body := testRequest(t, ts, "GET", "/admin1/nope", nil); body != "sub 404 mw2" {
383-
t.Fatalf(body)
383+
t.Fatal(body)
384384
}
385385
if _, body := testRequest(t, ts, "GET", "/admin2/sub", nil); body != "sub2" {
386-
t.Fatalf(body)
386+
t.Fatal(body)
387387
}
388388

389389
// Not found pages should bubble up to the root.
390390
if _, body := testRequest(t, ts, "GET", "/admin2/nope", nil); body != "root 404 mw with" {
391-
t.Fatalf(body)
391+
t.Fatal(body)
392392
}
393393
}
394394

@@ -470,28 +470,28 @@ func TestMuxNestedMethodNotAllowed(t *testing.T) {
470470
defer ts.Close()
471471

472472
if _, body := testRequest(t, ts, "GET", "/root", nil); body != "root" {
473-
t.Fatalf(body)
473+
t.Fatal(body)
474474
}
475475
if _, body := testRequest(t, ts, "PUT", "/root", nil); body != "root 405" {
476-
t.Fatalf(body)
476+
t.Fatal(body)
477477
}
478478
if _, body := testRequest(t, ts, "GET", "/prefix1/sub1", nil); body != "sub1" {
479-
t.Fatalf(body)
479+
t.Fatal(body)
480480
}
481481
if _, body := testRequest(t, ts, "PUT", "/prefix1/sub1", nil); body != "sub1 405" {
482-
t.Fatalf(body)
482+
t.Fatal(body)
483483
}
484484
if _, body := testRequest(t, ts, "GET", "/prefix2/sub2", nil); body != "sub2" {
485-
t.Fatalf(body)
485+
t.Fatal(body)
486486
}
487487
if _, body := testRequest(t, ts, "PUT", "/prefix2/sub2", nil); body != "root 405" {
488-
t.Fatalf(body)
488+
t.Fatal(body)
489489
}
490490
if _, body := testRequest(t, ts, "GET", "/pathVar/myvar", nil); body != "pv" {
491-
t.Fatalf(body)
491+
t.Fatal(body)
492492
}
493493
if _, body := testRequest(t, ts, "DELETE", "/pathVar/myvar", nil); body != "pv 405" {
494-
t.Fatalf(body)
494+
t.Fatal(body)
495495
}
496496
}
497497

@@ -532,39 +532,39 @@ func TestMuxComplicatedNotFound(t *testing.T) {
532532

533533
// check that we didn't break correct routes
534534
if _, body := testRequest(t, ts, "GET", "/auth", nil); body != "auth get" {
535-
t.Fatalf(body)
535+
t.Fatal(body)
536536
}
537537
if _, body := testRequest(t, ts, "GET", "/public", nil); body != "public get" {
538-
t.Fatalf(body)
538+
t.Fatal(body)
539539
}
540540
if _, body := testRequest(t, ts, "GET", "/public/", nil); body != "public get" {
541-
t.Fatalf(body)
541+
t.Fatal(body)
542542
}
543543
if _, body := testRequest(t, ts, "GET", "/private/resource", nil); body != "private get" {
544-
t.Fatalf(body)
544+
t.Fatal(body)
545545
}
546546
// check custom not-found on all levels
547547
if _, body := testRequest(t, ts, "GET", "/nope", nil); body != "custom not-found" {
548-
t.Fatalf(body)
548+
t.Fatal(body)
549549
}
550550
if _, body := testRequest(t, ts, "GET", "/public/nope", nil); body != "custom not-found" {
551-
t.Fatalf(body)
551+
t.Fatal(body)
552552
}
553553
if _, body := testRequest(t, ts, "GET", "/private/nope", nil); body != "custom not-found" {
554-
t.Fatalf(body)
554+
t.Fatal(body)
555555
}
556556
if _, body := testRequest(t, ts, "GET", "/private/resource/nope", nil); body != "custom not-found" {
557-
t.Fatalf(body)
557+
t.Fatal(body)
558558
}
559559
if _, body := testRequest(t, ts, "GET", "/private_mw/nope", nil); body != "custom not-found" {
560-
t.Fatalf(body)
560+
t.Fatal(body)
561561
}
562562
if _, body := testRequest(t, ts, "GET", "/private_mw/resource/nope", nil); body != "custom not-found" {
563-
t.Fatalf(body)
563+
t.Fatal(body)
564564
}
565565
// check custom not-found on trailing slash routes
566566
if _, body := testRequest(t, ts, "GET", "/auth/", nil); body != "custom not-found" {
567-
t.Fatalf(body)
567+
t.Fatal(body)
568568
}
569569
}
570570

@@ -621,10 +621,10 @@ func TestMuxWith(t *testing.T) {
621621
defer ts.Close()
622622

623623
if _, body := testRequest(t, ts, "GET", "/hi", nil); body != "bye" {
624-
t.Fatalf(body)
624+
t.Fatal(body)
625625
}
626626
if _, body := testRequest(t, ts, "GET", "/inline", nil); body != "inline yes yes" {
627-
t.Fatalf(body)
627+
t.Fatal(body)
628628
}
629629
if cmwInit1 != 1 {
630630
t.Fatalf("expecting cmwInit1 to be 1, got %d", cmwInit1)
@@ -1497,7 +1497,7 @@ func TestMountingSimilarPattern(t *testing.T) {
14971497
defer ts.Close()
14981498

14991499
if _, body := testRequest(t, ts, "GET", "/hi", nil); body != "bye" {
1500-
t.Fatalf(body)
1500+
t.Fatal(body)
15011501
}
15021502
}
15031503

@@ -1514,10 +1514,10 @@ func TestMuxEmptyParams(t *testing.T) {
15141514
defer ts.Close()
15151515

15161516
if _, body := testRequest(t, ts, "GET", "/users/a/b/c", nil); body != "a-b-c" {
1517-
t.Fatalf(body)
1517+
t.Fatal(body)
15181518
}
15191519
if _, body := testRequest(t, ts, "GET", "/users///c", nil); body != "--c" {
1520-
t.Fatalf(body)
1520+
t.Fatal(body)
15211521
}
15221522
}
15231523

@@ -1536,10 +1536,10 @@ func TestMuxMissingParams(t *testing.T) {
15361536
defer ts.Close()
15371537

15381538
if _, body := testRequest(t, ts, "GET", "/user/123", nil); body != "userId = '123'" {
1539-
t.Fatalf(body)
1539+
t.Fatal(body)
15401540
}
15411541
if _, body := testRequest(t, ts, "GET", "/user/", nil); body != "nothing here" {
1542-
t.Fatalf(body)
1542+
t.Fatal(body)
15431543
}
15441544
}
15451545

@@ -1581,7 +1581,7 @@ func TestMuxRegexp(t *testing.T) {
15811581
defer ts.Close()
15821582

15831583
if _, body := testRequest(t, ts, "GET", "//test", nil); body != "Hi: " {
1584-
t.Fatalf(body)
1584+
t.Fatal(body)
15851585
}
15861586
}
15871587

@@ -1594,10 +1594,10 @@ func TestMuxRegexp2(t *testing.T) {
15941594
defer ts.Close()
15951595

15961596
if _, body := testRequest(t, ts, "GET", "/foo-.json", nil); body != "" {
1597-
t.Fatalf(body)
1597+
t.Fatal(body)
15981598
}
15991599
if _, body := testRequest(t, ts, "GET", "/foo-abc.json", nil); body != "abc" {
1600-
t.Fatalf(body)
1600+
t.Fatal(body)
16011601
}
16021602
}
16031603

@@ -1629,16 +1629,16 @@ func TestMuxRegexp3(t *testing.T) {
16291629
defer ts.Close()
16301630

16311631
if _, body := testRequest(t, ts, "GET", "/one/hello/peter/first", nil); body != "first" {
1632-
t.Fatalf(body)
1632+
t.Fatal(body)
16331633
}
16341634
if _, body := testRequest(t, ts, "GET", "/one/hithere/123/second", nil); body != "second" {
1635-
t.Fatalf(body)
1635+
t.Fatal(body)
16361636
}
16371637
if _, body := testRequest(t, ts, "DELETE", "/one/hithere/123/second", nil); body != "third" {
1638-
t.Fatalf(body)
1638+
t.Fatal(body)
16391639
}
16401640
if _, body := testRequest(t, ts, "DELETE", "/one/123", nil); body != "forth" {
1641-
t.Fatalf(body)
1641+
t.Fatal(body)
16421642
}
16431643
}
16441644

@@ -1661,16 +1661,16 @@ func TestMuxSubrouterWildcardParam(t *testing.T) {
16611661
defer ts.Close()
16621662

16631663
if _, body := testRequest(t, ts, "GET", "/bare/hi", nil); body != "param:hi *:" {
1664-
t.Fatalf(body)
1664+
t.Fatal(body)
16651665
}
16661666
if _, body := testRequest(t, ts, "GET", "/bare/hi/yes", nil); body != "param:hi *:yes" {
1667-
t.Fatalf(body)
1667+
t.Fatal(body)
16681668
}
16691669
if _, body := testRequest(t, ts, "GET", "/case0/hi", nil); body != "param:hi *:" {
1670-
t.Fatalf(body)
1670+
t.Fatal(body)
16711671
}
16721672
if _, body := testRequest(t, ts, "GET", "/case0/hi/yes", nil); body != "param:hi *:yes" {
1673-
t.Fatalf(body)
1673+
t.Fatal(body)
16741674
}
16751675
}
16761676

@@ -1746,7 +1746,7 @@ func TestEscapedURLParams(t *testing.T) {
17461746
defer ts.Close()
17471747

17481748
if _, body := testRequest(t, ts, "GET", "/api/http:%2f%2fexample.com%2fimage.png/full/max/0/color.png", nil); body != "success" {
1749-
t.Fatalf(body)
1749+
t.Fatal(body)
17501750
}
17511751
}
17521752

@@ -1769,10 +1769,10 @@ func TestCustomHTTPMethod(t *testing.T) {
17691769
defer ts.Close()
17701770

17711771
if _, body := testRequest(t, ts, "GET", "/", nil); body != "." {
1772-
t.Fatalf(body)
1772+
t.Fatal(body)
17731773
}
17741774
if _, body := testRequest(t, ts, "BOO", "/hi", nil); body != "custom method" {
1775-
t.Fatalf(body)
1775+
t.Fatal(body)
17761776
}
17771777
}
17781778

@@ -1948,7 +1948,7 @@ func TestServerBaseContext(t *testing.T) {
19481948
defer ts.Close()
19491949

19501950
if _, body := testRequest(t, ts, "GET", "/", nil); body != "yes" {
1951-
t.Fatalf(body)
1951+
t.Fatal(body)
19521952
}
19531953
}
19541954

0 commit comments

Comments
 (0)