From ae29bd435bafad06f4701c4fbdf6aa8e106409e3 Mon Sep 17 00:00:00 2001 From: Christy Perez Date: Tue, 13 Oct 2015 10:42:25 -0500 Subject: [PATCH] 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 --- integration-cli/docker_cli_inspect_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_cli_inspect_test.go b/integration-cli/docker_cli_inspect_test.go index f4a8a0d39d..63210567de 100644 --- a/integration-cli/docker_cli_inspect_test.go +++ b/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" {