From 1eea2c589da4a4a3f5bfb83f6acf54af83ff4533 Mon Sep 17 00:00:00 2001 From: Rajdeep Dua Date: Mon, 11 May 2015 23:30:16 -0700 Subject: [PATCH] Modified Test Case to include check for Memory and MemorySwap Signed-off-by: Rajdeep Dua --- integration-cli/docker_api_containers_test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go index e8f9b0a968..ed3e9c3796 100644 --- a/integration-cli/docker_api_containers_test.go +++ b/integration-cli/docker_api_containers_test.go @@ -853,6 +853,17 @@ func (s *DockerSuite) TestContainerApiPostCreateNull(c *check.C) { if out != "" { c.Fatalf("expected empty string, got %q", out) } + + outMemory, errMemory := inspectField(container.Id, "HostConfig.Memory") + c.Assert(outMemory, check.Equals, "0") + if errMemory != nil { + c.Fatal(errMemory, outMemory) + } + outMemorySwap, errMemorySwap := inspectField(container.Id, "HostConfig.MemorySwap") + c.Assert(outMemorySwap, check.Equals, "0") + if errMemorySwap != nil { + c.Fatal(errMemorySwap, outMemorySwap) + } } func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {