Skip to content

Commit eed17a4

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request moby#5014 from tonistiigi/0610-testifylint
lint: more testifylint fixes
2 parents 715276d + fc936ae commit eed17a4

File tree

20 files changed

+102
-101
lines changed

20 files changed

+102
-101
lines changed

‎cache/manager_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ func TestSnapshotExtract(t *testing.T) {
547547

548548
checkDiskUsage(ctx, t, cm, 1, 0)
549549

550-
require.Equal(t, len(buf.all), 1)
550+
require.Equal(t, 1, len(buf.all))
551551

552552
dirs, err = os.ReadDir(filepath.Join(tmpdir, "snapshots/snapshots"))
553553
require.NoError(t, err)
@@ -655,7 +655,7 @@ func TestExtractOnMutable(t *testing.T) {
655655

656656
checkDiskUsage(ctx, t, cm, 2, 0)
657657

658-
require.Equal(t, len(buf.all), 0)
658+
require.Equal(t, 0, len(buf.all))
659659

660660
dirs, err = os.ReadDir(filepath.Join(tmpdir, "snapshots/snapshots"))
661661
require.NoError(t, err)
@@ -673,7 +673,7 @@ func TestExtractOnMutable(t *testing.T) {
673673

674674
checkDiskUsage(ctx, t, cm, 0, 0)
675675

676-
require.Equal(t, len(buf.all), 2)
676+
require.Equal(t, 2, len(buf.all))
677677

678678
dirs, err = os.ReadDir(filepath.Join(tmpdir, "snapshots/snapshots"))
679679
require.NoError(t, err)

‎client/build_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func testUnknownBuildID(t *testing.T, sb integration.Sandbox) {
309309
_, err = g.Ping(ctx, &gatewayapi.PingRequest{})
310310
require.Error(t, err)
311311
require.Contains(t, err.Error(), "no such job")
312-
require.Equal(t, grpcerrors.Code(err), codes.NotFound)
312+
require.Equal(t, codes.NotFound, grpcerrors.Code(err))
313313
}
314314

315315
// testClientGatewayContainerCancelOnRelease is testing that all running

‎client/client_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ func testCgroupParent(t *testing.T, sb integration.Sandbox) {
945945

946946
dt, err = os.ReadFile(filepath.Join(destDir, "second.error"))
947947
require.NoError(t, err)
948-
require.Equal(t, strings.TrimSpace(string(dt)), "")
948+
require.Equal(t, "", strings.TrimSpace(string(dt)))
949949
}
950950

951951
func testNetworkMode(t *testing.T, sb integration.Sandbox) {
@@ -2611,8 +2611,8 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) {
26112611
_, err = c.Solve(sb.Context(), def, SolveOpt{}, nil)
26122612
require.NoError(t, err)
26132613

2614-
require.Equal(t, server.Stats("/foo").AllRequests, 1)
2615-
require.Equal(t, server.Stats("/foo").CachedRequests, 0)
2614+
require.Equal(t, 1, server.Stats("/foo").AllRequests)
2615+
require.Equal(t, 0, server.Stats("/foo").CachedRequests)
26162616

26172617
tmpdir := t.TempDir()
26182618

@@ -2669,8 +2669,8 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) {
26692669
}, nil)
26702670
require.NoError(t, err)
26712671

2672-
require.Equal(t, server.Stats("/foo").AllRequests, 4)
2673-
require.Equal(t, server.Stats("/foo").CachedRequests, 1)
2672+
require.Equal(t, 4, server.Stats("/foo").AllRequests)
2673+
require.Equal(t, 1, server.Stats("/foo").CachedRequests)
26742674

26752675
dt, err = os.ReadFile(filepath.Join(tmpdir, "foo"))
26762676
require.NoError(t, err)
@@ -2699,8 +2699,8 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) {
26992699
}, nil)
27002700
require.NoError(t, err)
27012701

2702-
require.Equal(t, server.Stats("/foo").AllRequests, 5)
2703-
require.Equal(t, server.Stats("/foo").CachedRequests, 1)
2702+
require.Equal(t, 5, server.Stats("/foo").AllRequests)
2703+
require.Equal(t, 1, server.Stats("/foo").CachedRequests)
27042704

27052705
dt, err = os.ReadFile(filepath.Join(tmpdir, "bar"))
27062706
require.NoError(t, err)
@@ -2709,7 +2709,7 @@ func testBuildHTTPSource(t *testing.T, sb integration.Sandbox) {
27092709
fi, err := os.Stat(filepath.Join(tmpdir, "bar"))
27102710
require.NoError(t, err)
27112711
require.Equal(t, fi.ModTime().Format(http.TimeFormat), modTime.Format(http.TimeFormat))
2712-
require.Equal(t, int(fi.Mode()&0777), 0741)
2712+
require.Equal(t, 0741, int(fi.Mode()&0777))
27132713

27142714
checkAllReleasable(t, c, sb, true)
27152715

@@ -3288,7 +3288,7 @@ func testSourceDateEpochLayerTimestamps(t *testing.T, sb integration.Sandbox) {
32883288
require.NoError(t, err)
32893289
tms := tmsX.FromImage
32903290

3291-
require.Equal(t, len(tms), 3)
3291+
require.Equal(t, 3, len(tms))
32923292

32933293
expected := tm.UTC().Format(time.RFC3339Nano)
32943294
require.Equal(t, expected, tms[0])
@@ -3458,7 +3458,7 @@ func testSourceDateEpochReset(t *testing.T, sb integration.Sandbox) {
34583458
require.NoError(t, err)
34593459
tms := tmsX.FromImage
34603460

3461-
require.Equal(t, len(tms), 3)
3461+
require.Equal(t, 3, len(tms))
34623462

34633463
expected := tm.UTC().Format(time.RFC3339Nano)
34643464
require.NotEqual(t, expected, tms[0])
@@ -3570,7 +3570,7 @@ func testSourceDateEpochTarExporter(t *testing.T, sb integration.Sandbox) {
35703570
m, err := testutil.ReadTarToMap(dt, false)
35713571
require.NoError(t, err)
35723572

3573-
require.Equal(t, len(m), 2)
3573+
require.Equal(t, 2, len(m))
35743574

35753575
require.Equal(t, tm.Format(time.RFC3339), m["foo"].Header.ModTime.Format(time.RFC3339))
35763576
require.Equal(t, tm.Format(time.RFC3339), m["bar"].Header.ModTime.Format(time.RFC3339))
@@ -3678,7 +3678,7 @@ func testFrontendMetadataReturn(t *testing.T, sb integration.Sandbox) {
36783678
}, "", frontend, nil)
36793679
require.NoError(t, err)
36803680
require.Contains(t, res.ExporterResponse, "frontend.returned")
3681-
require.Equal(t, res.ExporterResponse["frontend.returned"], "true")
3681+
require.Equal(t, "true", res.ExporterResponse["frontend.returned"])
36823682
require.NotContains(t, res.ExporterResponse, "not-frontend.not-returned")
36833683
require.NotContains(t, res.ExporterResponse, "frontendnot.returned.either")
36843684
checkAllReleasable(t, c, sb, true)
@@ -3860,12 +3860,12 @@ func testTarExporterSymlink(t *testing.T, sb integration.Sandbox) {
38603860

38613861
item, ok := m["foo"]
38623862
require.True(t, ok)
3863-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
3863+
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
38643864
require.Equal(t, []byte("first"), item.Data)
38653865

38663866
item, ok = m["bar"]
38673867
require.True(t, ok)
3868-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeSymlink)
3868+
require.Equal(t, tar.TypeSymlink, int32(item.Header.Typeflag))
38693869
require.Equal(t, "foo", item.Header.Linkname)
38703870
}
38713871

@@ -4108,7 +4108,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
41084108

41094109
item, ok := m["data"]
41104110
require.True(t, ok)
4111-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
4111+
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
41124112
require.Equal(t, []byte("uncompressed"), item.Data)
41134113

41144114
dt, err = content.ReadBlob(ctx, img.ContentStore(), ocispecs.Descriptor{Digest: mfst.Layers[1].Digest})
@@ -4119,7 +4119,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
41194119

41204120
item, ok = m["data"]
41214121
require.True(t, ok)
4122-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
4122+
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
41234123
require.Equal(t, []byte("gzip"), item.Data)
41244124

41254125
err = client.ImageService().Delete(ctx, compressedTarget, images.SynchronousDelete())
@@ -4153,7 +4153,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
41534153

41544154
item, ok = m["data"]
41554155
require.True(t, ok)
4156-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
4156+
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
41574157
require.Equal(t, []byte("uncompressed"), item.Data)
41584158

41594159
dt, err = content.ReadBlob(ctx, img.ContentStore(), ocispecs.Descriptor{Digest: mfst.Layers[1].Digest})
@@ -4164,7 +4164,7 @@ func testBuildExportWithUncompressed(t *testing.T, sb integration.Sandbox) {
41644164

41654165
item, ok = m["data"]
41664166
require.True(t, ok)
4167-
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
4167+
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
41684168
require.Equal(t, []byte("gzip"), item.Data)
41694169
}
41704170

‎client/llb/definition_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestDefinitionEquivalence(t *testing.T) {
5252

5353
for i := 0; i < len(def.Def); i++ {
5454
res := bytes.Compare(def.Def[i], def2.Def[i])
55-
require.Equal(t, res, 0)
55+
require.Equal(t, 0, res)
5656
}
5757

5858
for dgst := range def.Metadata {

‎client/llb/fileop_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ func TestFileMkdir(t *testing.T) {
2626
require.Equal(t, m[dgst], arr[1])
2727

2828
f := arr[1].Op.(*pb.Op_File).File
29-
require.Equal(t, len(arr[1].Inputs), 1)
30-
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
29+
require.Equal(t, 1, len(arr[1].Inputs))
30+
require.Equal(t, arr[0], m[arr[1].Inputs[0].Digest])
3131
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
3232

3333
require.Equal(t, 1, len(f.Actions))
@@ -113,7 +113,7 @@ func TestFileMkdirMkfile(t *testing.T) {
113113
require.Equal(t, m[dgst], arr[0])
114114

115115
f := arr[0].Op.(*pb.Op_File).File
116-
require.Equal(t, len(arr[1].Inputs), 1)
116+
require.Equal(t, 1, len(arr[1].Inputs))
117117
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
118118
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
119119

@@ -159,7 +159,7 @@ func TestFileMkfile(t *testing.T) {
159159
require.Equal(t, m[dgst], arr[1])
160160

161161
f := arr[1].Op.(*pb.Op_File).File
162-
require.Equal(t, len(arr[1].Inputs), 1)
162+
require.Equal(t, 1, len(arr[1].Inputs))
163163
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
164164
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
165165

@@ -194,7 +194,7 @@ func TestFileRm(t *testing.T) {
194194
require.Equal(t, m[dgst], arr[1])
195195

196196
f := arr[1].Op.(*pb.Op_File).File
197-
require.Equal(t, len(arr[1].Inputs), 1)
197+
require.Equal(t, 1, len(arr[1].Inputs))
198198
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
199199
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
200200

@@ -235,7 +235,7 @@ func TestFileSimpleChains(t *testing.T) {
235235
require.Equal(t, m[dgst], arr[2])
236236

237237
f := arr[2].Op.(*pb.Op_File).File
238-
require.Equal(t, len(arr[2].Inputs), 1)
238+
require.Equal(t, 1, len(arr[2].Inputs))
239239
require.Equal(t, m[arr[2].Inputs[0].Digest], arr[1])
240240
require.Equal(t, 0, int(arr[2].Inputs[0].Index))
241241
require.Equal(t, 2, len(f.Actions))
@@ -257,7 +257,7 @@ func TestFileSimpleChains(t *testing.T) {
257257
require.Equal(t, "/abc", mkfile.Path)
258258

259259
f = arr[1].Op.(*pb.Op_File).File
260-
require.Equal(t, len(arr[1].Inputs), 1)
260+
require.Equal(t, 1, len(arr[1].Inputs))
261261
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
262262
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
263263
require.Equal(t, 3, len(f.Actions))
@@ -673,7 +673,7 @@ func TestFileCreatedTime(t *testing.T) {
673673
require.Equal(t, m[dgst], arr[1])
674674

675675
f := arr[1].Op.(*pb.Op_File).File
676-
require.Equal(t, len(arr[1].Inputs), 1)
676+
require.Equal(t, 1, len(arr[1].Inputs))
677677
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
678678
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
679679

‎client/llb/llbbuild/llbbuild_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ func TestMarshal(t *testing.T) {
2626
buildop := op.GetBuild()
2727
require.NotNil(t, buildop)
2828

29-
require.Equal(t, len(op.Inputs), 1)
29+
require.Equal(t, 1, len(op.Inputs))
3030
require.Equal(t, buildop.Builder, pb.LLBBuilder)
31-
require.Equal(t, len(buildop.Inputs), 1)
32-
require.Equal(t, buildop.Inputs[pb.LLBDefinitionInput], &pb.BuildInput{Input: pb.InputIndex(0)})
31+
require.Equal(t, 1, len(buildop.Inputs))
32+
require.Equal(t, &pb.BuildInput{Input: pb.InputIndex(0)}, buildop.Inputs[pb.LLBDefinitionInput])
3333

34-
require.Equal(t, buildop.Attrs[pb.AttrLLBDefinitionFilename], "myfilename")
34+
require.Equal(t, "myfilename", buildop.Attrs[pb.AttrLLBDefinitionFilename])
3535
}
3636

3737
func newDummyOutput(key string) llb.Output {

‎client/llb/meta_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ import (
1010

1111
func TestRelativeWd(t *testing.T) {
1212
st := Scratch().Dir("foo")
13-
assert.Equal(t, getDirHelper(t, st), "/foo")
13+
assert.Equal(t, "/foo", getDirHelper(t, st))
1414

1515
st = st.Dir("bar")
16-
assert.Equal(t, getDirHelper(t, st), "/foo/bar")
16+
assert.Equal(t, "/foo/bar", getDirHelper(t, st))
1717

1818
st = st.Dir("..")
19-
assert.Equal(t, getDirHelper(t, st), "/foo")
19+
assert.Equal(t, "/foo", getDirHelper(t, st))
2020

2121
st = st.Dir("/baz")
22-
assert.Equal(t, getDirHelper(t, st), "/baz")
22+
assert.Equal(t, "/baz", getDirHelper(t, st))
2323

2424
st = st.Dir("../../..")
25-
assert.Equal(t, getDirHelper(t, st), "/")
25+
assert.Equal(t, "/", getDirHelper(t, st))
2626
}
2727

2828
func getDirHelper(t *testing.T, s State) string {

‎cmd/buildctl/build_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func testBuildLocalExporter(t *testing.T, sb integration.Sandbox) {
6565

6666
dt, err := os.ReadFile(filepath.Join(tmpdir, "foo"))
6767
require.NoError(t, err)
68-
require.Equal(t, string(dt), "bar")
68+
require.Equal(t, "bar", string(dt))
6969
}
7070

7171
func testBuildContainerdExporter(t *testing.T, sb integration.Sandbox) {
@@ -109,7 +109,7 @@ func testBuildContainerdExporter(t *testing.T, sb integration.Sandbox) {
109109
}
110110
ok, err := img.IsUnpacked(ctx, snapshotter)
111111
require.NoError(t, err)
112-
require.Equal(t, ok, true)
112+
require.Equal(t, true, ok)
113113
}
114114

115115
func testBuildMetadataFile(t *testing.T, sb integration.Sandbox) {

‎cmd/buildkitd/config/load_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ searchDomains=["example.com"]
125125
require.Equal(t, 1, len(cfg.Workers.Containerd.GCPolicy[0].Filters))
126126
require.Equal(t, 0, len(cfg.Workers.Containerd.GCPolicy[1].Filters))
127127

128-
require.Equal(t, *cfg.Registries["docker.io"].PlainHTTP, true)
129-
require.Equal(t, *cfg.Registries["docker.io"].Insecure, true)
130-
require.Equal(t, cfg.Registries["docker.io"].Mirrors[0], "hub.docker.io")
131-
require.Equal(t, cfg.Registries["docker.io"].RootCAs, []string{"myca.pem"})
132-
require.Equal(t, cfg.Registries["docker.io"].TLSConfigDir, []string{"/etc/buildkitd/myregistry"})
133-
require.Equal(t, cfg.Registries["docker.io"].KeyPairs[0].Key, "key.pem")
134-
require.Equal(t, cfg.Registries["docker.io"].KeyPairs[0].Certificate, "cert.pem")
128+
require.Equal(t, true, *cfg.Registries["docker.io"].PlainHTTP)
129+
require.Equal(t, true, *cfg.Registries["docker.io"].Insecure)
130+
require.Equal(t, "hub.docker.io", cfg.Registries["docker.io"].Mirrors[0])
131+
require.Equal(t, []string{"myca.pem"}, cfg.Registries["docker.io"].RootCAs)
132+
require.Equal(t, []string{"/etc/buildkitd/myregistry"}, cfg.Registries["docker.io"].TLSConfigDir)
133+
require.Equal(t, "key.pem", cfg.Registries["docker.io"].KeyPairs[0].Key)
134+
require.Equal(t, "cert.pem", cfg.Registries["docker.io"].KeyPairs[0].Certificate)
135135

136136
require.NotNil(t, cfg.DNS)
137-
require.Equal(t, cfg.DNS.Nameservers, []string{"1.1.1.1", "8.8.8.8"})
138-
require.Equal(t, cfg.DNS.SearchDomains, []string{"example.com"})
139-
require.Equal(t, cfg.DNS.Options, []string{"edns0"})
137+
require.Equal(t, []string{"1.1.1.1", "8.8.8.8"}, cfg.DNS.Nameservers)
138+
require.Equal(t, []string{"example.com"}, cfg.DNS.SearchDomains)
139+
require.Equal(t, []string{"edns0"}, cfg.DNS.Options)
140140
}

‎executor/resources/memory_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
resourcestypes "github.com/moby/buildkit/executor/resources/types"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestParseMemoryStat(t *testing.T) {
@@ -27,29 +28,29 @@ pgsteal 99
2728
pgfault 32711
2829
pgmajfault 12`
2930
err := os.WriteFile(filepath.Join(testDir, memoryStatFile), []byte(memoryStatContents), 0644)
30-
assert.NoError(t, err)
31+
require.NoError(t, err)
3132

3233
memoryPressureContents := `some avg10=1.23 avg60=4.56 avg300=7.89 total=3031
3334
full avg10=0.12 avg60=0.34 avg300=0.56 total=9876`
3435
err = os.WriteFile(filepath.Join(testDir, memoryPressureFile), []byte(memoryPressureContents), 0644)
35-
assert.NoError(t, err)
36+
require.NoError(t, err)
3637

3738
memoryEventsContents := `low 4
3839
high 3
3940
max 2
4041
oom 1
4142
oom_kill 5`
4243
err = os.WriteFile(filepath.Join(testDir, memoryEventsFile), []byte(memoryEventsContents), 0644)
43-
assert.NoError(t, err)
44+
require.NoError(t, err)
4445

4546
err = os.WriteFile(filepath.Join(testDir, memoryPeakFile), []byte("123456"), 0644)
46-
assert.NoError(t, err)
47+
require.NoError(t, err)
4748

4849
err = os.WriteFile(filepath.Join(testDir, memorySwapCurrentFile), []byte("987654"), 0644)
49-
assert.NoError(t, err)
50+
require.NoError(t, err)
5051

5152
memoryStat, err := getCgroupMemoryStat(testDir)
52-
assert.NoError(t, err)
53+
require.NoError(t, err)
5354

5455
var expectedPressure = &resourcestypes.Pressure{
5556
Some: &resourcestypes.PressureValues{

0 commit comments

Comments
 (0)