p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix TestInspectInt64 for kernels without swap limit capability
Upstream-commit: d0b4e7a0642b129f7b927c45b1e140372b28ac76
Component: engine
This commit is contained in:
Brian Goff
2015-10-19 11:54:28 -04:00
parent cd8273e40c 35d6e8b916
commit a6401cddfe
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/integration-cli/docker_cli_inspect_test.go
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" {