Author: gnichols
Date: 2010-02-01 13:50:47 +0000 (Mon, 01 Feb 2010)
New Revision: 362
Modified:
trunk/tests/audio/audio.py
trunk/tests/info/info.py
Log:
560635 - info test fails due to difficulties in parsing /etc/redhat-release
Modified: trunk/tests/audio/audio.py
===================================================================
--- trunk/tests/audio/audio.py 2010-02-01 13:50:00 UTC (rev 361)
+++ trunk/tests/audio/audio.py 2010-02-01 13:50:47 UTC (rev 362)
@@ -18,6 +18,7 @@
from v7.test import Test
from v7.tags import Constants, DeviceClass
from v7.hal import Hal
+from v7.redhatrelease import RedHatRelease
class AudioTest(Test):
@@ -38,9 +39,9 @@
def getRequiredRPMs(self):
rpms = ["sox"]
- (osProduct, osVersion, osCodeName) = self.getRedHatRelease()
- if "Fedora" in osProduct or ("Red Hat" in osProduct and
"6" in osVersion):
- pass # need to find system-config-sourndcard
+ redhat = RedHatRelease()
+ if "Fedora" in redhat.getProduct() or ("Red Hat" in
redhat.getProduct() and redhat.getVersion() is 6):
+ pass # need to find system-config-soundcard
else:
rpms.append("system-config-soundcard")
return rpms
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-02-01 13:50:00 UTC (rev 361)
+++ trunk/tests/info/info.py 2010-02-01 13:50:47 UTC (rev 362)
@@ -20,6 +20,7 @@
from v7.test import Test
from v7.tags import Constants, DeviceClass
from v7.command import Command, V7CommandException
+from v7.redhatrelease import RedHatRelease
class InfoTest(Test):
@@ -28,9 +29,8 @@
self.deviceClass = DeviceClass.system
self.mandatory = Constants.post # required at the end of each run
# what RHEL are we testing?
- self.osVersion = "6"
- (self.osProduct, self.osVersion, self.osCodeName) = self.getRedHatRelease()
- print "Tested OS: %s %s (%s)" % (self.osProduct, self.osVersion,
self.osCodeName)
+ self.redHatRelease = RedHatRelease()
+ print "Tested OS: %s %s (%s)" % (self.redHatRelease.getProduct(),
self.redHatRelease.getVersion(), self.redHatRelease.getCodeName())
@@ -58,7 +58,7 @@
unameOutput = unameOutput.strip()
self.kernelRPMName = None
- if "Red Hat" in self.osProduct and self.osVersion == "4":
+ if "Red Hat" in self.redHatRelease.getProduct() and
self.redHatRelease.getVersion() == 4:
pattern =
re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$")
match = pattern.search(unameOutput)
if match:
@@ -68,7 +68,7 @@
else:
self.kernelRPMName = "kernel-%s" %
match.group("versionRelease")
- elif "Red Hat" in self.osProduct and self.osVersion == "5":
+ elif "Red Hat" in self.redHatRelease.getProduct() and
self.redHatRelease.getVersion() == 5:
pattern =
re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE)?$")
match = pattern.search(unameOutput)
if match:
@@ -77,7 +77,7 @@
flavor = "%s-" % match.group("flavor")
self.kernelRPMName = "kernel-%s%s%s" % (flavor,
match.group("versionRelease"), match.group("product"))
- elif 'Fedora' in self.osProduct:
+ elif 'Fedora' in self.redHatRelease.getProduct():
print "looking for Fedora kernel"
print unameOutput
pattern =
re.compile("(?P<versionRelease>[^a-z]*)(?P<product>fc[0-9]+)(?P<arch>\..*)$")
@@ -189,7 +189,7 @@
break
# module is NOT from the kernel RPM.
if not found:
- if "Red Hat" in self.osProduct and self.osVersion ==
"4":
+ if "Red Hat" in self.redHatRelease.getProduct() and
self.redHatRelease.getVersion() == 4:
print "Error: Non-Red Hat kernel module %s" % module
elif not self.abiCheck(module):
print "Error: Non-Red Hat kernel module %s fails ABI Whitelist
check." % module
@@ -321,7 +321,7 @@
def abiCheck(self, module):
whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.kernel,
self.arch)
- print "Red Hat Enterprise Linux %s ABI" % self.osVersion
+ print "Red Hat Enterprise Linux %u ABI" %
self.redHatRelease.getVersion()
print "--------------------------------"
print ""
print "Module: " + module
@@ -354,7 +354,7 @@
def generateSystemReport(self):
outputDirectory = os.getcwd()
reportCommand = "sosreport"
- if "Red Hat" in self.osProduct and self.osVersion == "4":
+ if "Red Hat" in self.redHatRelease.getProduct() and
self.redHatRelease.getVersion() == 4:
report = "sysreport"
pipe = os.popen("echo -e '\n\n' | %s -k rpm.rpmva=off
2>&1" % reportCommand)
result = False
Show replies by date