Skip to content

Commit

Permalink
Merge pull request moby#16986 from clnperez/test-inspect-warn-fix
Browse files Browse the repository at this point in the history
Fix TestInspectInt64 for kernels without swap limit capability
  • Loading branch information
cpuguy83 committed Oct 19, 2015
2 parents 8005dbd + ae29bd4 commit d0b4e7a
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions integration-cli/docker_cli_inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down

0 comments on commit d0b4e7a

Please sign in to comment.