Merge pull request #95 from rajasec/runc_teststepissue

Fixing memory swappiness as -1 in template file for older kernels
2015-07-07 11:08:16 -07:00 · 2015-07-07 11:08:16 -07:00 · a7a7263b4c
parent f7431f1f66 e027c57f38
commit a7a7263b4c
1 changed files with 5 additions and 4 deletions
--- a/libcontainer/integration/template_test.go
+++ b/libcontainer/integration/template_test.go
@ -46,10 +46,11 @@ func newTemplateConfig(rootfs string) *configs.Config {
 			{Type: configs.NEWNET},
 		}),
 		Cgroups: &configs.Cgroup{
-			Name:            "test",
-			Parent:          "integration",
-			AllowAllDevices: false,
-			AllowedDevices:  configs.DefaultAllowedDevices,
+			Name:             "test",
+			Parent:           "integration",
+			MemorySwappiness: -1,
+			AllowAllDevices:  false,
+			AllowedDevices:   configs.DefaultAllowedDevices,
 		},
 		MaskPaths: []string{
 			"/proc/kcore",