dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-22 15:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration/build: remove redundant capturing of loop vars (copyloopvar)

Browse Source 
integration/build/build_test.go:95:3: The copy of the 'for' variable "c" can be deleted (Go 1.22+) (copyloopvar)
            c := c
            ^
    integration/build/build_test.go:615:3: The copy of the 'for' variable "tc" can be deleted (Go 1.22+) (copyloopvar)
            tc := tc
            ^
    integration/build/build_test.go:743:3: The copy of the 'for' variable "builderVersion" can be deleted (Go 1.22+) (copyloopvar)
            builderVersion := builderVersion
            ^

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-11-12 13:43:55 +01:00
parent ee54e43bf1
commit 08dbb7a593
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
integration/build/build_test.go
View File

@@ -27,7 +27,7 @@ import (
func TestBuildWithRemoveAndForceRemove(t *testing.T) {
ctx := setupTest(t)
cases := []struct {
tests := []struct {
name string
dockerfile string
numberOfIntermediateContainers int
@@ -91,12 +91,11 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
}
client := testEnv.APIClient()
for _, c := range cases {
c := c
t.Run(c.name, func(t *testing.T) {
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
ctx := testutil.StartSpan(ctx, t)
dockerfile := []byte(c.dockerfile)
dockerfile := []byte(tc.dockerfile)
buff := bytes.NewBuffer(nil)
tw := tar.NewWriter(buff)
@@ -107,14 +106,14 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {
_, err := tw.Write(dockerfile)
assert.NilError(t, err)
assert.NilError(t, tw.Close())
resp, err := client.ImageBuild(ctx, buff, types.ImageBuildOptions{Remove: c.rm, ForceRemove: c.forceRm, NoCache: true})
resp, err := client.ImageBuild(ctx, buff, types.ImageBuildOptions{Remove: tc.rm, ForceRemove: tc.forceRm, NoCache: true})
assert.NilError(t, err)
defer resp.Body.Close()
filter, err := buildContainerIdsFilter(resp.Body)
assert.NilError(t, err)
remainingContainers, err := client.ContainerList(ctx, container.ListOptions{Filters: filter, All: true})
assert.NilError(t, err)
assert.Equal(t, c.numberOfIntermediateContainers, len(remainingContainers), "Expected %v remaining intermediate containers, got %v", c.numberOfIntermediateContainers, len(remainingContainers))
assert.Equal(t, tc.numberOfIntermediateContainers, len(remainingContainers), "Expected %v remaining intermediate containers, got %v", tc.numberOfIntermediateContainers, len(remainingContainers))
})
}
}
@@ -612,7 +611,6 @@ func TestBuildWithEmptyDockerfile(t *testing.T) {
apiClient := testEnv.APIClient()
for _, tc := range tests {
tc := tc
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
@@ -740,7 +738,6 @@ func TestBuildEmitsImageCreateEvent(t *testing.T) {
apiClient := testEnv.APIClient()
for _, builderVersion := range []types.BuilderVersion{types.BuilderV1, types.BuilderBuildKit} {
builderVersion := builderVersion
t.Run("v"+string(builderVersion), func(t *testing.T) {
if builderVersion == types.BuilderBuildKit {
skip.If(t, testEnv.UsingSnapshotter(),