From 4354b348ad6f9a585c57d37147c2a893a2d873da Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <acidburn@docker.com>
Date: Wed, 2 Dec 2015 12:43:51 -0800
Subject: [PATCH] fix default shm size in test
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
---
integration-cli/docker_api_containers_test.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/integration-cli/docker_api_containers_test.go b/integration-cli/docker_api_containers_test.go
index 5ecab43d65..9364429a62 100644
--- a/integration-cli/docker_api_containers_test.go
+++ b/integration-cli/docker_api_containers_test.go
@@ -1415,6 +1415,7 @@ func (s *DockerSuite) TestPostContainersCreateShmSizeZero(c *check.C) {
}
func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {
+ var defaultSHMSize int64 = 67108864
config := map[string]interface{}{
"Image": "busybox",
"Cmd": "mount",
@@ -1434,7 +1435,7 @@ func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.
var containerJSON types.ContainerJSON
c.Assert(json.Unmarshal(body, &containerJSON), check.IsNil)
- c.Assert(*containerJSON.HostConfig.ShmSize, check.Equals, runconfig.DefaultSHMSize)
+ c.Assert(*containerJSON.HostConfig.ShmSize, check.Equals, defaultSHMSize)
out, _ := dockerCmd(c, "start", "-i", containerJSON.ID)
shmRegexp := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=65536k`)