January 2010 - v7-commits - Fedora mailing-lists

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

r346 - trunk/tests/tape
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:51:40 +0000 (Fri, 29 Jan 2010) New Revision: 346 Modified: trunk/tests/tape/tape.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/tape/tape.py =================================================================== --- trunk/tests/tape/tape.py 2010-01-29 14:51:14 UTC (rev 345) +++ trunk/tests/tape/tape.py 2010-01-29 14:51:40 UTC (rev 346) @@ -41,6 +41,9 @@ test.setDevice(device) tests.append(test) return tests + + def getRequiredRPMs(self): + return ["mt-st"] def getTapeDeviceName(self):

1 0

r345 - trunk/tests/profiler
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:51:14 +0000 (Fri, 29 Jan 2010) New Revision: 345 Modified: trunk/tests/profiler/profiler.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/profiler/profiler.py =================================================================== --- trunk/tests/profiler/profiler.py 2010-01-29 14:50:45 UTC (rev 344) +++ trunk/tests/profiler/profiler.py 2010-01-29 14:51:14 UTC (rev 345) @@ -38,6 +38,8 @@ tests.append(test) return tests + def getRequiredRPMs(self): + return ["oprofile"] def old_run(self): FAILED = 1

1 0

r344 - trunk/tests/suspend
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:50:45 +0000 (Fri, 29 Jan 2010) New Revision: 344 Modified: trunk/tests/suspend/suspend.py Log: 555842 - tests should make use of runtime requires feature Modified: trunk/tests/suspend/suspend.py =================================================================== --- trunk/tests/suspend/suspend.py 2010-01-29 14:47:10 UTC (rev 343) +++ trunk/tests/suspend/suspend.py 2010-01-29 14:50:45 UTC (rev 344) @@ -50,6 +50,11 @@ # batteries are reported break return tests + + + def getRequiredRPMs(self): + return ["pm-utils"] + def getSuspendMethods(self): sysPowerState = open("/sys/power/state", "r")

1 0

r343 - trunk/tests/info
by gnichols＠fedoraproject.org 29 Jan '10

29 Jan '10

Author: gnichols Date: 2010-01-29 14:47:10 +0000 (Fri, 29 Jan 2010) New Revision: 343 Modified: trunk/tests/info/info.py Log: 192245 - info test should call sosreport instead of sysreport Modified: trunk/tests/info/info.py =================================================================== --- trunk/tests/info/info.py 2010-01-29 14:40:32 UTC (rev 342) +++ trunk/tests/info/info.py 2010-01-29 14:47:10 UTC (rev 343) @@ -28,19 +28,11 @@ self.deviceClass = DeviceClass.system self.mandatory = Constants.post # required at the end of each run # what RHEL are we testing? - self.osVersion = Constants.RHEL5 - etcRelease = open('/etc/redhat-release') - releaseDescription = etcRelease.readline() - if releaseDescription: - # 450068: FEAT: INFO test should check detailed OS version - print "OS Version: %s" % releaseDescription.strip() - if 'Nahant' in releaseDescription: - self.osVersion = Constants.RHEL4 - elif 'Fedora' in releaseDescription: - self.osVersion = releaseDescription.strip() - else: - print "Warning: could not read /etc/redhat-release" - etcRelease.close() + self.osVersion = "6" + (self.osProduct, self.osVersion, self.osCodeName) = self.getRedHatRelease() + print "Tested OS: %s %s (%s)" % (self.osProduct, self.osVersion, self.osCodeName) + + self.getKernelRPMName() print "Kernel RPM: %s" % self.kernelRPMName @@ -66,7 +58,7 @@ unameOutput = unameOutput.strip() self.kernelRPMName = None - if self.osVersion == Constants.RHEL4: + if "Red Hat" in self.osProduct and self.osVersion == "4": pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<name>smp|hugemem|largesmp)?$") match = pattern.search(unameOutput) if match: @@ -76,7 +68,7 @@ else: self.kernelRPMName = "kernel-%s" % match.group("versionRelease") - elif self.osVersion == Constants.RHEL5: + elif "Red Hat" in self.osProduct and self.osVersion == "5": pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>el5)(?P<flavor>xen|PAE)?$") match = pattern.search(unameOutput) if match: @@ -85,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.osVersion: + elif 'Fedora' in self.osProduct: print "looking for Fedora kernel" print unameOutput pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>fc[0-9]+)(?P<arch>\..*)$") @@ -197,7 +189,7 @@ break # module is NOT from the kernel RPM. if not found: - if self.osVersion is Constants.RHEL4: + if "Red Hat" in self.osProduct and self.osVersion == "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 @@ -361,7 +353,10 @@ def generateSystemReport(self): outputDirectory = os.getcwd() - pipe = os.popen("echo -e '\n\n' | sysreport -k rpm.rpmva=off 2>&1") + reportCommand = "sosreport" + if "Red Hat" in self.osProduct and self.osVersion == "4": + report = "sysreport" + pipe = os.popen("echo -e '\n\n' | %s -k rpm.rpmva=off 2>&1" % reportCommand) result = False while True: line = pipe.readline() @@ -369,9 +364,19 @@ print line.strip() sys.stdout.flush() word = line.split() - if len(word) > 3 and word[0] in "Please" and word[1] in "send": - shutil.copy(word[2], outputDirectory) - print "Copied sysreport %s to %s" % (word[2], outputDirectory) + tarFile = None + if reportCommand == "sysreport": + if len(word) > 3 and word[0] in "Please" and word[1] in "send": + tarFile = word[2] + else: # sosreport + if "generated and saved in" in line: + tarFile = pipe.readline().strip() + print tarFile + sys.stdout.flush() + + if tarFile: + shutil.copy(tarFile, outputDirectory) + print "Copied %s %s to %s" % (reportCommand, tarFile, outputDirectory) sys.stdout.flush() result = True break

1 0

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

29 Jan '10

Author: gnichols Date: 2010-01-29 14:40:32 +0000 (Fri, 29 Jan 2010) New Revision: 342 Modified: trunk/Makefile Log: R5 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-28 18:56:22 UTC (rev 341) +++ trunk/Makefile 2010-01-29 14:40:32 UTC (rev 342) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 4 +V7_RELEASE := 5 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r341 - in trunk/tests: hwlatdetect rteval
by jcwillia＠fedoraproject.org 28 Jan '10

28 Jan '10

Author: jcwillia Date: 2010-01-28 18:56:22 +0000 (Thu, 28 Jan 2010) New Revision: 341 Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py trunk/tests/rteval/v7_rteval.py Log: fixed check for RT kernel and added rpm requires Moved the check for running an RT kernel into the init() method for both rteval and hwlatdetect. Added getRequiredRPMS() method to both as well. CC: David Sommerseth <davids(a)redhat.com> Signed-off-by: Clark Williams <williams(a)redhat.com> Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-28 18:56:22 UTC (rev 341) @@ -40,18 +40,36 @@ Test.__init__(self, name="hwlatdetect") self.interactive = False self.data = {} + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.hwlatdetect = None self.deviceClass = DeviceClass.processor self.owner = "Clark Williams <williams(a)redhat.com>" self.path = "v7/tests/hwlatdetect" self.version = "0.1" self.description = "hardware latency detector" - self.requires = "rt-setup rt-tests ibm-prtm" + self.requires = ["rt-setup", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm") + def getRequiredRPMs(self): + return self.requires + + def __read_sys_dmi(self, name): + try: + f = open("/sys/class/dmi/id/%s" % name, "r") + ret = f.readline().strip() + f.close() + return ret + except IOError: + print "Could not open /sys/class/dmi/id/%s ... are you running the right kernel?" % name + return None + def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret ret.append(self.makeCopy()) return ret Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-27 20:32:35 UTC (rev 340) +++ trunk/tests/rteval/v7_rteval.py 2010-01-28 18:56:22 UTC (rev 341) @@ -29,6 +29,10 @@ def __init__(self): Test.__init__(self, name="rteval") self.interactive = False + if os.uname()[3].find(" RT ") == -1: + self.realtime = False + else: + self.realtime = True self.data = {} self.rteval = None self.deviceClass = DeviceClass.processor @@ -36,7 +40,12 @@ self.path = "v7/tests/rteval" self.version = "0.1" self.description = "Realtime hardware evaluation tool" - self.requires = "rt-setup rteval rt-eval-loads rt-tests ibm-prtm" + self.requires = ["rt-setup", "rteval", "rteval-loads", "rt-tests"] + if self.realtime and self.__read_sys_dmi("sys_vendor") == "IBM": + self.requires.append("ibm-prtm") + + def getRequiredRPMs(self): + return self.requires def __read_sys_dmi(self, name): try: @@ -51,8 +60,7 @@ def plan(self, devices): ret = list() - v = os.uname()[3] - if v.find(" RT ") == -1: + if not self.realtime: return ret # Check if we have some interesting data from the /sys/class/dmi/id directory

1 0

r340 - trunk/tools
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 20:32:35 +0000 (Wed, 27 Jan 2010) New Revision: 340 Added: trunk/tools/rhts-regression-test.py Log: job xml generator utility Added: trunk/tools/rhts-regression-test.py =================================================================== --- trunk/tools/rhts-regression-test.py (rev 0) +++ trunk/tools/rhts-regression-test.py 2010-01-27 20:32:35 UTC (rev 340) @@ -0,0 +1,57 @@ +#!/usr/bin/python +""" + generates an rhts job xml file +""" + +from optparse import OptionParser + +class Generator: + def __init__(self): + self.arch = None + self.RHEL_release = None + self.V7_repo = "http://qafiler.bos.redhat.com/testkits/V7" + + usage = "usage: %prog [options]" + parser = OptionParser(usage) + parser.add_option('-a', "--arch", action="store", type="string", dest="arch", default="i386") + parser.add_option('-o', "--os", action="store", type="string", dest="os", default="RHEL5-Server-U3") + parser.add_option('-r', "--reserve", action="store", type="int", dest="reserve", default=0) + (self.options, self.args) = parser.parse_args() + + self.family = "RedHatEnterpriseLinuxServer5" + self.osShortName = "RHEL5" + if "RHEL6" in self.options.os: + self.family = "RedHatEnterpriseLinuxServer6" + self.osShortName = "RHEL6" + elif "RHEL4" in self.options.os: + self.family = "RedHatEnterpriseLinux4" + self.osShortName = "RHEL4" + + def generate(self): + print """ + <job> + <workflow>V7 regression test</workflow> + <submitter>gnichols(a)redhat.com</submitter> + """ + print "<whiteboard>V7 %s on %s, auto mode (no interactive tests)</whiteboard>" % (self.options.arch, self.options.os) + print "<recipeSet>\n<recipe testrepo=\'development\'>" + print "<distroRequires>ARCH = %s</distroRequires>" % self.options.arch + print "<distroRequires>FAMILY = %s</distroRequires>" % self.family + print "<distroRequires>NAME = %s</distroRequires>" % self.options.os + print "<distroRequires>RELEASED = 1</distroRequires>" + print "<hostRequires>ARCH = %s</hostRequires>" % self.options.arch + print "<addrepo>%s/%s/</addrepo>" % (self.V7_repo, self.osShortName) + print "<test role=\'STANDALONE\' name=\'/distribution/v7/single\'/>" + if self.options.reserve > 0: + print "<test role=\'STANDALONE\' name=\'/distribution/reservesys\'><params>" + print "<param name=\'RESERVEBY\' value=\'gnichols(a)redhat.com\'/>" + print "<param name=\'RESERVETIME\' value=\'%u\'/>" % (self.options.reserve*3600) + print "</params></test>" + + + print "</recipe>\n</recipeSet>\n</job>" + +if __name__ == "__main__": + generator = Generator() + generator.generate() + Property changes on: trunk/tools/rhts-regression-test.py ___________________________________________________________________ Name: svn:executable + *

1 0

r339 - in trunk/tests: hwlatdetect rteval
by jcwillia＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: jcwillia Date: 2010-01-27 20:06:01 +0000 (Wed, 27 Jan 2010) New Revision: 339 Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py trunk/tests/rteval/v7_rteval.py Log: modify rteval plan() and add runtime requires Modified rteval test to check for rt kernel before looking at /sys/class/dmi/id info. Also added list of required packages to init() routine in self.required CC: David Sommerseth <davids(a)redhat.com> Signed-off-by: Clark Williams <williams(a)redhat.com> Modified: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 11:58:02 UTC (rev 338) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-27 20:06:01 UTC (rev 339) @@ -42,7 +42,12 @@ self.data = {} self.hwlatdetect = None self.deviceClass = DeviceClass.processor - + self.owner = "Clark Williams <williams(a)redhat.com>" + self.path = "v7/tests/hwlatdetect" + self.version = "0.1" + self.description = "hardware latency detector" + self.requires = "rt-setup rt-tests ibm-prtm" + def plan(self, devices): ret = list() v = os.uname()[3] Modified: trunk/tests/rteval/v7_rteval.py =================================================================== --- trunk/tests/rteval/v7_rteval.py 2010-01-27 11:58:02 UTC (rev 338) +++ trunk/tests/rteval/v7_rteval.py 2010-01-27 20:06:01 UTC (rev 339) @@ -32,6 +32,11 @@ self.data = {} self.rteval = None self.deviceClass = DeviceClass.processor + self.owner = "David Sommerseth <davids(a)redhat.com>" + self.path = "v7/tests/rteval" + self.version = "0.1" + self.description = "Realtime hardware evaluation tool" + self.requires = "rt-setup rteval rt-eval-loads rt-tests ibm-prtm" def __read_sys_dmi(self, name): try: @@ -45,6 +50,11 @@ def plan(self, devices): + ret = list() + v = os.uname()[3] + if v.find(" RT ") == -1: + return ret + # Check if we have some interesting data from the /sys/class/dmi/id directory self.data['sysdmi'] = {} files = ('sys_vendor','product_name','product_version') @@ -53,10 +63,6 @@ if self.data['sysdmi'][f] is None: # If one of the /sys/class/dmi/id files is missing, abort this test planning return () - - - - ret = list() ret.append(self.makeCopy()) return ret

1 0

r338 - in tags: . v7-V1-1R4 v7-V1-1R4/v7
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:58:02 +0000 (Wed, 27 Jan 2010) New Revision: 338 Added: tags/v7-V1-1R4/ tags/v7-V1-1R4/Makefile Removed: tags/v7-V1-1R4/Makefile Modified: tags/v7-V1-1R4/v7/version.py Log: tag version Copied: tags/v7-V1-1R4 (from rev 335, trunk) Deleted: tags/v7-V1-1R4/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -1,95 +0,0 @@ -# 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 - -V7_VERSION := 1.1 -V7_RELEASE := 3 -V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) -V7_VERSION_PY := v7/version.py -V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 -V7_RHEL_VERSION := 5 - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -HERE=$(shell pwd) - -.PHONY: clean install - -SUBDIRS := test-env v7 tests docs - -all: - for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) -C $$i; done - -install-noarch: install - -tag: mark-version - svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/\./s//-/"` -m "tag version" - -mark-version: - @echo " " > $(V7_VERSION_PY) - @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) - @echo "version = '$(V7_VERSION)'" >> $(V7_VERSION_PY) - @echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY) - @echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY) - -install: mark-version - mkdir -p $(DESTDIR)/usr/share/v7 - mkdir -p $(DESTDIR)/var/v7 - mkdir -p $(DESTDIR)/var/v7/docs - for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done - for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done - -clean: - $(MAKE) -C tests clean - $(MAKE) -C v7 clean - $(MAKE) -C test-env clean - rm -f v7-*.tar.bz2 - rm -f v7.spec - rm -f v7.spec.el4 - $(MAKE) -C docs clean - -package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 - - -v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec - tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * - - -/tmp/v7/exclude: - mkdir -p /tmp/v7 - echo "CVS" > $@ - echo "save" >> $@ - echo ".*" >> $@ - echo ".patch" >> $@ - echo "v7/*.pyc" >> $@ - echo "test-env/bin/*.pyc" >> $@ - echo "*.bz2" >> $@ - -v7.spec: v7.spec.in Makefile - cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ - -rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec - rm -rf rpm - mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} - cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ - cp v7.spec rpm/SPECS - -srpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec - -rpm: rpm-prep - rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec - Copied: tags/v7-V1-1R4/Makefile (from rev 337, trunk/Makefile) =================================================================== --- tags/v7-V1-1R4/Makefile (rev 0) +++ tags/v7-V1-1R4/Makefile 2010-01-27 11:58:02 UTC (rev 338) @@ -0,0 +1,95 @@ +# 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 + +V7_VERSION := 1.1 +V7_RELEASE := 4 +V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) +V7_VERSION_PY := v7/version.py +V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7 +V7_RHEL_VERSION := 5 + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +HERE=$(shell pwd) + +.PHONY: clean install + +SUBDIRS := test-env v7 tests docs + +all: + for i in $(SUBDIRS); do $(MAKE) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) -C $$i; done + +install-noarch: install + +tag: mark-version + svn copy . $(V7_SVN_MODULE)/tags/`echo "v7-V$(V7_VERSION)R$(V7_RELEASE)" | sed "/\./s//-/"` -m "tag version" + +mark-version: + @echo " " > $(V7_VERSION_PY) + @echo "# $(V7_VERSION_PY) is automatically-generated - DO NOT EDIT" >> $(V7_VERSION_PY) + @echo "version = '$(V7_VERSION)'" >> $(V7_VERSION_PY) + @echo "release = '$(V7_RELEASE)'" >> $(V7_VERSION_PY) + @echo "rhel_version = '$(V7_RHEL_VERSION)'" >> $(V7_VERSION_PY) + +install: mark-version + mkdir -p $(DESTDIR)/usr/share/v7 + mkdir -p $(DESTDIR)/var/v7 + mkdir -p $(DESTDIR)/var/v7/docs + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) V7_RHEL_VERSION=$(V7_RHEL_VERSION) install; done + for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) V7_VERSION=$(V7_VERSION) V7_RELEASE=$(V7_RELEASE) install; done + +clean: + $(MAKE) -C tests clean + $(MAKE) -C v7 clean + $(MAKE) -C test-env clean + rm -f v7-*.tar.bz2 + rm -f v7.spec + rm -f v7.spec.el4 + $(MAKE) -C docs clean + +package: install v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 + + +v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2: /tmp/v7/exclude v7.spec + tar cjS -f $@ -X /tmp/v7/exclude --exclude $@ * + + +/tmp/v7/exclude: + mkdir -p /tmp/v7 + echo "CVS" > $@ + echo "save" >> $@ + echo ".*" >> $@ + echo ".patch" >> $@ + echo "v7/*.pyc" >> $@ + echo "test-env/bin/*.pyc" >> $@ + echo "*.bz2" >> $@ + +v7.spec: v7.spec.in Makefile + cat $< | sed -e 's/@V7_VERSION@/$(V7_VERSION)/g' -e 's/@V7_RELEASE@/$(V7_RELEASE)/g' -e 's/@V7_RHEL_VERSION@/$(V7_RHEL_VERSION)/g'> $@ + +rpm-prep: v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 v7.spec + rm -rf rpm + mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS} + cp v7-$(V7_VERSION_RELEASE).el$(V7_RHEL_VERSION).tar.bz2 rpm/SOURCES/ + cp v7.spec rpm/SPECS + +srpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -bs rpm/SPECS/v7.spec + +rpm: rpm-prep + rpmbuild --define "_topdir $(HERE)/rpm" -ba rpm/SPECS/v7.spec + Modified: tags/v7-V1-1R4/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R4/v7/version.py 2010-01-27 11:58:02 UTC (rev 338) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '4' +rhel_version = '5'

1 0

r337 - trunk
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:57:10 +0000 (Wed, 27 Jan 2010) New Revision: 337 Modified: trunk/Makefile Log: R4 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:46:10 UTC (rev 336) +++ trunk/Makefile 2010-01-27 11:57:10 UTC (rev 337) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 3 +V7_RELEASE := 4 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r336 - in tags: . v7-V1-1R3/v7
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:46:10 +0000 (Wed, 27 Jan 2010) New Revision: 336 Added: tags/v7-V1-1R3/ Modified: tags/v7-V1-1R3/v7/version.py Log: tag version Copied: tags/v7-V1-1R3 (from rev 335, trunk) Modified: tags/v7-V1-1R3/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-27 11:43:50 UTC (rev 335) +++ tags/v7-V1-1R3/v7/version.py 2010-01-27 11:46:10 UTC (rev 336) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '3' +rhel_version = '5'

1 0

r335 - trunk
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:43:50 +0000 (Wed, 27 Jan 2010) New Revision: 335 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-27 11:42:35 UTC (rev 334) +++ trunk/v7.spec.in 2010-01-27 11:43:50 UTC (rev 335) @@ -68,6 +68,12 @@ /usr/share/man/man8/v7.8.gz %changelog +* Wed Jan 26 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.1 R3 + + 559179 - Device-specific tests are not planned in RHEL4 via kudzu. + * Tue Jan 26 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.1 R2

1 0

r334 - trunk
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:42:35 +0000 (Wed, 27 Jan 2010) New Revision: 334 Modified: trunk/Makefile Log: R3 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-27 11:42:06 UTC (rev 333) +++ trunk/Makefile 2010-01-27 11:42:35 UTC (rev 334) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 2 +V7_RELEASE := 3 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r333 - trunk/v7
by gnichols＠fedoraproject.org 27 Jan '10

27 Jan '10

Author: gnichols Date: 2010-01-27 11:42:06 +0000 (Wed, 27 Jan 2010) New Revision: 333 Modified: trunk/v7/device.py Log: 559179 - Device-specific tests are not planned in RHEL4 via kudzu. Modified: trunk/v7/device.py =================================================================== --- trunk/v7/device.py 2010-01-26 21:06:44 UTC (rev 332) +++ trunk/v7/device.py 2010-01-27 11:42:06 UTC (rev 333) @@ -120,7 +120,7 @@ class KudzuDevice(Device): def __init__(self, properties=None): - Device.__init__(self, properties) + Device.__init__(self, None, properties=properties) def getSource(self): return Constants.kudzu

1 0

r332 - in trunk/tests: . hwlatdetect
by jcwillia＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: jcwillia Date: 2010-01-26 21:06:44 +0000 (Tue, 26 Jan 2010) New Revision: 332 Added: trunk/tests/hwlatdetect/ trunk/tests/hwlatdetect/Makefile trunk/tests/hwlatdetect/runtest.sh trunk/tests/hwlatdetect/v7_hwlatdetect.py Modified: trunk/tests/Makefile Log: Add realtime test v7_hwlatdetect This adds the v7 wrapper for the realtime test hwlatdetect. The hwlatdetect test is used to find hardware induced latencies, usually from System Management Interrupts (SMIs) Modified: trunk/tests/Makefile =================================================================== --- trunk/tests/Makefile 2010-01-26 20:28:53 UTC (rev 331) +++ trunk/tests/Makefile 2010-01-26 21:06:44 UTC (rev 332) @@ -15,7 +15,7 @@ .PHONY: clean install -SUBDIRS := audio bluray cdrom dvd core floppy info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval +SUBDIRS := audio bluray cdrom dvd core floppy info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval hwlatdetect clean: for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done Added: trunk/tests/hwlatdetect/Makefile =================================================================== --- trunk/tests/hwlatdetect/Makefile (rev 0) +++ trunk/tests/hwlatdetect/Makefile 2010-01-26 21:06:44 UTC (rev 332) @@ -0,0 +1,45 @@ +# V7 +TOPLEVEL_NAMESPACE=/V7 + +# The name of the package under test: +PACKAGE_NAME=v7 + +# The path of the test below the package: +RELATIVE_PATH=hwlatdetect + +# Version of the Test. Used with make tag. +export TESTVERSION=1.1 + +# The compiled namespace of the test. +export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) + +.PHONY: all install download clean + +FILES=$(METADATA) runtest.sh v7_hwlatdetect.py + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x ./runtest.sh ./v7_hwlatdetect.py + +clean: + rm -f *~ $(BUILT_FILES) + +# Include Common Makefile +include $(DESTDIR)/usr/share/v7/lib/v7-make.include + +# Generate the testinfo.desc here: +$(METADATA): Makefile + @touch $(METADATA) + @echo "Owner: Clark Williams <williams(a)redhat.com>" > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Description: Hardware Certification Hardware Latency Detection Test">> $(METADATA) + @echo "TestTime: 1h" >> $(METADATA) + @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) + @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) + @echo "X-Interactive: no" >> $(METADATA) + + Added: trunk/tests/hwlatdetect/runtest.sh =================================================================== --- trunk/tests/hwlatdetect/runtest.sh (rev 0) +++ trunk/tests/hwlatdetect/runtest.sh 2010-01-26 21:06:44 UTC (rev 332) @@ -0,0 +1,3 @@ +#!/bin/bash + +v7-run-simple-test ${TEST:-$(basename $PWD)} ./v7_hwlatdetect.py Property changes on: trunk/tests/hwlatdetect/runtest.sh ___________________________________________________________________ Name: svn:executable + * Added: trunk/tests/hwlatdetect/v7_hwlatdetect.py =================================================================== --- trunk/tests/hwlatdetect/v7_hwlatdetect.py (rev 0) +++ trunk/tests/hwlatdetect/v7_hwlatdetect.py 2010-01-26 21:06:44 UTC (rev 332) @@ -0,0 +1,95 @@ +#!/usr/bin/python +# Copyright (c) 2010 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: Clark Williams <williams(a)redhat.com> +# + +import os, sys, string, time + +if __name__ == "__main__": + sys.path.insert(0, '/usr/share/v7/lib') + +from v7.test import Test +from v7.tags import Constants +from v7.tags import DeviceClass + +################################################### +# +# default test parameters +# +################################################### +threshold = 15 # fifteen microseconds +window = 1000000 # one million microseconds (1.0s) +width = 800000 # 800 thousand microseconds (0.8s) +duration = 7022 # 2 hours + +class v7HWlatdetect(Test): + + def __init__(self): + Test.__init__(self, name="hwlatdetect") + self.interactive = False + self.data = {} + self.hwlatdetect = None + self.deviceClass = DeviceClass.processor + + def plan(self, devices): + ret = list() + v = os.uname()[3] + if v.find(" RT ") == -1: + return ret + ret.append(self.makeCopy()) + return ret + + def run(self): + FAILED = 1 + PASSED = 0 + + sys.path.insert(0, '/usr/bin') + # Prepare hwlatdetect + try: + import hwlatdetect + except Exception, e: + print "Error: could not import hwlatdetect" + return FAILED + + try: + detect = hwlatdetect.Detector() + except Exception, e: + print "Error: could not initialize hwlatdetect" + raise + + detect.set("threshold", threshold) + detect.set("window", window) + detect.set("width", width) + detect.testduration = duration + detect.detect() + exceeding = detect.get("count") + print "detected %d samples exceeding threshold %d\n" % (exceeding, detect.get("threshold")) + + for s in detect.samples: + print s + + detect.cleanup() + + if exceeding: + return FAILED + return PASSED + + +if __name__ == "__main__": + test = v7HWlatdetect() + test.plan(None) + returnValue = test.do(sys.argv) + sys.exit(returnValue) + Property changes on: trunk/tests/hwlatdetect/v7_hwlatdetect.py ___________________________________________________________________ Name: svn:executable + *

1 0

r331 - in tags: . v7-V1-1R2/v7
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 20:28:53 +0000 (Tue, 26 Jan 2010) New Revision: 331 Added: tags/v7-V1-1R2/ Modified: tags/v7-V1-1R2/v7/version.py Log: tag version Copied: tags/v7-V1-1R2 (from rev 330, trunk) Modified: tags/v7-V1-1R2/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-26 18:51:40 UTC (rev 330) +++ tags/v7-V1-1R2/v7/version.py 2010-01-26 20:28:53 UTC (rev 331) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '2' +rhel_version = '5'

1 0

r330 - trunk
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 18:51:40 +0000 (Tue, 26 Jan 2010) New Revision: 330 Modified: trunk/Makefile Log: bump to R2 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-26 18:51:06 UTC (rev 329) +++ trunk/Makefile 2010-01-26 18:51:40 UTC (rev 330) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.1 -V7_RELEASE := 1 +V7_RELEASE := 2 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r329 - trunk
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 18:51:06 +0000 (Tue, 26 Jan 2010) New Revision: 329 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-26 18:46:05 UTC (rev 328) +++ trunk/v7.spec.in 2010-01-26 18:51:06 UTC (rev 329) @@ -68,6 +68,12 @@ /usr/share/man/man8/v7.8.gz %changelog +* Tue Jan 26 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.1 R2 + + 558578 - memory test traceback: AttributeError: 'int' object has no attribute 'pipe' + * Fri Jan 22 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.1 R1

1 0

r328 - trunk/tests/memory
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 18:46:05 +0000 (Tue, 26 Jan 2010) New Revision: 328 Modified: trunk/tests/memory/memory.py Log: 558578 - memory test traceback: AttributeError: int object has no attribute pipe Modified: trunk/tests/memory/memory.py =================================================================== --- trunk/tests/memory/memory.py 2010-01-26 18:44:45 UTC (rev 327) +++ trunk/tests/memory/memory.py 2010-01-26 18:46:05 UTC (rev 328) @@ -54,12 +54,8 @@ passed = self.getTestLimits() if not passed: return 1 + - if not self.runMultipleProcessTest(): - return FAILED - return PASSED - - # if process memory is limited, run multiple processes if self.isProcessLimited: if not self.runMultipleProcessTest():

1 0

r327 - trunk/v7
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 18:44:45 +0000 (Tue, 26 Jan 2010) New Revision: 327 Modified: trunk/v7/command-popen2.py trunk/v7/command.py Log: 558578 - memory test traceback: AttributeError: int object has no attribute pipe Modified: trunk/v7/command-popen2.py =================================================================== --- trunk/v7/command-popen2.py 2010-01-26 18:44:19 UTC (rev 326) +++ trunk/v7/command-popen2.py 2010-01-26 18:44:45 UTC (rev 327) @@ -54,6 +54,9 @@ sys.stderr.write( line ) sys.stderr.flush() + def start(self): + self.pipe = popen2.Popen3(self.command, capturestderr=True) + def _checkErrors(self): if self.errors and len(self.errors) > 0: @@ -200,6 +203,22 @@ value = self.getString(regex, regexGroup, singleLine) return string.atoi(value) + def getPID(self): + if self.pipe: + return self.pipe.pid + raise V7CommandException(self.command, "call to getPID() before start()") + + def readline(self): + if self.pipe: + return self.pipe.fromchild.readline() + raise V7CommandException(self.command, "call to readline() before start()") + + def poll(self): + if self.pipe: + return self.pipe.poll() + # otherwise, commmand never started + raise V7CommandException(self.command, "call to poll() before start()") + class V7CommandException(exceptions.Exception): def __init__(self, command, message): self.message = message Modified: trunk/v7/command.py =================================================================== --- trunk/v7/command.py 2010-01-26 18:44:19 UTC (rev 326) +++ trunk/v7/command.py 2010-01-26 18:44:45 UTC (rev 327) @@ -54,6 +54,12 @@ self.signal = self.pipe.returncode & 0xFF self.printErrors() + + def start(self): + self.pipe = subprocess.Popen(self.command, shell=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE,) def _checkErrors(self): @@ -205,6 +211,23 @@ value = self.getString(regex, regexGroup, singleLine) return string.atoi(value) + def getPID(self): + if self.pipe: + return self.pipe.pid + raise V7CommandException(self.command, "call to getPID() before start()") + + def readline(self): + if self.pipe: + return self.pipe.stdout.readline() + raise V7CommandException(self.command, "call to readline() before start()") + + def poll(self): + if self.pipe: + return self.pipe.poll() + # otherwise, commmand never started + raise V7CommandException(self.command, "call to poll() before start()") + + class V7CommandException(Exception): def __init__(self, command, message): self.message = message

1 0

r326 - trunk/tests/memory
by gnichols＠fedoraproject.org 26 Jan '10

26 Jan '10

Author: gnichols Date: 2010-01-26 18:44:19 +0000 (Tue, 26 Jan 2010) New Revision: 326 Modified: trunk/tests/memory/memory.py Log: 558578 - memory test traceback: AttributeError: int object has no attribute pipe Modified: trunk/tests/memory/memory.py =================================================================== --- trunk/tests/memory/memory.py 2010-01-25 15:41:15 UTC (rev 325) +++ trunk/tests/memory/memory.py 2010-01-26 18:44:19 UTC (rev 326) @@ -55,7 +55,11 @@ passed = self.getTestLimits() if not passed: return 1 + if not self.runMultipleProcessTest(): + return FAILED + return PASSED + # if process memory is limited, run multiple processes if self.isProcessLimited: if not self.runMultipleProcessTest(): @@ -177,33 +181,34 @@ def runProcesses(self, number, command): processes = 0; passed = True - pipe = [] + process = [] if self.mode == Constants.self: command = "echo 'Self Test Mode - would have run %s'" % command for i in range(number): - commandPipe = Command(command).run() - pipe.append(commandPipe.pipe) - print "Started: process %u pid %u: %s" % (i, pipe[i].pid, command) + processCommand = Command(command) + processCommand.start() + process.append(processCommand) + print "Started: process %u pid %u: %s" % (i, process[i].getPID(), command) sys.stdout.flush() waiting = True while waiting: waiting = False for i in range(number): - if pipe[i]: + if process[i]: found = True - line = pipe[i].stdout.readline() + line = process[i].readline() if line and len(line) > 1: - print "process %u pid %u: %s" % (i, pipe[i].pid, line) + print "process %u pid %u: %s" % (i, process[i].getPID(), line) sys.stdout.flush() - if pipe[i].poll() == -1: + if process[i].poll() == -1: waiting = True else: - returnValue = pipe[i].poll() + returnValue = process[i].poll() if returnValue != 0: - print "Error: process %u pid %u retuned %u" % (i, pipe[i].pid, returnValue) + print "Error: process %u pid %u retuned %u" % (i, process[i].getPID(), returnValue) passed = False - print "process %u pid %u returned success" % (i, pipe[i].pid) - pipe[i] = None + print "process %u pid %u returned success" % (i, process[i].getPID()) + process[i] = None sys.stdout.flush() return passed

1 0

r325 - in tags: . v7-V1-1R1/v7
by gnichols＠fedoraproject.org 25 Jan '10

25 Jan '10

Author: gnichols Date: 2010-01-25 15:41:15 +0000 (Mon, 25 Jan 2010) New Revision: 325 Added: tags/v7-V1-1R1/ Modified: tags/v7-V1-1R1/v7/version.py Log: tag version Copied: tags/v7-V1-1R1 (from rev 324, trunk) Modified: tags/v7-V1-1R1/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-22 21:13:35 UTC (rev 324) +++ tags/v7-V1-1R1/v7/version.py 2010-01-25 15:41:15 UTC (rev 325) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT -version = '1.0' -release = '23' -rhel_version = '6' +version = '1.1' +release = '1' +rhel_version = '5'

1 0

r324 - trunk
by gnichols＠fedoraproject.org 22 Jan '10

22 Jan '10

Author: gnichols Date: 2010-01-22 21:13:35 +0000 (Fri, 22 Jan 2010) New Revision: 324 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-22 21:09:36 UTC (rev 323) +++ trunk/v7.spec.in 2010-01-22 21:13:35 UTC (rev 324) @@ -68,6 +68,14 @@ /usr/share/man/man8/v7.8.gz %changelog +* Fri Jan 22 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.1 R1 + + 557355 - fv_* is not listed in v7 plan both on AMD RHEL5.4-Server xen / kvm system + 557365 - `v7 plan` failed with traceback and cause no plan for `v7 print` + 546404 - Avoid running any tests when invalid test name is used + * Thu Jan 14 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.0 R26

1 0

r323 - trunk/v7
by gnichols＠fedoraproject.org 22 Jan '10

22 Jan '10

Author: gnichols Date: 2010-01-22 21:09:36 +0000 (Fri, 22 Jan 2010) New Revision: 323 Modified: trunk/v7/fvtest.py Log: fv_* is not listed in v7 plan both on AMD RHEL5.4-Server xen / kvm system Modified: trunk/v7/fvtest.py =================================================================== --- trunk/v7/fvtest.py 2010-01-22 21:07:51 UTC (rev 322) +++ trunk/v7/fvtest.py 2010-01-22 21:09:36 UTC (rev 323) @@ -71,7 +71,7 @@ cpuflags = Command("fgrep flags /proc/cpuinfo") self.hypervisor = None try: - if cpuflags.getString(regex="(vmx|smx)", singleLine=False): + if cpuflags.getString(regex="(vmx|smx|svm)", singleLine=False): # read the hypervisor capabilities if that file exists try: capabilityFile = open('/sys/hypervisor/properties/capabilities')

1 0

r322 - trunk/v7
by gnichols＠fedoraproject.org 22 Jan '10

22 Jan '10

Author: gnichols Date: 2010-01-22 21:07:51 +0000 (Fri, 22 Jan 2010) New Revision: 322 Modified: trunk/v7/hardwaretest.py Log: 546404 - Avoid running any tests when invalid test name is used Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-22 21:07:04 UTC (rev 321) +++ trunk/v7/hardwaretest.py 2010-01-22 21:07:51 UTC (rev 322) @@ -529,6 +529,17 @@ def doRun(self): if not self.doPlan(): return False + + #check tests + testNotFound = False + for testName in self.options.test: + if not self.certification.getTest(testName): + print "Error: No such test \"" + testName + "\"" + testNotFound = True + if testNotFound: + return False + # otherwise + tests = self.certification.getFilteredTests(self.options)

1 0

r321 - trunk
by gnichols＠fedoraproject.org 22 Jan '10

22 Jan '10

Author: gnichols Date: 2010-01-22 21:07:04 +0000 (Fri, 22 Jan 2010) New Revision: 321 Modified: trunk/Makefile Log: Bump minor version and release Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-22 21:04:23 UTC (rev 320) +++ trunk/Makefile 2010-01-22 21:07:04 UTC (rev 321) @@ -13,8 +13,8 @@ # # Author: Greg Nichols -V7_VERSION := 1.0 -V7_RELEASE := 26 +V7_VERSION := 1.1 +V7_RELEASE := 1 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r320 - trunk/v7
by gnichols＠fedoraproject.org 22 Jan '10

22 Jan '10

Author: gnichols Date: 2010-01-22 21:04:23 +0000 (Fri, 22 Jan 2010) New Revision: 320 Modified: trunk/v7/hardwaretest.py Log: 557365 - RHEL4 U8: v7 plan failed with traceback and cause no plan for v7 print Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-14 16:26:45 UTC (rev 319) +++ trunk/v7/hardwaretest.py 2010-01-22 21:04:23 UTC (rev 320) @@ -851,7 +851,7 @@ line=f.readline() f.close() if line: - pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[1-9\.]+) $(?P<name>[a-zA-Z]+)$") + 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"):

1 0

r319 - in tags: . v7-V1-0R26/v7
by gnichols＠fedoraproject.org 14 Jan '10

14 Jan '10

Author: gnichols Date: 2010-01-14 16:26:45 +0000 (Thu, 14 Jan 2010) New Revision: 319 Added: tags/v7-V1-0R26/ Modified: tags/v7-V1-0R26/v7/version.py Log: tag version Copied: tags/v7-V1-0R26 (from rev 318, trunk) Modified: tags/v7-V1-0R26/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-14 16:24:35 UTC (rev 318) +++ tags/v7-V1-0R26/v7/version.py 2010-01-14 16:26:45 UTC (rev 319) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '23' -rhel_version = '6' +release = '26' +rhel_version = '5'

1 0

r318 - trunk
by gnichols＠fedoraproject.org 14 Jan '10

14 Jan '10

Author: gnichols Date: 2010-01-14 16:24:35 +0000 (Thu, 14 Jan 2010) New Revision: 318 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-14 16:22:24 UTC (rev 317) +++ trunk/v7.spec.in 2010-01-14 16:24:35 UTC (rev 318) @@ -68,12 +68,11 @@ /usr/share/man/man8/v7.8.gz %changelog -* Wed Jan 13 2010 Greg Nichols <gnichols(a)redhat.com> +* Thu Jan 14 2010 Greg Nichols <gnichols(a)redhat.com> -V7 1.0 R24 - 555045 - v7 R23 traceback on submit command - invalid device data +V7 1.0 R26 -* Tue Jan 12 2010 Greg Nichols <gnichols(a)redhat.com> + 555045 - v7 R23 traceback on submit command - invalid device data V7 1.0 R23

1 0

r317 - trunk/v7
by gnichols＠fedoraproject.org 14 Jan '10

14 Jan '10

Author: gnichols Date: 2010-01-14 16:22:24 +0000 (Thu, 14 Jan 2010) New Revision: 317 Modified: trunk/v7/v7kudzu.py Log: 555045 - v7 R23 traceback on submit command - invalid device data Modified: trunk/v7/v7kudzu.py =================================================================== --- trunk/v7/v7kudzu.py 2010-01-14 16:15:50 UTC (rev 316) +++ trunk/v7/v7kudzu.py 2010-01-14 16:22:24 UTC (rev 317) @@ -4,7 +4,7 @@ import os -from v7.device import Device +from v7.device import KudzuDevice from v7.deviceDetector import DeviceDetector from v7.tags import Constants from v7.certificationtest import DocumentWrapper @@ -48,7 +48,7 @@ if line: if line == self.recordSeparator: if len(properties) > 0: - self.devices.append(Device(Constants.kudzu, properties)) + self.devices.append(KudzuDevice(properties)) properties = dict() else: line = docWrapper.removeBadCharacters(line)

1 0

r316 - trunk
by gnichols＠fedoraproject.org 14 Jan '10

14 Jan '10

Author: gnichols Date: 2010-01-14 16:15:50 +0000 (Thu, 14 Jan 2010) New Revision: 316 Modified: trunk/Makefile Log: R26 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-13 16:33:59 UTC (rev 315) +++ trunk/Makefile 2010-01-14 16:15:50 UTC (rev 316) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.0 -V7_RELEASE := 25 +V7_RELEASE := 26 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r315 - in tags: . v7-V1-0R25/v7
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 16:33:59 +0000 (Wed, 13 Jan 2010) New Revision: 315 Added: tags/v7-V1-0R25/ Modified: tags/v7-V1-0R25/v7/version.py Log: tag version Copied: tags/v7-V1-0R25 (from rev 314, trunk) Modified: tags/v7-V1-0R25/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-13 16:33:27 UTC (rev 314) +++ tags/v7-V1-0R25/v7/version.py 2010-01-13 16:33:59 UTC (rev 315) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '23' -rhel_version = '6' +release = '25' +rhel_version = '5'

1 0

r314 - trunk
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 16:33:27 +0000 (Wed, 13 Jan 2010) New Revision: 314 Modified: trunk/Makefile Log: R25 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-13 15:06:42 UTC (rev 313) +++ trunk/Makefile 2010-01-13 16:33:27 UTC (rev 314) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.0 -V7_RELEASE := 24 +V7_RELEASE := 25 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r313 - in tags: . v7-V1-0R24/v7
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 15:06:42 +0000 (Wed, 13 Jan 2010) New Revision: 313 Added: tags/v7-V1-0R24/ Modified: tags/v7-V1-0R24/v7/version.py Log: tag version Copied: tags/v7-V1-0R24 (from rev 312, trunk) Modified: tags/v7-V1-0R24/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-13 15:03:19 UTC (rev 312) +++ tags/v7-V1-0R24/v7/version.py 2010-01-13 15:06:42 UTC (rev 313) @@ -1,5 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '23' -rhel_version = '6' +release = '24' +rhel_version = '5'

1 0

r312 - trunk
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 15:03:19 +0000 (Wed, 13 Jan 2010) New Revision: 312 Modified: trunk/v7.spec.in Log: 484657 - hts uses code deprecated in python 2.6\n- added V7_RHEL_RELEASE parameter to %build and %install Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2010-01-13 15:00:26 UTC (rev 311) +++ trunk/v7.spec.in 2010-01-13 15:03:19 UTC (rev 312) @@ -43,10 +43,10 @@ %build [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; -DESTDIR=$RPM_BUILD_ROOT make +DESTDIR=$RPM_BUILD_ROOT make V7_RHEL_VERSION=%{rhel_version} %install -DESTDIR=$RPM_BUILD_ROOT make install +DESTDIR=$RPM_BUILD_ROOT make V7_RHEL_VERSION=%{rhel_version} install %clean [ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; @@ -68,6 +68,11 @@ /usr/share/man/man8/v7.8.gz %changelog +* Wed Jan 13 2010 Greg Nichols <gnichols(a)redhat.com> + +V7 1.0 R24 + 555045 - v7 R23 traceback on submit command - invalid device data + * Tue Jan 12 2010 Greg Nichols <gnichols(a)redhat.com> V7 1.0 R23

1 0

r311 - trunk
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 15:00:26 +0000 (Wed, 13 Jan 2010) New Revision: 311 Modified: trunk/Makefile Log: R24 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-13 15:00:00 UTC (rev 310) +++ trunk/Makefile 2010-01-13 15:00:26 UTC (rev 311) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.0 -V7_RELEASE := 23 +V7_RELEASE := 24 V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE) V7_VERSION_PY := v7/version.py V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7

1 0

r310 - trunk/v7
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 15:00:00 +0000 (Wed, 13 Jan 2010) New Revision: 310 Modified: trunk/v7/command-popen2.py Log: 484657 - hts uses code deprecated in python 2.6\n- added Command.pipe member for compatability Modified: trunk/v7/command-popen2.py =================================================================== --- trunk/v7/command-popen2.py 2010-01-13 14:59:06 UTC (rev 309) +++ trunk/v7/command-popen2.py 2010-01-13 15:00:00 UTC (rev 310) @@ -37,17 +37,18 @@ self.errors = None self.returnValue = 0 self.signal = 0 + self.pipe = None def _run(self): - commandPipe = popen2.Popen3(self.command, capturestderr=True) - self.output = commandPipe.fromchild.readlines() - result = commandPipe.wait() + self.pipe = popen2.Popen3(self.command, capturestderr=True) + self.output = self.pipe.fromchild.readlines() + result = self.pipe.wait() self.returnValue = (result >> 8) & 0xFF self.signal = result & 0xFF self.errors = None - if commandPipe.childerr: - self.errors = commandPipe.childerr.readlines() + if self.pipe.childerr: + self.errors = self.pipe.childerr.readlines() # always print error messages for line in self.errors: sys.stderr.write( line )

1 0

r309 - trunk/tests/memory
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 14:59:06 +0000 (Wed, 13 Jan 2010) New Revision: 309 Modified: trunk/tests/memory/memory.py Log: 484657 - hts uses code deprecated in python 2.6\n- fixed bad reference to Command.pipe Modified: trunk/tests/memory/memory.py =================================================================== --- trunk/tests/memory/memory.py 2010-01-13 14:54:05 UTC (rev 308) +++ trunk/tests/memory/memory.py 2010-01-13 14:59:06 UTC (rev 309) @@ -182,7 +182,7 @@ command = "echo 'Self Test Mode - would have run %s'" % command for i in range(number): commandPipe = Command(command).run() - pipe.append(Command(command).pipe) + pipe.append(commandPipe.pipe) print "Started: process %u pid %u: %s" % (i, pipe[i].pid, command) sys.stdout.flush() waiting = True

1 0

r308 - trunk/v7
by gnichols＠fedoraproject.org 13 Jan '10

13 Jan '10

Author: gnichols Date: 2010-01-13 14:54:05 +0000 (Wed, 13 Jan 2010) New Revision: 308 Modified: trunk/v7/documentbase.py trunk/v7/hardwaretest.py trunk/v7/report.py trunk/v7/v7kudzu.py trunk/v7/version.py Log: 555045 - v7 R23 traceback on submit command - invalid device data Modified: trunk/v7/documentbase.py =================================================================== --- trunk/v7/documentbase.py 2010-01-13 01:13:44 UTC (rev 307) +++ trunk/v7/documentbase.py 2010-01-13 14:54:05 UTC (rev 308) @@ -186,7 +186,7 @@ # should never, ever get here! print "Error: unknown device source %s" % source - return None + raise Exception("Error: unknown device source %s"% source) def merge(self, documentFilePath): subdocument = DocumentBase() Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2010-01-13 01:13:44 UTC (rev 307) +++ trunk/v7/hardwaretest.py 2010-01-13 14:54:05 UTC (rev 308) @@ -39,7 +39,7 @@ import v7.version from v7.hal import Hal from v7.v7kudzu import Kudzu -from v7.device import Device +from v7.device import Device, HalDevice from v7.command import Command, V7CommandException from v7.resultsengine import ResultsEngine @@ -1038,7 +1038,7 @@ if not device: print "Warning: unknown device: %s " % key # create one from scratch - device = Device(Constants.user) + device = HalDevice(dict()) if self.options.udi: device.setUDI(self.options.udi) Modified: trunk/v7/report.py =================================================================== --- trunk/v7/report.py 2010-01-13 01:13:44 UTC (rev 307) +++ trunk/v7/report.py 2010-01-13 14:54:05 UTC (rev 308) @@ -304,7 +304,10 @@ hardwareOutFile = codecs.open(hardwareOutPath, "w", "utf-8") devices = run.getDevices() for device in devices: - device.write(hardwareOutFile) + if device: + device.write(hardwareOutFile) + elif self.Debugging != Constants.off: + print "Warning: run has bad device data" hardwareOutFile.close() Modified: trunk/v7/v7kudzu.py =================================================================== --- trunk/v7/v7kudzu.py 2010-01-13 01:13:44 UTC (rev 307) +++ trunk/v7/v7kudzu.py 2010-01-13 14:54:05 UTC (rev 308) @@ -68,7 +68,7 @@ def getDevice(self, udi): for device in self.getDevices(): if device.getProperty("udi") == udi: - return Device(Constants.kudzu, device) + return KudzuDevice(device) return None def dump(self): Modified: trunk/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-13 01:13:44 UTC (rev 307) +++ trunk/v7/version.py 2010-01-13 14:54:05 UTC (rev 308) @@ -1,4 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '20' +release = '23' +rhel_version = '6'

1 0

r307 - in tags: . v7-V1-0R23/v7
by gnichols＠fedoraproject.org 12 Jan '10

12 Jan '10

Author: gnichols Date: 2010-01-13 01:13:44 +0000 (Wed, 13 Jan 2010) New Revision: 307 Added: tags/v7-V1-0R23/ Modified: tags/v7-V1-0R23/v7/version.py Log: tag version Copied: tags/v7-V1-0R23 (from rev 306, trunk) Modified: tags/v7-V1-0R23/v7/version.py =================================================================== --- trunk/v7/version.py 2010-01-13 01:11:32 UTC (rev 306) +++ tags/v7-V1-0R23/v7/version.py 2010-01-13 01:13:44 UTC (rev 307) @@ -1,4 +1,5 @@ # v7/version.py is automatically-generated - DO NOT EDIT version = '1.0' -release = '20' +release = '23' +rhel_version = '5'

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits January 2010