From 13132012a989a687d7cf819c42c18eab28c1a48c Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Thu, 13 Jun 2024 20:09:57 +0530 Subject: [PATCH] ftests/013: Populate newer cpu controller output Populate the newer cpu controller output with pid controller list() by adjusting the index. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- tests/ftests/013-cgget-multiple_g_flags.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/ftests/013-cgget-multiple_g_flags.py b/tests/ftests/013-cgget-multiple_g_flags.py index 99b43672..b02cde5f 100755 --- a/tests/ftests/013-cgget-multiple_g_flags.py +++ b/tests/ftests/013-cgget-multiple_g_flags.py @@ -32,19 +32,19 @@ def test(config): result = consts.TEST_PASSED cause = None - # Append pid controller [0] and cpu controller [N - 1] + # Append pid controller [0] and cpu controller [N - 2] EXPECTED_OUT_V1 = [OUT_PREFIX + consts.EXPECTED_PIDS_OUT[0] + expected_out - for expected_out in consts.EXPECTED_CPU_OUT_V1[:-1]] - # Append pid controller [1] and cpu controller [N] - EXPECTED_OUT_V1.append(OUT_PREFIX + consts.EXPECTED_PIDS_OUT[1] + - consts.EXPECTED_CPU_OUT_V1[-1]) + for expected_out in consts.EXPECTED_CPU_OUT_V1[:-2]] + # Append pid controller [1] and cpu controller [N, N - 1] + EXPECTED_OUT_V1.extend(OUT_PREFIX + consts.EXPECTED_PIDS_OUT[1] + expected_out + for expected_out in consts.EXPECTED_CPU_OUT_V1[-2:]) - # Append pid controller [0] and cpu controller [N - 1] + # Append pid controller [0] and cpu controller [N - 2] EXPECTED_OUT_V2 = [OUT_PREFIX + consts.EXPECTED_PIDS_OUT[0] + expected_out - for expected_out in consts.EXPECTED_CPU_OUT_V2[:-1]] - # Append pid controller [1] and cpu controller [N] - EXPECTED_OUT_V2.append(OUT_PREFIX + consts.EXPECTED_PIDS_OUT[1] + - consts.EXPECTED_CPU_OUT_V2[-1]) + for expected_out in consts.EXPECTED_CPU_OUT_V2[:-2]] + # Append pid controller [1] and cpu controller [N, N - 1] + EXPECTED_OUT_V2.extend(OUT_PREFIX + consts.EXPECTED_PIDS_OUT[1] + expected_out + for expected_out in consts.EXPECTED_CPU_OUT_V2[-2:]) out = Cgroup.get(config, controller=[CONTROLLER1, CONTROLLER2], cgname=CGNAME) -- 2.47.3