v7-commits January 2010

v7-commits@lists.fedorahosted.org

3 participants
76 discussions

r356 - in tags: . v7-V1-1R5/v7
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 15:08:50 +0000 (Fri, 29 Jan 2010) New Revision: 356 Added: tags/v7-V1-1R5/ tags/v7-V1-1R5/v7/version.py Log: tag version Copied: tags/v7-V1-1R5 (from rev 355, trunk) Copied: tags/v7-V1-1R5/v7/version.py (from rev 335, trunk/v7/version.py) =================================================================== --- tags/v7-V1-1R5/v7/version.py (rev 0) +++ tags/v7-V1-1R5/v7/version.py 2010-01-29 15:08:50 UTC (rev 356) @@ -0,0 +1,5 @@ + +# v7/version.py is automatically-generated - DO NOT EDIT +version = '1.1' +release = '5' +rhel_version = '5'

1 0

r355 - trunk/v7
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 15:00:53 +0000 (Fri, 29 Jan 2010) New Revision: 355 Removed: trunk/v7/version.py Log: build product should not be under source control Deleted: trunk/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-29 14:59:10 UTC (rev 354) +++ trunk/v7/version.py 2010-01-29 15:00:53 UTC (rev 355) @@ -1,5 +0,0 @@ - -# v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6'

1 0

r354 - trunk
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:59:10 +0000 (Fri, 29 Jan 2010) New Revision: 354 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-29 14:57:56 UTC (rev 353) +++ trunk/v7.spec.in 2010-01-29 14:59:10 UTC (rev 354) @@ -27,8 +27,8 @@ # hotplug, /usr/X11R6/bin/x11perf, perl, up2date >= 4.2.57-2, kudzu, ltp, lmbench, dt, schedutils Obsoletes: hts -Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build, mt-st, mkisofs, dvd+rw-tools -Requires: cdrecord, dbus-python, kernel-devel, kernel-headers +Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build +Requires: dbus-python, kernel-devel, kernel-headers @@ -68,6 +68,15 @@ /usr/share/man/man8/v7.8.gz %changelog +* Fri Jan 29 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.1 R5 + + 192245 - info test should call sosreport instead of sysreport + 555842 - tests should make use of runtime requires feature + 555898 - optical tests should provide a method to force/override + the read-only, write, re-write code path decision + * Wed Jan 26 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.1 R3

1 0

r353 - trunk/v7
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:57:56 +0000 (Fri, 29 Jan 2010) New Revision: 353 Modified: trunk/v7/hardwaretest.py Log: 192245 - info test should call sosreport instead of sysreport Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-29 14:57:37 UTC (rev 352) +++ trunk/v7/hardwaretest.py 2010-01-29 14:57:56 UTC (rev 353) @@ -856,19 +856,6 @@ def getArch(self): system,node,release,version,machine = os.uname() return machine - - 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) def makeTestRunDirectory(self): """Create a directory for the current test run"""

1 0

r352 - trunk/v7
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:57:37 +0000 (Fri, 29 Jan 2010) New Revision: 352 Modified: trunk/v7/commandLineUI.py trunk/v7/controller.py Log: 192245 - info test should call sosreport instead of sysreport Modified: trunk/v7/commandLineUI.py =================================================================== --- trunk/v7/commandLineUI.py 2010-01-29 14:56:23 UTC (rev 351) +++ trunk/v7/commandLineUI.py 2010-01-29 14:57:37 UTC (rev 352) @@ -13,7 +13,7 @@ # # Author: Greg Nichols # -import string, os, sys, copy +import string, os, sys, copy, re from v7.tags import Constants @@ -68,4 +68,17 @@ def promptContinue(self, message): 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/controller.py =================================================================== --- trunk/v7/controller.py 2010-01-29 14:56:23 UTC (rev 351) +++ trunk/v7/controller.py 2010-01-29 14:57:37 UTC (rev 352) @@ -91,4 +91,5 @@ print "Error: Could not find log messages in %s!" % syslog return contents - + def getRedHatRelease(self): + return self.ui.getRedHatRelease()

1 0

r351 - trunk/v7
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:56:23 +0000 (Fri, 29 Jan 2010) New Revision: 351 Modified: trunk/v7/opticalDiskTest.py Log: 555898 - optical tests should provide a method to force/override the read-only, write, re-write code path decision Modified: trunk/v7/opticalDiskTest.py =================================================================== --- trunk/v7/opticalDiskTest.py 2010-01-29 14:56:06 UTC (rev 350) +++ trunk/v7/opticalDiskTest.py 2010-01-29 14:56:23 UTC (rev 351) @@ -82,6 +82,18 @@ tests.append(test) return tests + + + 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): + rpms.append("genisoimage") # for mkisofs + rpms.append("wodim") # for cdrecord + else: + rpms.append("mkisofs") + rpms.append("cdrecord") + return rpms def handleEject(self,cdromDevice): @@ -210,15 +222,15 @@ def printMediaName(self, media): mediaName = media.upper() - if "PLUS" in media: + if "PLUS" in mediaName: mediaName = mediaName.replace("PLUS", "+") - elif "DVD" in media and media != "DVD": + elif "DVD" in mediaName and mediaName != "DVD": mediaName = mediaName.replace("DVD", "DVD-") - elif "CD" in media and media != "CD": + elif "CD" in mediaName and mediaName != "CD": mediaName = mediaName.replace("CD", "CD-") elif mediaName == "CD": mediaName = "CDROM" - return media + return mediaName.lower() def convertMediaName(self, name): name = name.lower() @@ -474,7 +486,7 @@ # ask user to insert a disk try: Command("eject /dev/%s" % self.getLogicalDeviceName()).run() - self.prompt("\n Please insert a %s disk into %s and then press ENTER to continue !" % (message, self.getLogicalDeviceName())) + self.prompt("Please insert a %s disk into %s and then press ENTER to continue !" % (message, self.getLogicalDeviceName())) Command("eject -t /dev/%s" % self.getLogicalDeviceName()) except V7CommandException, exception: print exception

1 0

r350 - in trunk/tests: cdrom dvd
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:56:06 +0000 (Fri, 29 Jan 2010) New Revision: 350 Modified: trunk/tests/cdrom/cdrom.py trunk/tests/dvd/dvd.py Log: 555898 - optical tests should provide a method to force/override the read-only, write, re-write code path decision Modified: trunk/tests/cdrom/cdrom.py =================================================================== --- trunk/tests/cdrom/cdrom.py 2010-01-29 14:52:35 UTC (rev 349) +++ trunk/tests/cdrom/cdrom.py 2010-01-29 14:56:06 UTC (rev 350) @@ -124,10 +124,13 @@ if not self.initializeDeviceInfo(): return FAILED - print "\n Your CD/DVD device /dev/%s supports %s " % (self.getLogicalDeviceName(), self.showSupportedMedia()) - print " We will check these features. " - print " You need to prepare following media(disks) for this test: \n" - self.askForDisk(self.supportedMedia[0]) + print "Your device /dev/%s supports %s " % (self.getLogicalDeviceName(), self.showSupportedMedia()) + if self.promptConfirm( "Would you like to test %s media?" % self.printMediaName(self.supportedMedia[0])): + media = self.supportedMedia[0] + else: + media = self.convertMediaName(self.prompt("What media would you like to test?", map(self.printMediaName, self.supportedMedia))) + print "Required media:" + self.askForDisk(media) # if auto or self-test mode if self.getMode() != Constants.normal: @@ -135,17 +138,18 @@ return 0 # otherwise, normal test mode - self.prompt("\n Press ENTER when you are ready ! Or press Ctrl-C to quit !") + if not self.promptConfirm("continue?"): + return FAILED # test cdrom/cd-r/cd-rw - if self.supportedMedia[0] == "cdrom" and self.testDisk(message="data CD", readWriteMode="read", type="cdrom"): + if media == "cdrom" and self.testDisk(message="data CD", readWriteMode="read", type="cdrom"): return PASSED - if self.supportedMedia[0] == "cdr" and self.testDisk(message="blank CD-R", readWriteMode="write", type="cdrom"): + if media == "cdr" and self.testDisk(message="blank CD-R", readWriteMode="write", type="cdrom"): return PASSED - if self.supportedMedia[0] == "cdrw" and self.testDisk(message="good CD-RW", readWriteMode="rewrite", type="cdrom"): + if media == "cdrw" and self.testDisk(message="good CD-RW", readWriteMode="rewrite", type="cdrom"): return PASSED # OTHERWISE Modified: trunk/tests/dvd/dvd.py =================================================================== --- trunk/tests/dvd/dvd.py 2010-01-29 14:52:35 UTC (rev 349) +++ trunk/tests/dvd/dvd.py 2010-01-29 14:56:06 UTC (rev 350) @@ -43,84 +43,14 @@ self.deviceClass = DeviceClass.optical self.fileSourceDir = "/usr/share" # ranges from 970MB-3.5GB - def askForDisks(self): - - # given that self.supportedMediaTypes is in order of preference, - # find the most preferred media type to test for "-" and "+" incarnations - dvdMode = None - dvdPlusMode = None - for media in self.supportedMedia: - if "plus" in media: - if dvdPlusMode is None: - dvdPlusMode = media - elif dvdMode is None: - dvdMode = media - - # DVD-/+ both ? - if dvdMode is None or dvdPlusMode is None: - dvdBoth = False - else: - dvdBoth = True - - if dvdBoth: - if dvdMode == "dvdrw": - print " --- one good DVD-RW or DVD+RW disk " - elif dvdMode == "dvdr": - print " --- one blank DVD-R or DVD+R disk " - else: - print "\n +++ Error: Unknown dvdMode.\n" - return False - elif dvdMode: - if dvdMode == "dvd": - print " --- one DVD data disk which contains more than 800MiB of data. " - print " (e.g. one RHEL5 install DVD disk) " - elif dvdMode == "dvdr": - print " --- one blank DVD-R disk " - elif dvdMode == "dvdrw": - print " --- one good DVD-RW disk " - else: - print "\n +++ Error: Unknown dvdMode.\n" - return False - elif dvdPlusMode: - if dvdPlusMode == "dvdplusr": - print " --- one blank DVD-R or DVD+R disk " - elif dvdPlusMode == "dvdplusrw": - print " --- one good DVD-RW or DVD+RW disk " - else: - print "\n +++ Error: Unknown dvdPlusMode.\n" - else: - print "\n" - sys.stdout.flush() - return (dvdBoth, dvdMode, dvdPlusMode) + def getMediaChoice(self): + # default to the most-capable media + self.mediaChoice = self.supportedMedia[0] + if not self.promptConfirm("Would you like to test %s media?" % self.printMediaName(self.mediaChoice)): + choice = self.prompt("Please choose the media to be tested: ", map(self.printMediaName, self.supportedMedia)) + self.mediaChoice = self.convertMediaName(choice) - def getMediaChoice(self): - (bothPlusAndMinusMedia, dvdMode, dvdPlusMode) = self.askForDisks() - # if support both dvd- and dvd+ - if bothPlusAndMinusMedia: - print "\n" - print " Your DVD drive /dev/%s supports both %s and %s . " % (self.getLogicalDeviceName(),dvdMode,dvdPlusMode) - print " To save the testing time, only one of them is required to be tested . " - print " ( Of course you can choose to test both of them :-) )" - - self.mediaChoices = [dvdMode, dvdPlusMode, "both"] - if self.getMode() == Constants.normal: - while True: - choice = self.prompt("Which media would you like to test?", self.mediaChoices) - if choice in self.mediaChoices: - self.mediaChoice = choice - return self.mediaChoice - else: - print "please choose one of:" - print self.mediaChoices - - # otherwise - if dvdMode: - self.mediaChoice = dvdMode - elif dvdPlusMode: - rself.mediaChoice = dvdPlusMode - else: - print "Error: could not determine media to test" def checkMediaSize(self, size): if size < 800000 : @@ -210,20 +140,14 @@ return FAILED # show features we found - print "\n Your CD/DVD device /dev/%s supports %s " % (self.getLogicalDeviceName(), self.showSupportedMedia()) - print " We will check these features. " - print " You need to prepare following media(disks) for this test: \n" + print "Your CD/DVD device /dev/%s supports %s " % (self.getLogicalDeviceName(), self.showSupportedMedia()) - self.getMediaChoice() # if auto or self-test mode if self.getMode() != Constants.normal: print "Warning: Auto test mode - TESTS NOT RUN" return 0 - - # otherwise, normal test mode - self.prompt("\n Press ENTER when you are ready ! Or press Ctrl-C to quit !") # test DVD- only returnValue = True # assume pass @@ -238,17 +162,9 @@ returnValue = self.testDisk(message="blank DVD+R", readWriteMode="write", type="dvdplus") elif self.mediaChoice == "dvdplusrw": returnValue = self.testDisk(message="good DVD+RW", readWriteMode="rewrite", type="dvdplus") - # test both DVD- and DVD+ - elif self.mediaChoice == "both": - if self.mediaChoices[0] == "dvdr": - if not self.testDisk(message="blank DVD-R", readWriteMode="write", type="dvd") or not self.testDisk(message="blank DVD+R", readWriteMode="write", type="dvdplus"): - print "\n +++ DVD-R test failed.\n" - return 1 # return non-zero to HTS means failure - else: - if not self.testDisk(message="good DVD-RW", readWriteMode="rewrite", type="dvd") or not self.testDisk(message="good DVD+RW", readWriteMode="rewrite", type="dvdplus"): - print "\n +++ DVD-RW test failed.\n" - return 1 # return non-zero to HTS means failure - + else: + print "Error: unknown media type : %s" % self.mediaChoice + return FAILED if returnValue: return PASSED

1 0

r349 - trunk/tests/floppy
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:52:35 +0000 (Fri, 29 Jan 2010) New Revision: 349 Modified: trunk/tests/floppy/floppy.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/floppy/floppy.py =================================================================== --- trunk/tests/floppy/floppy.py 2010-01-29 14:52:21 UTC (rev 348) +++ trunk/tests/floppy/floppy.py 2010-01-29 14:52:35 UTC (rev 349) @@ -35,7 +35,9 @@ self.interactive = True self.deviceClass = DeviceClass.floppy - + def getRequiredRPMs(self): + return ["dosfstools"] + # YK: re-wrote the plan part def plan(self, devices): tests = list()

1 0

r348 - trunk/tests/video
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:52:21 +0000 (Fri, 29 Jan 2010) New Revision: 348 Modified: trunk/tests/video/video.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/video/video.py =================================================================== --- trunk/tests/video/video.py 2010-01-29 14:52:03 UTC (rev 347) +++ trunk/tests/video/video.py 2010-01-29 14:52:21 UTC (rev 348) @@ -69,6 +69,9 @@ properties["class"] = "VIDEO" tests.extend(self.planWith(devices, properties, all=False, strict=True)) return tests + + def getRequiredRPMs(self): + return ["xorg-x11-apps", "system-config-display"] def settool(self):

1 0

r347 - trunk/tests/audio
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:52:03 +0000 (Fri, 29 Jan 2010) New Revision: 347 Modified: trunk/tests/audio/audio.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/audio/audio.py =================================================================== --- trunk/tests/audio/audio.py 2010-01-29 14:51:40 UTC (rev 346) +++ trunk/tests/audio/audio.py 2010-01-29 14:52:03 UTC (rev 347) @@ -36,6 +36,15 @@ tests.extend(self.planWith(devices, properties, all=False)) return tests + 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 + else: + rpms.append("system-config-soundcard") + return rpms + def logSoundCardInfo(self):

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits January 2010