kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #36922 from yongtang/04212018-restart_test.go 

Some improvement in restart_test.go
This commit is contained in:
Yong Tang 2018-04-22 09:34:14 -07:00 committed by GitHub
parent 53982e3fc1 67535921b3
commit 57142e89be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
integration/container/restart_test.go
View File

@ -9,6 +9,7 @@ import (
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/internal/test/daemon" "github.com/docker/docker/internal/test/daemon"
"github.com/gotestyourself/gotestyourself/assert"
"github.com/gotestyourself/gotestyourself/skip" "github.com/gotestyourself/gotestyourself/skip"
) )
@ -40,9 +41,8 @@ func TestDaemonRestartKillContainers(t *testing.T) {
for _, liveRestoreEnabled := range []bool{false, true} { for _, liveRestoreEnabled := range []bool{false, true} {
for fnName, stopDaemon := range map[string]func(*testing.T, *daemon.Daemon){ for fnName, stopDaemon := range map[string]func(*testing.T, *daemon.Daemon){
"kill-daemon": func(t *testing.T, d *daemon.Daemon) { "kill-daemon": func(t *testing.T, d *daemon.Daemon) {
if err := d.Kill(); err != nil { err := d.Kill()
t.Fatal(err) assert.NilError(t, err)
}
}, },
"stop-daemon": func(t *testing.T, d *daemon.Daemon) { "stop-daemon": func(t *testing.T, d *daemon.Daemon) {
d.Stop(t) d.Stop(t)
@ -57,9 +57,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
d := daemon.New(t) d := daemon.New(t)
client, err := d.NewClient() client, err := d.NewClient()
if err != nil { assert.NilError(t, err)
t.Fatal(err)
}
args := []string{"--iptables=false"} args := []string{"--iptables=false"}
if liveRestoreEnabled { if liveRestoreEnabled {
@ -71,14 +69,11 @@ func TestDaemonRestartKillContainers(t *testing.T) {
ctx := context.Background() ctx := context.Background()
resp, err := client.ContainerCreate(ctx, c.config, c.hostConfig, nil, "") resp, err := client.ContainerCreate(ctx, c.config, c.hostConfig, nil, "")
if err != nil { assert.NilError(t, err)
t.Fatal(err)
}
defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true}) defer client.ContainerRemove(ctx, resp.ID, types.ContainerRemoveOptions{Force: true})
if err := client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{}); err != nil { err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
t.Fatal(err) assert.NilError(t, err)
}
stopDaemon(t, d) stopDaemon(t, d)
d.Start(t, args...) d.Start(t, args...)
@ -91,9 +86,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
var running bool var running bool
for i := 0; i < 30; i++ { for i := 0; i < 30; i++ {
inspect, err := client.ContainerInspect(ctx, resp.ID) inspect, err := client.ContainerInspect(ctx, resp.ID)
if err != nil { assert.NilError(t, err)
t.Fatal(err)
}
running = inspect.State.Running running = inspect.State.Running
if running == expected { if running == expected {
@ -102,10 +95,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
assert.Equal(t, expected, running, "got unexpected running state, expected %v, got: %v", expected, running)
if running != expected {
t.Fatalf("got unexpected running state, expected %v, got: %v", expected, running)
}
// TODO(cpuguy83): test pause states... this seems to be rather undefined currently // TODO(cpuguy83): test pause states... this seems to be rather undefined currently
}) })
} }