clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-26 18:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestInspectInt64 for run scenarios that return warnings

Browse Source 
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>
This commit is contained in:
Christy Perez
2015-10-13 10:42:25 -05:00
committed by Tibor Vass
parent 08cec812cb
commit f04a7bd388
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_inspect_test.go
+2 -6
View File
@@ -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" {