Merge pull request #3468 from crosbymichael/custom-cgroup

Improve custom cgroup test

daemon_config_linux_test.go

@@ -241,8 +241,16 @@ version = 1
 
 	defer cleanup()
 
-	for k, v := range cgroupPath {
+	paths := []string{
-		if k == "rmda" {
+		"devices",
+		"memory",
+		"cpu",
+		"blkio",
+	}
+
+	for _, p := range paths {
+		v := cgroupPath[p]
+		if v == "" {
 			continue
 		}
 		path := filepath.Join(v, customCgroup)