From d865960d433e4b9ea35f1223fea986b35457781e Mon Sep 17 00:00:00 2001 From: Sachin P Bappalige Date: Thu, 25 Apr 2024 13:43:02 +0530 Subject: [PATCH] Fix removal of kernel args left from previous testcase Signed-off-by: Sachin P Bappalige --- testcases/PowerNVDump.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/testcases/PowerNVDump.py b/testcases/PowerNVDump.py index 6ef3a2a3..628fa56c 100644 --- a/testcases/PowerNVDump.py +++ b/testcases/PowerNVDump.py @@ -1130,9 +1130,8 @@ class KernelCrash_XIVE_off(PowerNVDump): def runTest(self): obj = OpTestInstallUtil.InstallUtil() - if not obj.update_kernel_cmdline(self.distro, remove_args="default_hugepagesz=1GB hugepagesz=1GB hugepages=80", - reboot=True, reboot_cmd=True): - self.fail("KernelArgTest failed to remove kernel args:default_hugepagesz=1GB hugepagesz=1GB hugepages=80") + obj.update_kernel_cmdline(self.distro, remove_args="default_hugepagesz=1GB hugepagesz=1GB hugepages=80", + reboot=True, reboot_cmd=True) self.cv_SYSTEM.goto_state(OpSystemState.OS) self.setup_test() log.info("=============== Testing kdump/fadump with xive=off ===============") @@ -1178,9 +1177,8 @@ class KernelCrash_disable_radix(PowerNVDump): def runTest(self): obj = OpTestInstallUtil.InstallUtil() - if not obj.update_kernel_cmdline(self.distro, remove_args="xive=off", - reboot=True, reboot_cmd=True): - self.fail("KernelArgTest failed to remove kernel args:xive=off") + obj.update_kernel_cmdline(self.distro, remove_args="xive=off", + reboot=True, reboot_cmd=True) self.cv_SYSTEM.goto_state(OpSystemState.OS) self.setup_test() log.info("Testing kdump/fadump with disable_radix") @@ -1290,9 +1288,8 @@ def makedump_check(self): def runTest(self): obj = OpTestInstallUtil.InstallUtil() - if not obj.update_kernel_cmdline(self.distro, remove_args="disable_radix", - reboot=True, reboot_cmd=True): - self.fail("KernelArgTest failed to remove kernel args:disable_radix") + obj.update_kernel_cmdline(self.distro, remove_args="disable_radix", + reboot=True, reboot_cmd=True) self.kernel_crash() self.makedump_check()