Skip to content

Commit 65aea72

Browse files
Merge pull request #831 from SACHIN-BAPPALIGE/fix_kernel_args_cleanup
Fix removal of kernel args left from previous testcase
2 parents 170e259 + d865960 commit 65aea72

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

testcases/PowerNVDump.py

+6-9
Original file line numberDiff line numberDiff line change
@@ -1130,9 +1130,8 @@ class KernelCrash_XIVE_off(PowerNVDump):
11301130

11311131
def runTest(self):
11321132
obj = OpTestInstallUtil.InstallUtil()
1133-
if not obj.update_kernel_cmdline(self.distro, remove_args="default_hugepagesz=1GB hugepagesz=1GB hugepages=80",
1134-
reboot=True, reboot_cmd=True):
1135-
self.fail("KernelArgTest failed to remove kernel args:default_hugepagesz=1GB hugepagesz=1GB hugepages=80")
1133+
obj.update_kernel_cmdline(self.distro, remove_args="default_hugepagesz=1GB hugepagesz=1GB hugepages=80",
1134+
reboot=True, reboot_cmd=True)
11361135
self.cv_SYSTEM.goto_state(OpSystemState.OS)
11371136
self.setup_test()
11381137
log.info("=============== Testing kdump/fadump with xive=off ===============")
@@ -1178,9 +1177,8 @@ class KernelCrash_disable_radix(PowerNVDump):
11781177

11791178
def runTest(self):
11801179
obj = OpTestInstallUtil.InstallUtil()
1181-
if not obj.update_kernel_cmdline(self.distro, remove_args="xive=off",
1182-
reboot=True, reboot_cmd=True):
1183-
self.fail("KernelArgTest failed to remove kernel args:xive=off")
1180+
obj.update_kernel_cmdline(self.distro, remove_args="xive=off",
1181+
reboot=True, reboot_cmd=True)
11841182
self.cv_SYSTEM.goto_state(OpSystemState.OS)
11851183
self.setup_test()
11861184
log.info("Testing kdump/fadump with disable_radix")
@@ -1290,9 +1288,8 @@ def makedump_check(self):
12901288

12911289
def runTest(self):
12921290
obj = OpTestInstallUtil.InstallUtil()
1293-
if not obj.update_kernel_cmdline(self.distro, remove_args="disable_radix",
1294-
reboot=True, reboot_cmd=True):
1295-
self.fail("KernelArgTest failed to remove kernel args:disable_radix")
1291+
obj.update_kernel_cmdline(self.distro, remove_args="disable_radix",
1292+
reboot=True, reboot_cmd=True)
12961293
self.kernel_crash()
12971294
self.makedump_check()
12981295

0 commit comments

Comments
 (0)