Author: gnichols Date: 2010-08-18 15:38:56 +0000 (Wed, 18 Aug 2010) New Revision: 642

Modified: trunk/tests/info/info.py Log: 512153 - [RHEL5.3 GA] Hardware Certification Test failed with Error: kernel is tainted (value = 64)

Modified: trunk/tests/info/info.py =================================================================== --- trunk/tests/info/info.py 2010-08-18 15:32:53 UTC (rev 641) +++ trunk/tests/info/info.py 2010-08-18 15:38:56 UTC (rev 642) @@ -156,21 +156,17 @@ if not line: break module = line.split()[0] + moduleFile = self.getModuleFile(module)

# check that modules come from the kernel RPM. - found = False - if self.getModuleFile(module) in kernelRPMModuleList: - found = True - break - # module is NOT from the kernel RPM. - if not found: + if not moduleFile in kernelRPMModuleList: # RHEL4 does not include kmod if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() == 4: print "Error: Non-Red Hat kernel module %s" % module success = False # RH kmods are allowed - elif self.checkModuleVenderAndBuildHost(module) and Command("rpm -Vf %s" % moduleFileName): - print "kmod package: %s" % Command("rpm -qf %s" % moduleFileName).getString() + elif self.checkModuleVenderAndBuildHost(module) and Command("rpm -Vf %s" % moduleFile): + print "kmod package: %s" % Command("rpm -qf %s" % moduleFile).getString() # Check non-RH modules ABI; but still fail else: self.abiCheck(module) @@ -185,7 +181,7 @@ try: moduleFile = self.getModuleFile(module)

- vendor = Command("rpm -qf %s --qf %%{BUILDHOST}" % moduleFile).getString() + vendor = Command("rpm -qf %s --qf %%{VENDOR}" % moduleFile).getString() if vendor in goodVendorList: pass elif vendor in warnVendorList: @@ -273,7 +269,10 @@ modInfoSrcVersion = Command("modinfo -F srcversion %s" % module).getString() sysSrcVersion = open("/sys/module/%s/srcversion" % module).readline().strip() if sysSrcVersion == modInfoSrcVersion: - return Command("modinfo -F filename %s" % module).getString() + moduleFile =Command("modinfo -F filename %s" % module).getString() + if os.path.islink(moduleFile): + moduleFile = os.readlink(moduleFile) + return moduleFile return None