|
@@ -76,11 +76,10 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|
d.Stop(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) {
|
|
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()
|
|
t.Parallel()
|
|
|
|
|
|
d := daemon.New(t)
|
|
d := daemon.New(t)
|
|
@@ -95,11 +94,11 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|
defer d.Stop(t)
|
|
defer d.Stop(t)
|
|
ctx := context.Background()
|
|
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)
|
|
assert.NilError(t, err)
|
|
defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true})
|
|
defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true})
|
|
|
|
|
|
- if c.xStart {
|
|
|
|
|
|
+ if tc.xStart {
|
|
err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
|
|
err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
|
|
assert.NilError(t, err)
|
|
assert.NilError(t, err)
|
|
}
|
|
}
|
|
@@ -107,9 +106,9 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|
stopDaemon(t, d)
|
|
stopDaemon(t, d)
|
|
d.Start(t, args...)
|
|
d.Start(t, args...)
|
|
|
|
|
|
- expected := c.xRunning
|
|
|
|
|
|
+ expected := tc.xRunning
|
|
if liveRestoreEnabled {
|
|
if liveRestoreEnabled {
|
|
- expected = c.xRunningLiveRestore
|
|
|
|
|
|
+ expected = tc.xRunningLiveRestore
|
|
}
|
|
}
|
|
|
|
|
|
var running bool
|
|
var running bool
|
|
@@ -125,7 +124,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
|
|
}
|
|
}
|
|
assert.Equal(t, expected, running, "got unexpected running state, expected %v, got: %v", expected, running)
|
|
assert.Equal(t, expected, running, "got unexpected running state, expected %v, got: %v", expected, running)
|
|
|
|
|
|
- if c.xHealthCheck {
|
|
|
|
|
|
+ if tc.xHealthCheck {
|
|
startTime := time.Now()
|
|
startTime := time.Now()
|
|
ctxPoll, cancel := context.WithTimeout(ctx, 30*time.Second)
|
|
ctxPoll, cancel := context.WithTimeout(ctx, 30*time.Second)
|
|
defer cancel()
|
|
defer cancel()
|