Skip to content

Commit

Permalink
Merge pull request #5014 from tonistiigi/0610-testifylint
Browse files Browse the repository at this point in the history 
lint: more testifylint fixes
  • Loading branch information
@AkihiroSuda
AkihiroSuda committed Jun 11, 2024
2 parents 715276d + fc936ae commit eed17a4
Show file tree
Hide file tree
Showing 20 changed files with 102 additions and 101 deletions.
6 changes: 3 additions & 3 deletions cache/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ func TestSnapshotExtract(t *testing.T) {

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

require.Equal(t, len(buf.all), 1)
require.Equal(t, 1, len(buf.all))

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

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

require.Equal(t, len(buf.all), 0)
require.Equal(t, 0, len(buf.all))

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

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

require.Equal(t, len(buf.all), 2)
require.Equal(t, 2, len(buf.all))

dirs, err = os.ReadDir(filepath.Join(tmpdir, "snapshots/snapshots"))
require.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion client/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ func testUnknownBuildID(t *testing.T, sb integration.Sandbox) {
_, err = g.Ping(ctx, &gatewayapi.PingRequest{})
require.Error(t, err)
require.Contains(t, err.Error(), "no such job")
require.Equal(t, grpcerrors.Code(err), codes.NotFound)
require.Equal(t, codes.NotFound, grpcerrors.Code(err))
}

// testClientGatewayContainerCancelOnRelease is testing that all running
Expand Down
36 changes: 18 additions & 18 deletions client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ func testCgroupParent(t *testing.T, sb integration.Sandbox) {

dt, err = os.ReadFile(filepath.Join(destDir, "second.error"))
require.NoError(t, err)
require.Equal(t, strings.TrimSpace(string(dt)), "")
require.Equal(t, "", strings.TrimSpace(string(dt)))
}

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

require.Equal(t, server.Stats("/foo").AllRequests, 1)
require.Equal(t, server.Stats("/foo").CachedRequests, 0)
require.Equal(t, 1, server.Stats("/foo").AllRequests)
require.Equal(t, 0, server.Stats("/foo").CachedRequests)

tmpdir := t.TempDir()

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

require.Equal(t, server.Stats("/foo").AllRequests, 4)
require.Equal(t, server.Stats("/foo").CachedRequests, 1)
require.Equal(t, 4, server.Stats("/foo").AllRequests)
require.Equal(t, 1, server.Stats("/foo").CachedRequests)

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

require.Equal(t, server.Stats("/foo").AllRequests, 5)
require.Equal(t, server.Stats("/foo").CachedRequests, 1)
require.Equal(t, 5, server.Stats("/foo").AllRequests)
require.Equal(t, 1, server.Stats("/foo").CachedRequests)

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

checkAllReleasable(t, c, sb, true)

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

require.Equal(t, len(tms), 3)
require.Equal(t, 3, len(tms))

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

require.Equal(t, len(tms), 3)
require.Equal(t, 3, len(tms))

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

require.Equal(t, len(m), 2)
require.Equal(t, 2, len(m))

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

item, ok := m["foo"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
require.Equal(t, []byte("first"), item.Data)

item, ok = m["bar"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeSymlink)
require.Equal(t, tar.TypeSymlink, int32(item.Header.Typeflag))
require.Equal(t, "foo", item.Header.Linkname)
}

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

item, ok := m["data"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
require.Equal(t, []byte("uncompressed"), item.Data)

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

item, ok = m["data"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
require.Equal(t, []byte("gzip"), item.Data)

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

item, ok = m["data"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
require.Equal(t, []byte("uncompressed"), item.Data)

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

item, ok = m["data"]
require.True(t, ok)
require.Equal(t, int32(item.Header.Typeflag), tar.TypeReg)
require.Equal(t, tar.TypeReg, int32(item.Header.Typeflag))
require.Equal(t, []byte("gzip"), item.Data)
}

Expand Down
2 changes: 1 addition & 1 deletion client/llb/definition_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestDefinitionEquivalence(t *testing.T) {

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

for dgst := range def.Metadata {
Expand Down
16 changes: 8 additions & 8 deletions client/llb/fileop_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ func TestFileMkdir(t *testing.T) {
require.Equal(t, m[dgst], arr[1])

f := arr[1].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, arr[0], m[arr[1].Inputs[0].Digest])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))

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

f := arr[0].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))

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

f := arr[1].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))

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

f := arr[1].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))

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

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

f = arr[1].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))
require.Equal(t, 3, len(f.Actions))
Expand Down Expand Up @@ -673,7 +673,7 @@ func TestFileCreatedTime(t *testing.T) {
require.Equal(t, m[dgst], arr[1])

f := arr[1].Op.(*pb.Op_File).File
require.Equal(t, len(arr[1].Inputs), 1)
require.Equal(t, 1, len(arr[1].Inputs))
require.Equal(t, m[arr[1].Inputs[0].Digest], arr[0])
require.Equal(t, 0, int(arr[1].Inputs[0].Index))

Expand Down
8 changes: 4 additions & 4 deletions client/llb/llbbuild/llbbuild_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func TestMarshal(t *testing.T) {
buildop := op.GetBuild()
require.NotNil(t, buildop)

require.Equal(t, len(op.Inputs), 1)
require.Equal(t, 1, len(op.Inputs))
require.Equal(t, buildop.Builder, pb.LLBBuilder)
require.Equal(t, len(buildop.Inputs), 1)
require.Equal(t, buildop.Inputs[pb.LLBDefinitionInput], &pb.BuildInput{Input: pb.InputIndex(0)})
require.Equal(t, 1, len(buildop.Inputs))
require.Equal(t, &pb.BuildInput{Input: pb.InputIndex(0)}, buildop.Inputs[pb.LLBDefinitionInput])

require.Equal(t, buildop.Attrs[pb.AttrLLBDefinitionFilename], "myfilename")
require.Equal(t, "myfilename", buildop.Attrs[pb.AttrLLBDefinitionFilename])
}

func newDummyOutput(key string) llb.Output {
Expand Down
10 changes: 5 additions & 5 deletions client/llb/meta_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import (

func TestRelativeWd(t *testing.T) {
st := Scratch().Dir("foo")
assert.Equal(t, getDirHelper(t, st), "/foo")
assert.Equal(t, "/foo", getDirHelper(t, st))

st = st.Dir("bar")
assert.Equal(t, getDirHelper(t, st), "/foo/bar")
assert.Equal(t, "/foo/bar", getDirHelper(t, st))

st = st.Dir("..")
assert.Equal(t, getDirHelper(t, st), "/foo")
assert.Equal(t, "/foo", getDirHelper(t, st))

st = st.Dir("/baz")
assert.Equal(t, getDirHelper(t, st), "/baz")
assert.Equal(t, "/baz", getDirHelper(t, st))

st = st.Dir("../../..")
assert.Equal(t, getDirHelper(t, st), "/")
assert.Equal(t, "/", getDirHelper(t, st))
}

func getDirHelper(t *testing.T, s State) string {
Expand Down
4 changes: 2 additions & 2 deletions cmd/buildctl/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func testBuildLocalExporter(t *testing.T, sb integration.Sandbox) {

dt, err := os.ReadFile(filepath.Join(tmpdir, "foo"))
require.NoError(t, err)
require.Equal(t, string(dt), "bar")
require.Equal(t, "bar", string(dt))
}

func testBuildContainerdExporter(t *testing.T, sb integration.Sandbox) {
Expand Down Expand Up @@ -109,7 +109,7 @@ func testBuildContainerdExporter(t *testing.T, sb integration.Sandbox) {
}
ok, err := img.IsUnpacked(ctx, snapshotter)
require.NoError(t, err)
require.Equal(t, ok, true)
require.Equal(t, true, ok)
}

func testBuildMetadataFile(t *testing.T, sb integration.Sandbox) {
Expand Down
20 changes: 10 additions & 10 deletions cmd/buildkitd/config/load_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,16 @@ searchDomains=["example.com"]
require.Equal(t, 1, len(cfg.Workers.Containerd.GCPolicy[0].Filters))
require.Equal(t, 0, len(cfg.Workers.Containerd.GCPolicy[1].Filters))

require.Equal(t, *cfg.Registries["docker.io"].PlainHTTP, true)
require.Equal(t, *cfg.Registries["docker.io"].Insecure, true)
require.Equal(t, cfg.Registries["docker.io"].Mirrors[0], "hub.docker.io")
require.Equal(t, cfg.Registries["docker.io"].RootCAs, []string{"myca.pem"})
require.Equal(t, cfg.Registries["docker.io"].TLSConfigDir, []string{"/etc/buildkitd/myregistry"})
require.Equal(t, cfg.Registries["docker.io"].KeyPairs[0].Key, "key.pem")
require.Equal(t, cfg.Registries["docker.io"].KeyPairs[0].Certificate, "cert.pem")
require.Equal(t, true, *cfg.Registries["docker.io"].PlainHTTP)
require.Equal(t, true, *cfg.Registries["docker.io"].Insecure)
require.Equal(t, "hub.docker.io", cfg.Registries["docker.io"].Mirrors[0])
require.Equal(t, []string{"myca.pem"}, cfg.Registries["docker.io"].RootCAs)
require.Equal(t, []string{"/etc/buildkitd/myregistry"}, cfg.Registries["docker.io"].TLSConfigDir)
require.Equal(t, "key.pem", cfg.Registries["docker.io"].KeyPairs[0].Key)
require.Equal(t, "cert.pem", cfg.Registries["docker.io"].KeyPairs[0].Certificate)

require.NotNil(t, cfg.DNS)
require.Equal(t, cfg.DNS.Nameservers, []string{"1.1.1.1", "8.8.8.8"})
require.Equal(t, cfg.DNS.SearchDomains, []string{"example.com"})
require.Equal(t, cfg.DNS.Options, []string{"edns0"})
require.Equal(t, []string{"1.1.1.1", "8.8.8.8"}, cfg.DNS.Nameservers)
require.Equal(t, []string{"example.com"}, cfg.DNS.SearchDomains)
require.Equal(t, []string{"edns0"}, cfg.DNS.Options)
}
13 changes: 7 additions & 6 deletions executor/resources/memory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

resourcestypes "github.com/moby/buildkit/executor/resources/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

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

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

memoryEventsContents := `low 4
high 3
max 2
oom 1
oom_kill 5`
err = os.WriteFile(filepath.Join(testDir, memoryEventsFile), []byte(memoryEventsContents), 0644)
assert.NoError(t, err)
require.NoError(t, err)

err = os.WriteFile(filepath.Join(testDir, memoryPeakFile), []byte("123456"), 0644)
assert.NoError(t, err)
require.NoError(t, err)

err = os.WriteFile(filepath.Join(testDir, memorySwapCurrentFile), []byte("987654"), 0644)
assert.NoError(t, err)
require.NoError(t, err)

memoryStat, err := getCgroupMemoryStat(testDir)
assert.NoError(t, err)
require.NoError(t, err)

var expectedPressure = &resourcestypes.Pressure{
Some: &resourcestypes.PressureValues{
Expand Down
2 changes: 1 addition & 1 deletion executor/resources/pids_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestParsePidsStat(t *testing.T) {
testDir := t.TempDir()

err := os.WriteFile(filepath.Join(testDir, "pids.current"), []byte("123"), 0644)
assert.NoError(t, err)
require.NoError(t, err)

expectedPidsStat := &resourcestypes.PIDsStat{
Current: uint64Ptr(123),
Expand Down

0 comments on commit eed17a4

Please sign in to comment.