Skip to content

Commit e648543

Browse files
mmorel-35mmorel-35
committed
ci: enable all rules for testifylint- moby#7025
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
1 parent 30fe6a5 commit e648543

77 files changed

Lines changed: 314 additions & 619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.golangci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ linters:
105105
- bool-compare
106106
- len
107107
- negative-positive
108+
enable-all: true
108109
exclusions:
109110
generated: lax
110111
presets:

‎cache/contenthash/checksum_test.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -512,12 +512,10 @@ func TestSymlinksNoFollow(t *testing.T) {
512512
require.Equal(t, expectedSym, dgst)
513513

514514
_, err = cc.Checksum(context.TODO(), ref, "foo/ghi", ChecksumOpts{FollowLinks: true, Wildcard: true}, nil) // same because broken symlink
515-
require.Error(t, err)
516-
require.Equal(t, true, errors.Is(err, errNotFound))
515+
require.ErrorIs(t, err, errNotFound)
517516

518517
_, err = cc.Checksum(context.TODO(), ref, "y1", ChecksumOpts{FollowLinks: true, Wildcard: true}, nil)
519-
require.Error(t, err)
520-
require.Equal(t, true, errors.Is(err, errNotFound))
518+
require.ErrorIs(t, err, errNotFound)
521519

522520
dgst, err = cc.Checksum(context.TODO(), ref, "sym", ChecksumOpts{}, nil)
523521
require.NoError(t, err)
@@ -611,8 +609,7 @@ func TestChecksumBasicFile(t *testing.T) {
611609
require.Equal(t, dgstFileData0, dgst)
612610

613611
_, err = cc.Checksum(context.TODO(), ref, "d0/ghi", ChecksumOpts{FollowLinks: true}, nil)
614-
require.Error(t, err)
615-
require.Equal(t, true, errors.Is(err, errNotFound))
612+
require.ErrorIs(t, err, errNotFound)
616613

617614
dgst, err = cc.Checksum(context.TODO(), ref, "/", ChecksumOpts{FollowLinks: true}, nil)
618615
require.NoError(t, err)
@@ -1062,12 +1059,10 @@ func TestHandleChange(t *testing.T) {
10621059
require.NoError(t, err)
10631060

10641061
_, err = cc.Checksum(context.TODO(), ref, "d0", ChecksumOpts{FollowLinks: true}, nil)
1065-
require.Error(t, err)
1066-
require.Equal(t, true, errors.Is(err, errNotFound))
1062+
require.ErrorIs(t, err, errNotFound)
10671063

10681064
_, err = cc.Checksum(context.TODO(), ref, "d0/abc", ChecksumOpts{FollowLinks: true}, nil)
1069-
require.Error(t, err)
1070-
require.Equal(t, true, errors.Is(err, errNotFound))
1065+
require.ErrorIs(t, err, errNotFound)
10711066

10721067
err = ref.Release(context.TODO())
10731068
require.NoError(t, err)

‎cache/manager_test.go‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ func TestManager(t *testing.T) {
238238
require.NoError(t, err)
239239

240240
_, err = cm.GetMutable(ctx, active.ID())
241-
require.Error(t, err)
242-
require.Equal(t, true, errors.Is(err, ErrLocked))
241+
require.ErrorIs(t, err, ErrLocked)
243242

244243
checkDiskUsage(ctx, t, cm, 1, 0)
245244

@@ -249,8 +248,7 @@ func TestManager(t *testing.T) {
249248
checkDiskUsage(ctx, t, cm, 1, 0)
250249

251250
_, err = cm.GetMutable(ctx, active.ID())
252-
require.Error(t, err)
253-
require.Equal(t, true, errors.Is(err, ErrLocked))
251+
require.ErrorIs(t, err, ErrLocked)
254252

255253
err = snap.Release(ctx)
256254
require.NoError(t, err)
@@ -274,12 +272,10 @@ func TestManager(t *testing.T) {
274272
require.NoError(t, err)
275273

276274
_, err = cm.GetMutable(ctx, active.ID())
277-
require.Error(t, err)
278-
require.Equal(t, true, errors.Is(err, errNotFound))
275+
require.ErrorIs(t, err, errNotFound)
279276

280277
_, err = cm.GetMutable(ctx, snap.ID())
281-
require.Error(t, err)
282-
require.Equal(t, true, errors.Is(err, errInvalid))
278+
require.ErrorIs(t, err, errInvalid)
283279

284280
snap, err = cm.Get(ctx, snap.ID(), nil)
285281
require.NoError(t, err)
@@ -997,8 +993,7 @@ func TestLazyCommit(t *testing.T) {
997993
require.NoError(t, err)
998994

999995
_, err = cm.GetMutable(ctx, active.ID())
1000-
require.Error(t, err)
1001-
require.Equal(t, true, errors.Is(err, ErrLocked))
996+
require.ErrorIs(t, err, ErrLocked)
1002997

1003998
// immutable refs still work
1004999
snap2, err := cm.Get(ctx, snap.ID(), nil)
@@ -1018,8 +1013,7 @@ func TestLazyCommit(t *testing.T) {
10181013

10191014
// active can't be get while immutable is held
10201015
_, err = cm.GetMutable(ctx, active.ID())
1021-
require.Error(t, err)
1022-
require.Equal(t, true, errors.Is(err, ErrLocked))
1016+
require.ErrorIs(t, err, ErrLocked)
10231017

10241018
err = snap.Release(ctx)
10251019
require.NoError(t, err)
@@ -1031,8 +1025,7 @@ func TestLazyCommit(t *testing.T) {
10311025

10321026
// because ref was took mutable old immutable are cleared
10331027
_, err = cm.Get(ctx, snap.ID(), nil)
1034-
require.Error(t, err)
1035-
require.Equal(t, true, errors.Is(err, errNotFound))
1028+
require.ErrorIs(t, err, errNotFound)
10361029

10371030
snap, err = active2.Commit(ctx)
10381031
require.NoError(t, err)
@@ -1046,8 +1039,7 @@ func TestLazyCommit(t *testing.T) {
10461039

10471040
// mutable is gone after finalize
10481041
_, err = cm.GetMutable(ctx, active2.ID())
1049-
require.Error(t, err)
1050-
require.Equal(t, true, errors.Is(err, errNotFound))
1042+
require.ErrorIs(t, err, errNotFound)
10511043

10521044
// immutable still works
10531045
snap2, err = cm.Get(ctx, snap.ID(), nil)
@@ -1089,8 +1081,7 @@ func TestLazyCommit(t *testing.T) {
10891081
require.NoError(t, err)
10901082

10911083
_, err = cm.Get(ctx, snap.ID(), nil)
1092-
require.Error(t, err)
1093-
require.Equal(t, true, errors.Is(err, errNotFound))
1084+
require.ErrorIs(t, err, errNotFound)
10941085

10951086
snap, err = active.Commit(ctx)
10961087
require.NoError(t, err)
@@ -1119,8 +1110,7 @@ func TestLazyCommit(t *testing.T) {
11191110
require.NoError(t, err)
11201111

11211112
_, err = cm.GetMutable(ctx, active.ID())
1122-
require.Error(t, err)
1123-
require.Equal(t, true, errors.Is(err, errNotFound))
1113+
require.ErrorIs(t, err, errNotFound)
11241114
}
11251115

11261116
func TestLoopLeaseContent(t *testing.T) {

‎cache/util/fsutil_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ func TestSetErrorPath(t *testing.T) {
2727
// Set the path in the error to a new path.
2828
replaceErrorPath(err, "/my/new/path")
2929
require.NotContains(t, err.Error(), "a/b/c")
30-
require.Contains(t, err.Error(), "/my/new/path")
30+
require.ErrorContains(t, err, "/my/new/path")
3131
}

‎client/client_cache_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,7 @@ func testCacheExportCacheDeletedContent(t *testing.T, sb integration.Sandbox) {
480480
var runLayer *int
481481
for i, l := range cc.Layers {
482482
if l.ParentIndex != -1 {
483-
if runLayer != nil {
484-
t.Fatal("multiple RUN layers")
485-
}
483+
require.Nil(t, runLayer, "multiple RUN layers")
486484
runLayer = &i
487485
}
488486
}
@@ -720,7 +718,7 @@ func testCacheExportIgnoreError(t *testing.T, sb integration.Sandbox) {
720718
} else {
721719
require.Error(t, err)
722720
for _, errStr := range test.expectedErrors {
723-
require.Contains(t, err.Error(), errStr)
721+
require.ErrorContains(t, err, errStr)
724722
}
725723
}
726724
})

‎client/client_cdi_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,6 @@ func writeCDISpecFile(t *testing.T, sb integration.Sandbox, c *Client, csf ...cd
455455
return
456456
}
457457

458-
if now.After(deadline) {
459-
t.Fatal("timeout waiting for CDI devices to appear")
460-
}
458+
require.LessOrEqualf(t, now, deadline, "timeout waiting for CDI devices to appear")
461459
}
462460
}

‎client/client_exec_test.go‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,7 @@ func testSecurityModeErrors(t *testing.T, sb integration.Sandbox) {
427427
_, err = c.Solve(sb.Context(), def, SolveOpt{
428428
AllowedEntitlements: []string{entitlements.EntitlementSecurityInsecure.String()},
429429
}, nil)
430-
require.Error(t, err)
431-
require.Contains(t, err.Error(), "security.insecure is not allowed")
430+
require.ErrorContains(t, err, "security.insecure is not allowed")
432431
}
433432
if secMode == securityInsecure {
434433
st := llb.Image("busybox:latest").
@@ -438,8 +437,7 @@ func testSecurityModeErrors(t *testing.T, sb integration.Sandbox) {
438437
require.NoError(t, err)
439438

440439
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil)
441-
require.Error(t, err)
442-
require.Contains(t, err.Error(), "security.insecure is not allowed")
440+
require.ErrorContains(t, err, "security.insecure is not allowed")
443441
}
444442

445443
st := llb.Image("busybox:latest").
@@ -485,8 +483,7 @@ func testSecurityModeErrors(t *testing.T, sb integration.Sandbox) {
485483
require.True(t, foundExec)
486484

487485
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil)
488-
require.Error(t, err)
489-
require.Contains(t, err.Error(), "invalid security mode")
486+
require.ErrorContains(t, err, "invalid security mode")
490487
}
491488

492489
func testSecurityModeSysfs(t *testing.T, sb integration.Sandbox) {
@@ -528,9 +525,8 @@ func testSecurityModeSysfs(t *testing.T, sb integration.Sandbox) {
528525
}, nil)
529526

530527
if secMode == securitySandbox {
531-
require.Error(t, err)
532-
require.Contains(t, err.Error(), "did not complete successfully")
533-
require.Contains(t, err.Error(), "mkdir "+cg)
528+
require.ErrorContains(t, err, "did not complete successfully")
529+
require.ErrorContains(t, err, "mkdir "+cg)
534530
} else {
535531
require.NoError(t, err)
536532
}

‎client/client_export_image_test.go‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -902,21 +902,18 @@ func testExportedImageLabels(t *testing.T, sb integration.Sandbox) {
902902

903903
// layers should be deleted
904904
_, err = store.Info(ctx, mfst.Layers[1].Digest)
905-
require.Error(t, err)
906-
require.True(t, errors.Is(err, cerrdefs.ErrNotFound))
905+
require.ErrorIs(t, err, cerrdefs.ErrNotFound)
907906

908907
// config should be deleted
909908
_, err = store.Info(ctx, mfst.Config.Digest)
910-
require.Error(t, err)
911-
require.True(t, errors.Is(err, cerrdefs.ErrNotFound))
909+
require.ErrorIs(t, err, cerrdefs.ErrNotFound)
912910

913911
// buildkit contentstore still has the layer because it is multi-ns
914912
bkstore := proxy.NewContentStore(c.ContentClient())
915913

916914
// layer should be deleted as not kept by history
917915
_, err = bkstore.Info(ctx, mfst.Layers[1].Digest)
918-
require.Error(t, err)
919-
require.Contains(t, err.Error(), "not found")
916+
require.ErrorContains(t, err, "not found")
920917

921918
// config should still be there
922919
_, err = bkstore.Info(ctx, img.Metadata().Target.Digest)
@@ -1606,8 +1603,7 @@ func testPullWithDigestCheck(t *testing.T, sb integration.Sandbox) {
16061603
require.NoError(t, err)
16071604

16081605
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil)
1609-
require.Error(t, err)
1610-
require.Contains(t, err.Error(), fmt.Sprintf("image digest %s for %s does not match expected checksum %s", dgst2, name2, dgst1))
1606+
require.ErrorContains(t, err, fmt.Sprintf("image digest %s for %s does not match expected checksum %s", dgst2, name2, dgst1))
16111607
}
16121608

16131609
// testPullZstdImage verifies pulling and re-exporting a Zstd-compressed image.

‎client/client_fileop_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func testCopyFromEmptyImage(t *testing.T, sb integration.Sandbox) {
5252
"/foo: no such file or directory",
5353
winErrMsgs[i],
5454
)
55-
require.Contains(t, err.Error(), errMsg)
55+
require.ErrorContains(t, err, errMsg)
5656

5757
imgName := integration.UnixOrWindows(
5858
"busybox:latest",
@@ -514,7 +514,7 @@ func testFileOpInputSwap(t *testing.T, sb integration.Sandbox) {
514514
"bar: no such file",
515515
"bar: The system cannot find the file specified",
516516
)
517-
require.Contains(t, err.Error(), errStr)
517+
require.ErrorContains(t, err, errStr)
518518
}
519519

520520
func testFileOpMkdirMkfile(t *testing.T, sb integration.Sandbox) {

‎client/client_http_source_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) {
5252
require.NoError(t, err)
5353

5454
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil)
55-
require.Error(t, err)
56-
require.Contains(t, err.Error(), "invalid response status 404")
55+
require.ErrorContains(t, err, "invalid response status 404")
5756

5857
// first correct request
5958
st = llb.HTTP(server.URL + "/foo")

0 commit comments

Comments
 (0)