toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #36140 from vdemeester/integration-container-kill

Browse Source 
Migrate some kill integration cli test to api tests
Upstream-commit: 21c9e5701bef4687847adb9c26ac42583a57c174
Component: engine
This commit is contained in:
Yong Tang
2018-02-08 09:55:28 -08:00
committed by GitHub
parent 085b7dfcd2 82570b7d22
commit 8aa2823503
18 changed files with 333 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/daemon/daemon.go
+1 -1
View File
@@ -566,7 +566,7 @@ func (d *Daemon) WaitRun(contID string) error {
// Info returns the info struct for this daemon
func (d *Daemon) Info(t require.TestingT) types.Info {
apiclient, err := request.NewClientForHost(d.Sock())
apiclient, err := client.NewClientWithOpts(client.WithHost((d.Sock())))
require.NoError(t, err)
info, err := apiclient.Info(context.Background())
require.NoError(t, err)
components/engine/integration-cli/docker_api_containers_test.go
+2 -1
View File
@@ -1372,7 +1372,8 @@ func (s *DockerSuite) TestContainerAPICreateNoHostConfig118(c *check.C) {
Image: "busybox",
}
cli, err := request.NewEnvClientWithVersion("v1.18")
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.18"))
c.Assert(err, checker.IsNil)
_, err = cli.ContainerCreate(context.Background(), &config, &containertypes.HostConfig{}, &networktypes.NetworkingConfig{}, "")
c.Assert(err, checker.IsNil)
components/engine/integration-cli/docker_api_images_test.go
+1 -1
View File
@@ -179,7 +179,7 @@ func (s *DockerSuite) TestAPIImagesSizeCompatibility(c *check.C) {
Labels map[string]string
}
cli, err = request.NewEnvClientWithVersion("v1.24")
cli, err = client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.24"))
c.Assert(err, checker.IsNil)
defer cli.Close()
components/engine/integration-cli/docker_api_inspect_unix_test.go
+2 -2
View File
@@ -5,8 +5,8 @@ package main
import (
"encoding/json"
"github.com/docker/docker/client"
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/request"
"github.com/go-check/check"
"golang.org/x/net/context"
)
@@ -18,7 +18,7 @@ func (s *DockerSuite) TestInspectAPICpusetInConfigPre120(c *check.C) {
name := "cpusetinconfig-pre120"
dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")
cli, err := request.NewEnvClientWithVersion("v1.19")
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.19"))
c.Assert(err, checker.IsNil)
defer cli.Close()
_, body, err := cli.ContainerInspectWithRaw(context.Background(), name, false)
components/engine/integration-cli/docker_cli_kill_test.go
-113
View File
@@ -6,37 +6,9 @@ import (
"github.com/docker/docker/integration-cli/checker"
"github.com/docker/docker/integration-cli/cli"
"github.com/docker/docker/integration-cli/request"
"github.com/go-check/check"
"github.com/gotestyourself/gotestyourself/icmd"
"golang.org/x/net/context"
)
func (s *DockerSuite) TestKillContainer(c *check.C) {
out := runSleepingContainer(c, "-d")
cleanedContainerID := strings.TrimSpace(out)
cli.WaitRun(c, cleanedContainerID)
cli.DockerCmd(c, "kill", cleanedContainerID)
cli.WaitExited(c, cleanedContainerID, 10*time.Second)
out = cli.DockerCmd(c, "ps", "-q").Combined()
c.Assert(out, checker.Not(checker.Contains), cleanedContainerID, check.Commentf("killed container is still running"))
}
func (s *DockerSuite) TestKillOffStoppedContainer(c *check.C) {
out := runSleepingContainer(c, "-d")
cleanedContainerID := strings.TrimSpace(out)
cli.DockerCmd(c, "stop", cleanedContainerID)
cli.WaitExited(c, cleanedContainerID, 10*time.Second)
cli.Docker(cli.Args("kill", "-s", "30", cleanedContainerID)).Assert(c, icmd.Expected{
ExitCode: 1,
})
}
func (s *DockerSuite) TestKillDifferentUserContainer(c *check.C) {
// TODO Windows: Windows does not yet support -u (Feb 2016).
testRequires(c, DaemonIsLinux)
@@ -51,88 +23,3 @@ func (s *DockerSuite) TestKillDifferentUserContainer(c *check.C) {
c.Assert(out, checker.Not(checker.Contains), cleanedContainerID, check.Commentf("killed container is still running"))
}
// regression test about correct signal parsing see #13665
func (s *DockerSuite) TestKillWithSignal(c *check.C) {
// Cannot port to Windows - does not support signals in the same way Linux does
testRequires(c, DaemonIsLinux)
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
cid := strings.TrimSpace(out)
c.Assert(waitRun(cid), check.IsNil)
dockerCmd(c, "kill", "-s", "SIGWINCH", cid)
time.Sleep(250 * time.Millisecond)
running := inspectField(c, cid, "State.Running")
c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after SIGWINCH"))
}
func (s *DockerSuite) TestKillWithStopSignalWithSameSignalShouldDisableRestartPolicy(c *check.C) {
// Cannot port to Windows - does not support signals int the same way as Linux does
testRequires(c, DaemonIsLinux)
out := cli.DockerCmd(c, "run", "-d", "--stop-signal=TERM", "--restart=always", "busybox", "top").Combined()
cid := strings.TrimSpace(out)
cli.WaitRun(c, cid)
// Let docker send a TERM signal to the container
// It will kill the process and disable the restart policy
cli.DockerCmd(c, "kill", "-s", "TERM", cid)
cli.WaitExited(c, cid, 10*time.Second)
out = cli.DockerCmd(c, "ps", "-q").Combined()
c.Assert(out, checker.Not(checker.Contains), cid, check.Commentf("killed container is still running"))
}
func (s *DockerSuite) TestKillWithStopSignalWithDifferentSignalShouldKeepRestartPolicy(c *check.C) {
// Cannot port to Windows - does not support signals int the same way as Linux does
testRequires(c, DaemonIsLinux)
out := cli.DockerCmd(c, "run", "-d", "--stop-signal=CONT", "--restart=always", "busybox", "top").Combined()
cid := strings.TrimSpace(out)
cli.WaitRun(c, cid)
// Let docker send a TERM signal to the container
// It will kill the process, but not disable the restart policy
cli.DockerCmd(c, "kill", "-s", "TERM", cid)
cli.WaitRestart(c, cid, 10*time.Second)
// Restart policy should still be in place, so it should be still running
cli.WaitRun(c, cid)
}
// FIXME(vdemeester) should be a unit test
func (s *DockerSuite) TestKillWithInvalidSignal(c *check.C) {
out := runSleepingContainer(c, "-d")
cid := strings.TrimSpace(out)
c.Assert(waitRun(cid), check.IsNil)
out, _, err := dockerCmdWithError("kill", "-s", "0", cid)
c.Assert(err, check.NotNil)
c.Assert(out, checker.Contains, "Invalid signal: 0", check.Commentf("Kill with an invalid signal didn't error out correctly"))
running := inspectField(c, cid, "State.Running")
c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after an invalid signal"))
out = runSleepingContainer(c, "-d")
cid = strings.TrimSpace(out)
c.Assert(waitRun(cid), check.IsNil)
out, _, err = dockerCmdWithError("kill", "-s", "SIG42", cid)
c.Assert(err, check.NotNil)
c.Assert(out, checker.Contains, "Invalid signal: SIG42", check.Commentf("Kill with an invalid signal error out correctly"))
running = inspectField(c, cid, "State.Running")
c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after an invalid signal"))
}
func (s *DockerSuite) TestKillStoppedContainerAPIPre120(c *check.C) {
testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
runSleepingContainer(c, "--name", "docker-kill-test-api", "-d")
dockerCmd(c, "stop", "docker-kill-test-api")
cli, err := request.NewEnvClientWithVersion("v1.19")
c.Assert(err, check.IsNil)
defer cli.Close()
err = cli.ContainerKill(context.Background(), "docker-kill-test-api", "SIGKILL")
c.Assert(err, check.IsNil)
}
components/engine/integration-cli/docker_utils_test.go
+1 -1
View File
@@ -372,7 +372,7 @@ func waitInspectWithArgs(name, expr, expected string, timeout time.Duration, arg
}
func getInspectBody(c *check.C, version, id string) []byte {
cli, err := request.NewEnvClientWithVersion(version)
cli, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion(version))
c.Assert(err, check.IsNil)
defer cli.Close()
_, body, err := cli.ContainerInspectWithRaw(context.Background(), id, false)
components/engine/integration-cli/request/request.go
+1 -43
View File
@@ -17,7 +17,6 @@ import (
"strings"
"time"
"github.com/docker/docker/api"
dclient "github.com/docker/docker/client"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/ioutils"
@@ -169,16 +168,7 @@ func NewHTTPClient(host string) (*http.Client, error) {
// NewClient returns a new Docker API client
func NewClient() (dclient.APIClient, error) {
return NewClientForHost(DaemonHost())
}
// NewClientForHost returns a Docker API client for the host
func NewClientForHost(host string) (dclient.APIClient, error) {
httpClient, err := NewHTTPClient(host)
if err != nil {
return nil, err
}
return dclient.NewClient(host, api.DefaultVersion, httpClient, nil)
return dclient.NewClientWithOpts(dclient.WithHost(DaemonHost()))
}
// FIXME(vdemeester) httputil.ClientConn is deprecated, use http.Client instead (closer to actual client)
@@ -323,35 +313,3 @@ func DaemonHost() string {
}
return daemonURLStr
}
// NewEnvClientWithVersion returns a docker client with a specified version.
// See: github.com/docker/docker/client `NewEnvClient()`
func NewEnvClientWithVersion(version string) (*dclient.Client, error) {
if version == "" {
return nil, errors.New("version not specified")
}
var httpClient *http.Client
if os.Getenv("DOCKER_CERT_PATH") != "" {
tlsConfig, err := getTLSConfig()
if err != nil {
return nil, err
}
httpClient = &http.Client{
Transport: &http.Transport{
TLSClientConfig: tlsConfig,
},
}
}
host := os.Getenv("DOCKER_HOST")
if host == "" {
host = dclient.DefaultDockerHost
}
cli, err := dclient.NewClient(host, version, httpClient, nil)
if err != nil {
return cli, err
}
return cli, nil
}