r362 - in trunk/tests: audio info
by gnichols＠fedoraproject.org
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
14 years, 3 months
r361 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-02-01 13:50:00 +0000 (Mon, 01 Feb 2010)
New Revision: 361
Modified:
trunk/v7/opticalDiskTest.py
Log:
560635 - info test fails due to difficulties in parsing /etc/redhat-release
Modified: trunk/v7/opticalDiskTest.py
===================================================================
--- trunk/v7/opticalDiskTest.py 2010-02-01 13:49:48 UTC (rev 360)
+++ trunk/v7/opticalDiskTest.py 2010-02-01 13:50:00 UTC (rev 361)
@@ -33,6 +33,8 @@
from v7.device import Device
from v7.command import Command, V7CommandException
from v7.v7kudzu import Kudzu
+from v7.redhatrelease import RedHatRelease
+
class OpticalDiskTest(Test):
def __init__(self, name):
@@ -86,8 +88,8 @@
def getRequiredRPMs(self):
rpms = ["dvd+rw-tools"]
- (osProduct, osVersion, osCodeName) = self.getRedHatRelease()
- if "Fedora" in osProduct or ("Red Hat" in osProduct and "6" in osVersion):
+ redhat = RedHatRelease()
+ if "Fedora" in redhat.getProduct() or ("Red Hat" in redhat.getProduct() and redhat.getVersion() is 6):
rpms.append("genisoimage") # for mkisofs
rpms.append("wodim") # for cdrecord
else:
14 years, 3 months
r360 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-02-01 13:49:48 +0000 (Mon, 01 Feb 2010)
New Revision: 360
Modified:
trunk/v7/commandLineUI.py
trunk/v7/hardwaretest.py
Log:
560635 - info test fails due to difficulties in parsing /etc/redhat-release
Modified: trunk/v7/commandLineUI.py
===================================================================
--- trunk/v7/commandLineUI.py 2010-02-01 13:49:28 UTC (rev 359)
+++ trunk/v7/commandLineUI.py 2010-02-01 13:49:48 UTC (rev 360)
@@ -18,9 +18,7 @@
from v7.tags import Constants
-class CommandLineUI:
-
-
+class CommandLineUI:
# utilities
def printPipe(self, pipe):
while 1:
@@ -69,16 +67,5 @@
return self.promptConfirm(question=("%s - continue? " % message))
- def getRedHatRelease(self):
- f=open("/etc/redhat-release")
- line=f.readline()
- f.close()
- if line:
- pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[1-9\.]+) \((?P<name>[a-zA-Z0-9\ ]+)\)")
- match = pattern.match(line)
- product = None
- if match.group("product"):
- product = match.group("product").strip()
- return (product, match.group("number"), match.group("name"))
- return (None, None, None)
+
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2010-02-01 13:49:28 UTC (rev 359)
+++ trunk/v7/hardwaretest.py 2010-02-01 13:49:48 UTC (rev 360)
@@ -42,6 +42,7 @@
from v7.device import Device, HalDevice
from v7.command import Command, V7CommandException
from v7.resultsengine import ResultsEngine
+from v7.redhatrelease import RedHatRelease
class HardwareTestHarness(Controller):
@@ -220,15 +221,15 @@
print "Hardware: %s %s %s" % (self.certification.getHardware(Tags.vendor),
self.certification.getHardware(Tags.make),
self.certification.getHardware(Tags.model))
- (product, name, number) = self.getRedHatRelease()
- self.certification.setOS(Tags.name, name)
- if number:
- self.certification.setOS(Tags.release, number)
+ redHatRelease = RedHatRelease()
+ self.certification.setOS(Tags.name, redHatRelease.getCodeName())
+ if redHatRelease.getVersionPointUpdate():
+ self.certification.setOS(Tags.release, redHatRelease.getVersionPointUpdate())
else:
print "Error: could not determine OS release number"
return False
- if product:
- self.certification.setOS(Tags.product, product)
+ if redHatRelease.getProduct():
+ self.certification.setOS(Tags.product, redHatRelease.getProduct())
else:
print "Error: could not determine OS product name"
return False
14 years, 3 months
r359 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-02-01 13:49:28 +0000 (Mon, 01 Feb 2010)
New Revision: 359
Added:
trunk/v7/redhatrelease.py
Log:
560635 - info test fails due to difficulties in parsing /etc/redhat-release
Added: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py (rev 0)
+++ trunk/v7/redhatrelease.py 2010-02-01 13:49:28 UTC (rev 359)
@@ -0,0 +1,94 @@
+ # Copyright (c) 2006 Red Hat, Inc. All rights reserved. This copyrighted material
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Greg Nichols
+#
+import string, os, sys, re
+
+class RedHatRelease:
+
+ def __init__(self):
+ self.product = None
+ self.version = None
+ self.update = None
+ self.codeName = None
+ self._read()
+ self._parse()
+
+ def _read(self):
+ f=open("/etc/redhat-release")
+ self.text=f.readline()
+ f.close()
+
+ def _parse(self):
+ if self.text:
+ pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[1-9\.]+) \((?P<name>[a-zA-Z0-9\ ]+)\)")
+ match = pattern.match(self.text)
+ if match.group("product"):
+ self.product = match.group("product").strip()
+ if match.group("name"):
+ self.codeName = match.group("name").strip()
+ if match.group("number"):
+ majorMinor = match.group("number").split('.')
+ if len(majorMinor)>0:
+ self.version = int(majorMinor[0])
+ if len(majorMinor)>1:
+ self.update = int(majorMinor[1])
+ else:
+ nameParts = self.codeName.split(' ')
+ if len(nameParts) == 3:
+ self.update = int(nameParts[2])
+
+
+ def isValid(self):
+ return self.product and self.version and self.codeName
+
+
+ def getProduct(self): return self.product
+ def getVersion(self): return self.version
+ def getUpdate(self): return self.update
+ def getCodeName(self): return self.codeName
+
+ def getVersionPointUpdate(self):
+ if self.update:
+ return "%u.%u" % (self.version, self.update)
+ else:
+ return "%u" % self.version
+
+ def dump(self):
+ print ""
+ print self.text
+ print "-------------------------------"
+ print "Product: \"" + self.getProduct() + "\""
+ print "Version: \"" + str(self.getVersion()) + "\""
+ print "Update: \"" + str(self.getUpdate()) + "\""
+ print "Version.Update \"" + self.getVersionPointUpdate() + "\""
+ print "Code Name: \"" + self.getCodeName() + "\""
+ if not self.isValid():
+ print "Not Valid"
+
+if __name__ == "__main__":
+ redHatRelease = RedHatRelease()
+ redHatRelease.dump()
+
+ redHatRelease.text = "Red Hat Enterprise Linux Server release 5.4 (Tikanga)"
+ redHatRelease._parse()
+ redHatRelease.dump()
+
+ redHatRelease.text = "Red Hat Enterprise Linux release 4 (Bogus Update 3)"
+ redHatRelease._parse()
+ redHatRelease.dump()
+
+
+
+
\ No newline at end of file
14 years, 3 months
r358 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-02-01 13:48:58 +0000 (Mon, 01 Feb 2010)
New Revision: 358
Modified:
trunk/Makefile
Log:
R6
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-02-01 13:38:06 UTC (rev 357)
+++ trunk/Makefile 2010-02-01 13:48:58 UTC (rev 358)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.1
-V7_RELEASE := 5
+V7_RELEASE := 6
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
14 years, 3 months
r357 - trunk/tests/cdrom
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-02-01 13:38:06 +0000 (Mon, 01 Feb 2010)
New Revision: 357
Removed:
trunk/tests/cdrom/cdrom.patch
Log:
cdrom.patch
Deleted: trunk/tests/cdrom/cdrom.patch
===================================================================
14 years, 3 months