Merge pull request #93 from vdemeester/do-not-use-memswap-for-test

Don't use memswap_limit for test
rancher · Oct 21, 2015 · 7685a86 · 7685a86
2 parents 1319c4f + c71e88f
commit 7685a86
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/integration/create_test.go b/integration/create_test.go
@@ -13,7 +13,6 @@ func (s *RunSuite) TestFields(c *C) {
           image: tianon/true
           cpuset: 1,2
           mem_limit: 4194304
-          memswap_limit: 8388608
         `)
 
 	name := fmt.Sprintf("%s_%s_1", p, "hello")
@@ -23,7 +22,6 @@ func (s *RunSuite) TestFields(c *C) {
 	c.Assert(cn.Config.Image, Equals, "tianon/true")
 	c.Assert(cn.HostConfig.CPUSetCPUs, Equals, "1,2")
 	c.Assert(cn.HostConfig.Memory, Equals, int64(4194304))
-	c.Assert(cn.HostConfig.MemorySwap, Equals, int64(8388608))
 }
 
 func (s *RunSuite) TestHelloWorld(c *C) {