Author: gnichols
Date: 2012-03-22 18:40:15 +0000 (Thu, 22 Mar 2012)
New Revision: 1236
Modified:
trunk/tests/info/info.py
trunk/v7/redhatrelease.py
Log:
804492 - V7 should not pass the debug kernel in info when used for hardware tests.
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-03-22 18:35:38 UTC (rev 1235)
+++ trunk/tests/info/info.py 2012-03-22 18:40:15 UTC (rev 1236)
@@ -55,9 +55,15 @@
# print kernel info
# this is kind of weird - is this what the hardware catalog expects?
print "+ rpm -ql %s" % self.redHatRelease.getKernelRPMName()
+ success = True
- success = self.checkKernelIsGA()
+ if self.redHatRelease.kernelIsDebug():
+ print "Error: debug kernel"
+ success = False
+ if not self.checkKernelIsGA():
+ success = False
+
#is the kernel tainted?
try:
taintedFile = open("/proc/sys/kernel/tainted", "r")
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-03-22 18:35:38 UTC (rev 1235)
+++ trunk/v7/redhatrelease.py 2012-03-22 18:40:15 UTC (rev 1236)
@@ -29,6 +29,7 @@
self.kernelRPMName = None
self.kernelDevelRPMName = None
self.kernelFlavor = None
+ self.debugKernel = False
self._read()
self._parse()
@@ -84,7 +85,6 @@
self.parseUnameOutput(unameOutput)
def parseUnameOutput(self, unameOutput):
-
self.kernelRPMName = None
self.kernelDevelRPMName = "kernel-devel"
self.kernelVersionRelease = None
@@ -98,6 +98,8 @@
else:
self.kernelRPMName = "kernel-%s" %
match.group("versionRelease")
self.kernelVersionRelease = match.group("versionRelease")
+ if "debug" in unameOutput:
+ self.debugKernel = True
elif "Red Hat" in self.getProduct() and self.getVersion() >= 5:
pattern =
re.compile("(?P<versionRelease>.*)\.(?P<product>el[0-9]+)(?P<flavor>xen|PAE|rt)?(?P<arch>.*)$")
@@ -114,6 +116,9 @@
self.kernelRPMName = self.kernelRPMName + "rt"
self.kernelVersionRelease = match.group("versionRelease")
+ if match.group("arch"):
+ if "debug" in match.group("arch"):
+ self.debugKernel = True
elif 'Fedora' in self.getProduct():
pattern =
re.compile("(?P<versionRelease>.*)\.(?P<product>fc[0-9]+)(?P<arch>.*)$")
@@ -121,7 +126,8 @@
if match:
self.kernelRPMName = "kernel-%s.%s%s" %
(match.group("versionRelease"), match.group("product"),
match.group("arch"))
self.kernelVersionRelease = match.group("versionRelease")
-
+ if "debug" in match.group("arch"):
+ self.debugKernel = True
if not self.kernelRPMName:
print "Error: could not determine kernel RPM name"
self.kernelRPMName = None
@@ -160,6 +166,7 @@
def getKernelVersionRelease(self): return self.kernelVersionRelease
def getArch(self): return self.arch
def getKernelFlavor(self): return self.kernelFlavor
+ def kernelIsDebug(self): return self.debugKernel
def getVersionPointUpdate(self):
@@ -223,7 +230,8 @@
"2.6.30.10-105.2.23.fc11.x86_64",
"2.6.32.11-99.fc12.x86_64",
"2.6.34-0.38.rc5.git0.fc14.x86_64",
- "2.6.31.12-1.rt21.1.fc12.ccrma.x86_64")
+ "2.6.31.12-1.rt21.1.fc12.ccrma.x86_64",
+ "2.6.32-220.el6.i686.debug")
for unameOutput in unameOutputs:
@@ -236,9 +244,12 @@
print "kernel devel RPM: " + redHatRelease.getKernelDevelRPMName()
if redHatRelease.getKernelFlavor():
print "kernel flavor: " + redHatRelease.getKernelFlavor()
+ if redHatRelease.kernelIsDebug():
+ print "Warning: debug kernel"
+
else:
result = FAILED
-
+
if result is FAILED:
print "FAILED"
else:
Show replies by date