Author: gnichols Date: 2011-07-12 10:39:28 +0000 (Tue, 12 Jul 2011) New Revision: 994

Modified: trunk/tests/kdump/kdump.py Log: 701491 - kdump test should improve dependant rpm installation and logging

Modified: trunk/tests/kdump/kdump.py =================================================================== --- trunk/tests/kdump/kdump.py 2011-07-12 10:38:57 UTC (rev 993) +++ trunk/tests/kdump/kdump.py 2011-07-12 10:39:28 UTC (rev 994) @@ -24,6 +24,7 @@ from v7.documentbase import DocumentWrapper from v7.continuation import Continuation from v7.configfile import ConfigFile +from v7.redhatrelease import RedHatRelease

class KDumpTest(Test): @@ -38,9 +39,15 @@ self.priority = 1001 # run last self.coreCollector = "makedumpfile -d 31" self.kdumpConfigPath = "/etc/kdump.conf" + self.redHatRelease = RedHatRelease()

def getRequiredRPMs(self): - rpms = ["kernel-debug", "kernel-debuginfo", "kexec-tools"] + rpms = ["kexec-tools", "crash"] + variantString = "" + if self.redHatRelease.getKernelFlavor(): + variantString = "-" + self.redHatRelease.getKernelFlavor() + rpms.append("kernel%s-debuginfo" % variantString) + return rpms

def plan(self, devices): @@ -64,16 +71,16 @@ return [TestTag.noninteractive, TestTag.certification]

def configureKDump(self): - # if kdump is set up, use it - print "Checking kdump configuration" verified = True - # log kexec-tools installation - try: - kexecRPM = Command("rpm -q kexec-tools").getString() - print "kexec-tools installed: " + kexecRPM - except: - pass + # log required rpms installation + print "Checking required packages:" + for rpm in self.getRequiredRPMs(): + try: + print Command("rpm -q %s" % rpm).getString() + except: + pass

+ print "Checking kdump configuration" # check crashkernel on kernel command line kernelBootParams = Command("cat /proc/cmdline") kdump = None @@ -83,7 +90,7 @@ print "Found crashkernel=%s boot parameter" % kdump except: print "Error: "crashkernel" is not set in boot parameters" - verified = False + return False

# check kernel panic timeout, and set to 1sec if necessary try: