From fbfe72b498a37ff4063853a45aa225e5f23c83b9 Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Thu, 6 Jun 2024 15:28:59 +0530 Subject: [PATCH] ftests/005: Append newer kernel expected output Append newer kernels cpuset controller output to the list of expected output(s). ----------------------------------------------------------------- Test Results: Run Date: Jun 07 15:28:39 Passed: 1 test(s) Skipped: 0 test(s) Failed: 0 test(s) ----------------------------------------------------------------- Timing Results: Test Time (sec) -------------------------------------------------- setup 0.00 005-cgsnapshot-basic_snapshot_v2.py 0.27 teardown 0.00 -------------------------------------------------- Total Run Time 0.27 Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- .../005-cgsnapshot-basic_snapshot_v2.py | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py b/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py index 006a4b70..4ee80bc1 100755 --- a/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py +++ b/tests/ftests/005-cgsnapshot-basic_snapshot_v2.py @@ -15,13 +15,24 @@ import os CONTROLLER = 'cpuset' CGNAME = '005cgsnapshot' -CGSNAPSHOT = """group 005cgsnapshot { - cpuset { - cpuset.cpus.partition="member"; - cpuset.mems=""; - cpuset.cpus=""; - } - }""" +CGSNAPSHOT = [ + """group 005cgsnapshot { + cpuset { + cpuset.cpus.partition="member"; + cpuset.mems=""; + cpuset.cpus=""; + } + }""", + """group 005cgsnapshot { + cpuset { + cpuset.cpus.exclusive.effective=""; + cpuset.cpus.exclusive=""; + cpuset.cpus.partition="member"; + cpuset.mems=""; + cpuset.cpus=""; + } + }""" +] def prereqs(config): @@ -43,11 +54,16 @@ def test(config): result = consts.TEST_PASSED cause = None - expected = Cgroup.snapshot_to_dict(CGSNAPSHOT) + expected_1 = Cgroup.snapshot_to_dict(CGSNAPSHOT[0]) + expected_2 = Cgroup.snapshot_to_dict(CGSNAPSHOT[1]) actual = Cgroup.snapshot(config, controller=CONTROLLER) - if expected[CGNAME].controllers[CONTROLLER] != \ - actual[CGNAME].controllers[CONTROLLER]: + if ( + expected_1[CGNAME].controllers[CONTROLLER] != + actual[CGNAME].controllers[CONTROLLER] and + expected_2[CGNAME].controllers[CONTROLLER] != + actual[CGNAME].controllers[CONTROLLER] + ): result = consts.TEST_FAILED cause = 'Expected cgsnapshot result did not equal actual cgsnapshot' -- 2.47.3