浏览代码

Fix TestInspectInt64 for run scenarios that return warnings

Instead of returning only the container ID, starting a container may
also return a warning:

"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"

The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Christy Perez 9 年之前
父节点
当前提交
ae29bd435b
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      integration-cli/docker_cli_inspect_test.go

+ 2 - 6
integration-cli/docker_cli_inspect_test.go

@@ -27,13 +27,9 @@ func (s *DockerSuite) TestInspectImage(c *check.C) {
 
 
 func (s *DockerSuite) TestInspectInt64(c *check.C) {
 func (s *DockerSuite) TestInspectInt64(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-d", "-m=300M", "busybox", "true")
-	if err != nil {
-		c.Fatalf("failed to run container: %v, output: %q", err, out)
-	}
-	out = strings.TrimSpace(out)
 
 
-	inspectOut, err := inspectField(out, "HostConfig.Memory")
+	dockerCmd(c, "run", "-d", "-m=300M", "--name", "inspectTest", "busybox", "true")
+	inspectOut, err := inspectField("inspectTest", "HostConfig.Memory")
 	c.Assert(err, check.IsNil)
 	c.Assert(err, check.IsNil)
 
 
 	if inspectOut != "314572800" {
 	if inspectOut != "314572800" {