From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Thu, 27 Mar 2025 15:28:28 +0000 (+0000)
Subject: ftests: Fix test 005 on Cgroup v2 Ubuntu22
X-Git-Tag: v3.2.0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44c7799d64c62ca1e70f1cffb2ae01fcf3c4b2b1;p=thirdparty%2Flibcgroup.git

ftests: Fix test 005 on Cgroup v2 Ubuntu22

Test 005-cgsnapshot-basic_snapshot_v2.py was failing on Ubuntu22
(non-sudo tests) because the cpuset.cpus.exclusive.effective field
is no longer being reported by the kernel in that case.

Remove that line from the expected output for the non-sudo tests but
leave it in for the sudo tests as it's still reported there.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Acked-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
---

diff --git a/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py b/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py
index 4ee80bc1..4027c90a 100755
--- a/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py
+++ b/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py
@@ -23,6 +23,14 @@ CGSNAPSHOT = [
                     cpuset.cpus="";
             }
     }""",
+    """group 005cgsnapshot {
+            cpuset {
+                    cpuset.cpus.exclusive="";
+                    cpuset.cpus.partition="member";
+                    cpuset.mems="";
+                    cpuset.cpus="";
+            }
+    }""",
     """group 005cgsnapshot {
             cpuset {
                     cpuset.cpus.exclusive.effective="";
@@ -56,12 +64,15 @@ def test(config):
 
     expected_1 = Cgroup.snapshot_to_dict(CGSNAPSHOT[0])
     expected_2 = Cgroup.snapshot_to_dict(CGSNAPSHOT[1])
+    expected_sudo = Cgroup.snapshot_to_dict(CGSNAPSHOT[2])
     actual = Cgroup.snapshot(config, controller=CONTROLLER)
 
     if (
             expected_1[CGNAME].controllers[CONTROLLER] !=
             actual[CGNAME].controllers[CONTROLLER] and
             expected_2[CGNAME].controllers[CONTROLLER] !=
+            actual[CGNAME].controllers[CONTROLLER] and
+            expected_sudo[CGNAME].controllers[CONTROLLER] !=
             actual[CGNAME].controllers[CONTROLLER]
        ):
         result = consts.TEST_FAILED