From f68186e1070fbf30030688f3cb86ccdbf5dff806 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Tue, 30 Jul 2019 19:45:30 +0000
Subject: [PATCH] Improve custom cgroup test

Ref: #3272

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 daemon_config_linux_test.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/daemon_config_linux_test.go b/daemon_config_linux_test.go
index e78c5f7cb..33c3479dd 100644
--- a/daemon_config_linux_test.go
+++ b/daemon_config_linux_test.go
@@ -241,8 +241,16 @@ version = 1
 
 	defer cleanup()
 
-	for k, v := range cgroupPath {
-		if k == "rmda" {
+	paths := []string{
+		"devices",
+		"memory",
+		"cpu",
+		"blkio",
+	}
+
+	for _, p := range paths {
+		v := cgroupPath[p]
+		if v == "" {
 			continue
 		}
 		path := filepath.Join(v, customCgroup)