Skip to content

Commit b2041cc

Browse files
committed
rename vars
1 parent ccafa76 commit b2041cc

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Diff for: integration/integration_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
13201320
ctx, cancel := context.WithCancel(context.Background())
13211321
t.Cleanup(cancel)
13221322

1323-
wantOutput := []string{
1323+
wantSpecificOutput := []string{
13241324
"containeruser",
13251325
"FROM_CONTAINER_ENV=containerEnv",
13261326
"FROM_REMOTE_ENV=remoteEnv",
@@ -1387,7 +1387,7 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
13871387
defer cli.Close()
13881388

13891389
var started bool
1390-
var wantEnv, gotEnv []string
1390+
var wantOutput, gotOutput []string
13911391
logs, _ := streamContainerLogs(t, cli, ctrID)
13921392
for {
13931393
log := <-logs
@@ -1399,7 +1399,7 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
13991399
break
14001400
}
14011401
if started {
1402-
wantEnv = append(wantEnv, log)
1402+
wantOutput = append(wantOutput, log)
14031403
}
14041404
}
14051405
started = false
@@ -1425,18 +1425,18 @@ RUN date --utc > /root/date.txt`, testImageAlpine),
14251425
break
14261426
}
14271427
if started {
1428-
gotEnv = append(gotEnv, log)
1428+
gotOutput = append(gotOutput, log)
14291429
}
14301430
}
14311431

1432-
slices.Sort(wantEnv)
1433-
slices.Sort(gotEnv)
1434-
if diff := cmp.Diff(wantEnv, gotEnv); diff != "" {
1432+
slices.Sort(wantOutput)
1433+
slices.Sort(gotOutput)
1434+
if diff := cmp.Diff(wantOutput, gotOutput); diff != "" {
14351435
t.Fatalf("unexpected output (-want +got):\n%s", diff)
14361436
}
14371437

1438-
for _, want := range wantOutput {
1439-
assert.Contains(t, gotEnv, want, "expected env var %q to be present", want)
1438+
for _, want := range wantSpecificOutput {
1439+
assert.Contains(t, gotOutput, want, "expected specific output %q to be present", want)
14401440
}
14411441
})
14421442

0 commit comments

Comments
 (0)