瀏覽代碼

Merge pull request #16986 from clnperez/test-inspect-warn-fix

Fix TestInspectInt64 for kernels without swap limit capability
Brian Goff 9 年之前
父節點
當前提交
d0b4e7a064
共有 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) {
 	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)
 
 	if inspectOut != "314572800" {