Author: gnichols
Date: 2012-03-16 16:24:42 +0000 (Fri, 16 Mar 2012)
New Revision: 1222
Modified:
trunk/tests/info/info.py
Log:
687990 - FV_CORE INFO test fails because sosreport expects user response\n 767059 - info:
kmod rpm verify command is not running
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-03-09 12:35:37 UTC (rev 1221)
+++ trunk/tests/info/info.py 2012-03-16 16:24:42 UTC (rev 1222)
@@ -270,8 +270,14 @@
print "Error: Non-Red Hat kernel module %s" % module
success = False
# RH kmods are allowed
- elif self.checkModuleVenderAndBuildHost(module) and Command("rpm -Vf
%s" % moduleFile):
- print "kmod package: %s" % Command("rpm -qf %s" %
moduleFile).getString()
+ elif self.checkModuleVenderAndBuildHost(module):
+ try:
+ Command("rpm -Vf %s" % moduleFile).run()
+ print "kmod package: %s" % Command("rpm -qf
%s" % moduleFile).getString()
+ except Exception, e:
+ print "Error: verification failed for kmod %s" %
moduleFile
+ print e
+ success = False
# Check non-RH modules ABI; but still fail
else:
self.abiCheck(module)
@@ -453,10 +459,10 @@
# otherwise, uses sosreport
else:
# try --no-progressbar for some RHEL5's
- result = self.__processSystemReport("sosreport -n selinux
--no-progressbar")
+ result = self.__processSystemReport("sosreport --batch -n selinux
--batch --no-progressbar")
# if that fails, leave off --no-progressbar
if not result:
- result = self.__processSystemReport("sosreport -n selinux")
+ result = self.__processSystemReport("sosreport --batch -n
selinux")
dmidecode = "/usr/sbin/dmidecode"
Show replies by date