From 16dfb38fb89e4c57c53c54d3559b9fb388e367d4 Mon Sep 17 00:00:00 2001 From: Yuan Sun Date: Fri, 1 Apr 2016 10:32:46 +0800 Subject: [PATCH] Add pause status check for --kernel-memory Signed-off-by: Yuan Sun --- integration-cli/docker_cli_update_unix_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_update_unix_test.go b/integration-cli/docker_cli_update_unix_test.go index c40ad3ee12..186c6fe845 100644 --- a/integration-cli/docker_cli_update_unix_test.go +++ b/integration-cli/docker_cli_update_unix_test.go @@ -116,8 +116,7 @@ func (s *DockerSuite) TestUpdateContainerWithoutFlags(c *check.C) { } func (s *DockerSuite) TestUpdateKernelMemory(c *check.C) { - testRequires(c, DaemonIsLinux) - testRequires(c, kernelMemorySupport) + testRequires(c, DaemonIsLinux, kernelMemorySupport) name := "test-update-container" dockerCmd(c, "run", "-d", "--name", name, "--kernel-memory", "50M", "busybox", "top") @@ -128,6 +127,12 @@ func (s *DockerSuite) TestUpdateKernelMemory(c *check.C) { // Update kernel memory to a running container with failure should not change HostConfig c.Assert(inspectField(c, name, "HostConfig.KernelMemory"), checker.Equals, "52428800") + dockerCmd(c, "pause", name) + _, _, err = dockerCmdWithError("update", "--kernel-memory", "100M", name) + c.Assert(err, check.NotNil) + c.Assert(inspectField(c, name, "HostConfig.KernelMemory"), checker.Equals, "52428800") + dockerCmd(c, "unpause", name) + dockerCmd(c, "stop", name) dockerCmd(c, "update", "--kernel-memory", "100M", name) dockerCmd(c, "start", name)