TestDaemonRestartKillContainers: Fix loop capture
TestDaemonRestartKillContainers test was always executing the last case
(`container created should not be restarted`) because the iterated
variables were not copied correctly.
Capture iterated values by value correctly and rename c to tc.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
(cherry picked from commit fed1c96e10
)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
parent
dfd89ede4b
commit
d26e4dab48
1 changed files with 7 additions and 8 deletions
|
@ -58,11 +58,10 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|||
d.Stop(t)
|
||||
},
|
||||
} {
|
||||
tc := tc
|
||||
liveRestoreEnabled := liveRestoreEnabled
|
||||
stopDaemon := stopDaemon
|
||||
t.Run(fmt.Sprintf("live-restore=%v/%s/%s", liveRestoreEnabled, tc.desc, fnName), func(t *testing.T) {
|
||||
c := tc
|
||||
liveRestoreEnabled := liveRestoreEnabled
|
||||
stopDaemon := stopDaemon
|
||||
|
||||
t.Parallel()
|
||||
|
||||
d := daemon.New(t)
|
||||
|
@ -77,11 +76,11 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|||
defer d.Stop(t)
|
||||
ctx := context.Background()
|
||||
|
||||
resp, err := client.ContainerCreate(ctx, c.config, c.hostConfig, nil, nil, "")
|
||||
resp, err := client.ContainerCreate(ctx, tc.config, tc.hostConfig, nil, nil, "")
|
||||
assert.NilError(t, err)
|
||||
defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true})
|
||||
|
||||
if c.xStart {
|
||||
if tc.xStart {
|
||||
err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
|
||||
assert.NilError(t, err)
|
||||
}
|
||||
|
@ -89,9 +88,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|||
stopDaemon(t, d)
|
||||
d.Start(t, args...)
|
||||
|
||||
expected := c.xRunning
|
||||
expected := tc.xRunning
|
||||
if liveRestoreEnabled {
|
||||
expected = c.xRunningLiveRestore
|
||||
expected = tc.xRunningLiveRestore
|
||||
}
|
||||
|
||||
var running bool
|
||||
|
|
Loading…
Reference in a new issue