From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Wed, 2 Jun 2021 13:34:33 +0000 (+0000)
Subject: ftests: Modify functional test 014 to support cgroup v2
X-Git-Tag: v3.1.0~308^2~2^2~114^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f56dbc59e15b4f371a6e3fc3cf33aae685e1f1ff;p=thirdparty%2Flibcgroup.git

ftests: Modify functional test 014 to support cgroup v2

Add support for a full cgroup v2 system to the 014-cgget-a_flag.py
functional test.  It continues to support cgroup v1 as well.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/ftests/014-cgget-a_flag.py b/ftests/014-cgget-a_flag.py
index ff4dd629..4d2f49cb 100755
--- a/ftests/014-cgget-a_flag.py
+++ b/ftests/014-cgget-a_flag.py
@@ -37,8 +37,17 @@ def prereqs(config):
     return result, cause
 
 def setup(config):
-    Cgroup.create(config, CONTROLLER1, CGNAME)
-    Cgroup.create(config, CONTROLLER2, CGNAME)
+    ver1 = CgroupVersion.get_version(CONTROLLER1)
+    ver2 = CgroupVersion.get_version(CONTROLLER2)
+
+    if ver1 == CgroupVersion.CGROUP_V2 and \
+       ver2 == CgroupVersion.CGROUP_V2:
+        # If both controllers are cgroup v2, then we only need to make
+        # one cgroup.  The path will be the same for both
+        Cgroup.create(config, [CONTROLLER1, CONTROLLER2], CGNAME)
+    else:
+        Cgroup.create(config, CONTROLLER1, CGNAME)
+        Cgroup.create(config, CONTROLLER2, CGNAME)
 
 def test(config):
     result = consts.TEST_PASSED
@@ -69,8 +78,17 @@ def test(config):
     return result, cause
 
 def teardown(config):
-    Cgroup.delete(config, CONTROLLER1, CGNAME)
-    Cgroup.delete(config, CONTROLLER2, CGNAME)
+    ver1 = CgroupVersion.get_version(CONTROLLER1)
+    ver2 = CgroupVersion.get_version(CONTROLLER2)
+
+    if ver1 == CgroupVersion.CGROUP_V2 and \
+       ver2 == CgroupVersion.CGROUP_V2:
+        # If both controllers are cgroup v2, then we only need to make
+        # one cgroup.  The path will be the same for both
+        Cgroup.delete(config, [CONTROLLER1, CONTROLLER2], CGNAME)
+    else:
+        Cgroup.delete(config, CONTROLLER1, CGNAME)
+        Cgroup.delete(config, CONTROLLER2, CGNAME)
 
 def main(config):
     [result, cause] = prereqs(config)