dilim/buildkit
1
0 Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-11-06 05:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: more testifylint fixes

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi committed 2024-06-10 21:16:51 -07:00
1 parent 715276d742
commit fc936ae3d7
20 files changed
+102 -101
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cache/manager_test.go
Vendored
+3 -3
View File
@@ -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)
@@ -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)
@@ -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)
client/build_test.go
+1 -1
View File
@@ -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
client/client_test.go
+18 -18
View File
@@ -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) {
@@ -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()
@@ -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)
@@ -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)
@@ -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)
@@ -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])
@@ -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])
@@ -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))
@@ -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)
@@ -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)
}
@@ -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})
@@ -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())
@@ -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})
@@ -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)
}
client/llb/definition_test.go
+1 -1
View File
@@ -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 {
client/llb/fileop_test.go
+8 -8
View File
@@ -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))
@@ -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))
@@ -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))
@@ -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))
@@ -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))
@@ -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))
@@ -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))
client/llb/llbbuild/llbbuild_test.go
+4 -4
View File
@@ -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 {
client/llb/meta_test.go
+5 -5
View File
@@ -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 {
cmd/buildctl/build_test.go
+2 -2
View File
@@ -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) {
@@ -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) {
cmd/buildkitd/config/load_test.go
+10 -10
View File
@@ -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)
}
executor/resources/memory_test.go
+7 -6
View File
@@ -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) {
@@ -27,12 +28,12 @@ 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
@@ -40,16 +41,16 @@ 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{
executor/resources/pids_test.go
+1 -1
View File
@@ -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),
frontend/dockerfile/dockerfile2llb/convert_test.go
+4 -4
View File
@@ -96,10 +96,10 @@ COPY f1 f2 /sub/
RUN ls -l
`
state, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
assert.NoError(t, err)
require.NoError(t, err)
_, err = state.Marshal(context.TODO())
assert.NoError(t, err)
require.NoError(t, err)
}
func TestAddEnv(t *testing.T) {
@@ -197,7 +197,7 @@ func TestDockerfileCircularDependencies(t *testing.T) {
COPY --from=stage0 f1 /sub/
`
_, _, _, _, err := Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
assert.EqualError(t, err, "circular dependency detected on stage: stage0")
require.EqualError(t, err, "circular dependency detected on stage: stage0")
// multiple stages with circular dependency
df = `FROM busybox AS stage0
@@ -208,7 +208,7 @@ FROM busybox AS stage2
COPY --from=stage1 f2 /sub/
`
_, _, _, _, err = Dockerfile2LLB(appcontext.Context(), []byte(df), ConvertOpt{})
assert.EqualError(t, err, "circular dependency detected on stage: stage0")
require.EqualError(t, err, "circular dependency detected on stage: stage0")
}
func TestBaseImageConfig(t *testing.T) {
frontend/dockerfile/dockerfile_test.go
+3 -3
View File
@@ -5479,7 +5479,7 @@ COPY --from=base /out /
dt, err := os.ReadFile(filepath.Join(destDir, "out"))
require.NoError(t, err)
require.True(t, len(dt) > 0)
require.Greater(t, len(dt), 0)
workers.CheckFeatureCompat(t, sb, workers.FeatureDirectPush)
@@ -5558,7 +5558,7 @@ COPY --from=base /env_foobar /
dt, err = os.ReadFile(filepath.Join(destDir, "out"))
require.NoError(t, err)
require.True(t, len(dt) > 0)
require.Greater(t, len(dt), 0)
dt, err = os.ReadFile(filepath.Join(destDir, "env_foobar"))
require.NoError(t, err)
@@ -5832,7 +5832,7 @@ COPY --from=base /o* /
dt, err := os.ReadFile(filepath.Join(destDir, "out"))
require.NoError(t, err)
require.True(t, len(dt) > 0)
require.Greater(t, len(dt), 0)
_, err = os.ReadFile(filepath.Join(destDir, "out2"))
require.Error(t, err)
solver/llbsolver/ops/file_test.go
+7 -7
View File
@@ -47,7 +47,7 @@ func TestMkdirMkfile(t *testing.T) {
inp := rb.NewRef("ref1")
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inp}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
rb.checkReleased(t, append(outs, inp))
o := outs[0].(*testFileRef)
@@ -179,7 +179,7 @@ func TestChownCopy(t *testing.T) {
inpDest := rb.NewRef("dest")
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inpSrc, inpDest}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
rb.checkReleased(t, append(outs, inpSrc, inpDest))
o := outs[0].(*testFileRef)
@@ -348,7 +348,7 @@ func TestMultiOutput(t *testing.T) {
inp := rb.NewRef("ref1")
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inp}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 2)
require.Equal(t, 2, len(outs))
rb.checkReleased(t, append(outs, inp))
o := outs[0].(*testFileRef)
@@ -396,7 +396,7 @@ func TestFileFromScratch(t *testing.T) {
s, rb := newTestFileSolver()
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
rb.checkReleased(t, outs)
o := outs[0].(*testFileRef)
@@ -430,7 +430,7 @@ func TestFileCopyInputSrc(t *testing.T) {
inp1 := rb.NewRef("destref")
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inp0, inp1}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
rb.checkReleased(t, append(outs, inp0, inp1))
o := outs[0].(*testFileRef)
@@ -484,7 +484,7 @@ func TestFileCopyInputRm(t *testing.T) {
inp1 := rb.NewRef("destref")
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inp0, inp1}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
rb.checkReleased(t, append(outs, inp0, inp1))
o := outs[0].(*testFileRef)
@@ -548,7 +548,7 @@ func TestFileParallelActions(t *testing.T) {
outs, err := s.Solve(context.TODO(), []fileoptypes.Ref{inp}, fo.Actions, nil)
require.NoError(t, err)
require.Equal(t, len(outs), 1)
require.Equal(t, 1, len(outs))
require.Equal(t, int64(2), sem)
}
util/apicaps/caps_test.go
+5 -6
View File
@@ -4,7 +4,6 @@ import (
"testing"
pb "github.com/moby/buildkit/util/apicaps/pb"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -39,23 +38,23 @@ func TestDisabledCap(t *testing.T) {
err = cs.Supports("cap1")
require.NoError(t, err)
err = cs.Supports("cap2")
assert.EqualError(t, err, "requested experimental feature cap2 (a second test cap) has been disabled on the build server")
require.EqualError(t, err, "requested experimental feature cap2 (a second test cap) has been disabled on the build server")
cs = cl.CapSet([]pb.APICap{
{ID: "cap1", Enabled: false},
{ID: "cap2", Enabled: true},
})
err = cs.Supports("cap1")
assert.EqualError(t, err, "requested experimental feature cap1 (a test cap) has been disabled on the build server")
require.EqualError(t, err, "requested experimental feature cap1 (a test cap) has been disabled on the build server")
err = cs.Supports("cap2")
assert.NoError(t, err)
require.NoError(t, err)
cs = cl.CapSet([]pb.APICap{
{ID: "cap1", Enabled: false},
{ID: "cap2", Enabled: false},
})
err = cs.Supports("cap1")
assert.EqualError(t, err, "requested experimental feature cap1 (a test cap) has been disabled on the build server")
require.EqualError(t, err, "requested experimental feature cap1 (a test cap) has been disabled on the build server")
err = cs.Supports("cap2")
assert.EqualError(t, err, "requested experimental feature cap2 (a second test cap) has been disabled on the build server")
require.EqualError(t, err, "requested experimental feature cap2 (a second test cap) has been disabled on the build server")
}
util/flightcontrol/flightcontrol_test.go
+11 -11
View File
@@ -37,7 +37,7 @@ func TestNoCancel(t *testing.T) {
return nil
})
err := eg.Wait()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "bar", r1)
assert.Equal(t, "bar", r2)
assert.Equal(t, int64(1), counter)
@@ -53,7 +53,7 @@ func TestCancelOne(t *testing.T) {
ctx2, cancel := context.WithCancelCause(ctx)
eg.Go(func() error {
ret1, err := g.Do(ctx2, "foo", f)
assert.Error(t, err)
require.Error(t, err)
require.Equal(t, true, errors.Is(err, context.Canceled))
if err == nil {
r1 = ret1
@@ -78,7 +78,7 @@ func TestCancelOne(t *testing.T) {
}
})
err := eg.Wait()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "", r1)
assert.Equal(t, "bar", r2)
assert.Equal(t, int64(1), counter)
@@ -150,7 +150,7 @@ func TestCancelBoth(t *testing.T) {
ctx3, cancel3 := context.WithCancelCause(ctx)
eg.Go(func() error {
ret1, err := g.Do(ctx2, "foo", f)
assert.Error(t, err)
require.Error(t, err)
require.Equal(t, true, errors.Is(err, context.Canceled))
if err == nil {
r1 = ret1
@@ -159,7 +159,7 @@ func TestCancelBoth(t *testing.T) {
})
eg.Go(func() error {
ret2, err := g.Do(ctx3, "foo", f)
assert.Error(t, err)
require.Error(t, err)
require.Equal(t, true, errors.Is(err, context.Canceled))
if err == nil {
r2 = ret2
@@ -185,19 +185,19 @@ func TestCancelBoth(t *testing.T) {
}
})
err := eg.Wait()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "", r1)
assert.Equal(t, "", r2)
assert.Equal(t, int64(1), counter)
ret1, err := g.Do(context.TODO(), "foo", f)
assert.NoError(t, err)
assert.Equal(t, ret1, "bar")
assert.Equal(t, "bar", ret1)
ret1, err = g.Do(context.TODO(), "abc", f)
assert.NoError(t, err)
assert.Equal(t, ret1, "bar")
require.NoError(t, err)
assert.Equal(t, "bar", ret1)
assert.Equal(t, counter, int64(3))
assert.Equal(t, int64(3), counter)
}
func TestContention(t *testing.T) {
@@ -241,7 +241,7 @@ func TestMassiveParallel(t *testing.T) {
time.Sleep(5 * time.Microsecond)
}
err := eg.Wait()
assert.Error(t, err)
require.Error(t, err)
assert.Equal(t, int64(0), retryCount)
}
util/progress/progress_test.go
+4 -4
View File
@@ -16,7 +16,7 @@ import (
func TestProgress(t *testing.T) {
t.Parallel()
s, err := calc(context.TODO(), 4, "calc")
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, 10, s)
eg, ctx := errgroup.WithContext(context.Background())
@@ -30,19 +30,19 @@ func TestProgress(t *testing.T) {
pw, _, ctx2 := NewFromContext(ctx, WithMetadata("tag", "foo"))
s, err = calc(ctx2, 5, "calc")
pw.Close()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, 15, s)
cancelProgress(errors.WithStack(context.Canceled))
err = eg.Wait()
assert.NoError(t, err)
require.NoError(t, err)
assert.Greater(t, len(trace.items), 5)
assert.LessOrEqual(t, len(trace.items), 7)
for _, p := range trace.items {
v, ok := p.Meta("tag")
assert.True(t, ok)
assert.Equal(t, v.(string), "foo")
assert.Equal(t, "foo", v.(string))
}
}
util/resolver/resolver_test.go
+2 -2
View File
@@ -54,9 +54,9 @@ mirrors = ["https://url/", "https://url/path/"]
cfg, err := config.Load(bytes.NewBuffer([]byte(testConfig)))
require.NoError(t, err)
require.NotEqual(t, len(cfg.Registries), 0)
require.NotEqual(t, 0, len(cfg.Registries))
for _, registry := range cfg.Registries {
require.NotEqual(t, len(registry.Mirrors), 0)
require.NotEqual(t, 0, len(registry.Mirrors))
for _, m := range registry.Mirrors {
test := tests[m]
h := newMirrorRegistryHost(m)
util/wildcard/wildcard_test.go
+5 -4
View File
@@ -4,17 +4,18 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestWildcard(t *testing.T) {
wildcardStr := "docker.io/*/alpine:*"
wildcard, err := New(wildcardStr)
assert.NoError(t, err)
require.NoError(t, err)
t.Run("Match", func(t *testing.T) {
m := wildcard.Match("docker.io/library/alpine:latest")
assert.Equal(t, []string{"docker.io/library/alpine:latest", "library", "latest"}, m.Submatches)
s, err := m.Format("$1-${2}-$3-$$-$0")
assert.NoError(t, err)
require.NoError(t, err)
// "$3" is replaced with an empty string without producing an error, because Format() internally uses regexp.*Regexp.Expand():
// https://pkg.go.dev/regexp#Regexp.Expand
assert.Equal(t, "library-latest--$-docker.io/library/alpine:latest", s)
@@ -34,7 +35,7 @@ func TestWildcardInvalid(t *testing.T) {
func TestWildcardEscape(t *testing.T) {
wildcardStr := "docker.io/library/alpine:\\*"
wildcard, err := New(wildcardStr)
assert.NoError(t, err)
require.NoError(t, err)
t.Run("NoMatch", func(t *testing.T) {
assert.Nil(t, wildcard.Match("docker.io/library/alpine:latest"))
})
@@ -43,7 +44,7 @@ func TestWildcardEscape(t *testing.T) {
func TestWildcardParentheses(t *testing.T) {
wildcardStr := "docker.io/library/alpine:(*)"
wildcard, err := New(wildcardStr)
assert.NoError(t, err)
require.NoError(t, err)
t.Run("NoMatch", func(t *testing.T) {
assert.Nil(t, wildcard.Match("docker.io/library/alpine:latest"))
})
worker/runc/runc_test.go
+1 -1
View File
@@ -142,7 +142,7 @@ func TestRuncWorker(t *testing.T) {
dt, err := os.ReadFile(filepath.Join(target, "run", "bar"))
require.NoError(t, err)
require.Equal(t, string(dt), "foo\n")
require.Equal(t, "foo\n", string(dt))
lm.Unmount()
require.NoError(t, err)