Merge pull request #831 from SACHIN-BAPPALIGE/fix_kernel_args_cleanup

Fix removal of kernel args left from previous testcase
open-power · Apr 25, 2024 · 65aea72 · 65aea72
2 parents 170e259 + d865960
commit 65aea72
Showing 1 changed file with 6 additions and 9 deletions.
diff --git 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()