From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Fri, 17 Mar 2023 15:24:32 +0000 (-0600)
Subject: ftests: Add controller list() support to Cgroup.classify()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56c4916524d4a003b53875fb144e0b5e00e0ca56;p=thirdparty%2Flibcgroup.git

ftests: Add controller list() support to Cgroup.classify()

Add support for passing in a list of controllers to Cgroup.classify().

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 82183a3612b7547cab47b38cd27096dbfb8456bb)
---

diff --git a/tests/ftests/cgroup.py b/tests/ftests/cgroup.py
index 50da99e7..3be9ba04 100644
--- a/tests/ftests/cgroup.py
+++ b/tests/ftests/cgroup.py
@@ -441,8 +441,15 @@ class Cgroup(object):
         if ignore_systemd:
             cmd.append('-b')
 
-        cmd.append('-g')
-        cmd.append('{}:{}'.format(controller, cgname))
+        if isinstance(controller, str):
+            cmd.append('-g')
+            cmd.append('{}:{}'.format(controller, cgname))
+        elif isinstance(controller, list):
+            controller = ','.join(controller)
+            cmd.append('-g')
+            cmd.append('{}:{}'.format(controller, cgname))
+        else:
+            raise ValueError('Unsupported controller format: {}'.format(type(controller)))
 
         if isinstance(pid_list, str):
             cmd.append(pid_list)