July 2011 - v7-commits - Fedora mailing-lists

r1039 - trunk
by gnichols＠fedoraproject.org 29 Jul '11

29 Jul '11

Author: gnichols Date: 2011-07-29 15:19:04 +0000 (Fri, 29 Jul 2011) New Revision: 1039 Modified: trunk/Makefile Log: R17 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-26 13:58:19 UTC (rev 1038) +++ trunk/Makefile 2011-07-29 15:19:04 UTC (rev 1039) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 16 +V7_RELEASE := 17 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

r1038 - trunk/v7
by gnichols＠fedoraproject.org 26 Jul '11

26 Jul '11

Author: gnichols Date: 2011-07-26 13:58:19 +0000 (Tue, 26 Jul 2011) New Revision: 1038 Modified: trunk/v7/hardwaretest.py Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-25 21:11:19 UTC (rev 1037) +++ trunk/v7/hardwaretest.py 2011-07-26 13:58:19 UTC (rev 1038) @@ -972,6 +972,11 @@ print savedFilePath self.certification.compressToFile(savedFilePath) + # if it's supplied as an option, use that one but don't save it, + # otherwise, check the certification's test server + if not self.testServer: + self.testServer = self.certification.getTestServer() + if self.testServer and self.ui.promptConfirm("Copy results to test server %s?" % self.testServer): request = V7Http(self.testServer, "/v7/cgi/saveFile.py") request.addField("server-path", serverPath)

1 0

r1037 - trunk/server/cgi
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 21:11:19 +0000 (Mon, 25 Jul 2011) New Revision: 1037 Modified: trunk/server/cgi/saved.py Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/server/cgi/saved.py =================================================================== --- trunk/server/cgi/saved.py 2011-07-25 17:24:51 UTC (rev 1036) +++ trunk/server/cgi/saved.py 2011-07-25 21:11:19 UTC (rev 1037) @@ -15,7 +15,7 @@ # Author: Greg Nichols # -import os,sys,cgi,lxml, re +import os,sys,cgi,lxml, re, cgitb, time from lxml import etree v7ClassLibraryPath = '/usr/share/v7/lib/' sys.path.append(v7ClassLibraryPath) @@ -23,11 +23,12 @@ v7ServerRoot = '/var/www/v7' from v7.environment import Environment +from v7.tags import Constants from template import Template environment = Environment() -import cgitb + cgitb.enable() @@ -44,7 +45,7 @@ def showSavedResults(parameters): localPath = os.path.join(environment.getServerDirectory(), "store") resultsFileFilter = re.compile("\.(xml|xml.gz)$", re.IGNORECASE) - fileNamePattern = re.compile("^v7-results-(?P<hostname>[^\-]+)-(?P<date>[0-9]+)\.xml(.gz)?$") + fileNamePattern = re.compile("^v7-results-(?P<hostname>.*+)-(?P<date>[0-9]+)\.xml(.gz)?$") for (root,dirs,files) in os.walk(localPath): files = filter(resultsFileFilter.search, files) if files: @@ -56,8 +57,9 @@ if match: dateStamp = match.group("date") date = "%s-%s-%s" % (dateStamp[4:6], dateStamp[6:8], dateStamp[:4]) + time = "%s:%s:%s" % (dateStamp[8:10], dateStamp[10:12], dateStamp[12:]) hostname = match.group("hostname") - print "    <a href=\"v7xml.py?sheet=summary&content=html&rpath=%s/%s\">%s %s</a><br>" % (root, file, hostname, date) + print "    <a href=\"v7xml.py?sheet=summary&content=html&rpath=%s/%s\">%s   %s %s</a><br>" % (root, file, hostname, date, time) print "<br>" parameters = getParameters()

1 0

r1036 - tags
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 17:24:51 +0000 (Mon, 25 Jul 2011) New Revision: 1036 Added: tags/v7-V1-4R16/ Log: tag version

1 0

r1035 - trunk
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 17:24:11 +0000 (Mon, 25 Jul 2011) New Revision: 1035 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-25 17:23:51 UTC (rev 1034) +++ trunk/v7.spec.in 2011-07-25 17:24:11 UTC (rev 1035) @@ -79,7 +79,7 @@ %changelog * Mon Jul 25 2011 Greg Nichols <gnichols(a)redhat.com> -V7 1.4 R15 +V7 1.4 R16 725441 - FEAT: save command should store results on server for review

1 0

r1034 - trunk
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 17:23:51 +0000 (Mon, 25 Jul 2011) New Revision: 1034 Modified: trunk/Makefile Log: R16 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-25 17:22:08 UTC (rev 1033) +++ trunk/Makefile 2011-07-25 17:23:51 UTC (rev 1034) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 15 +V7_RELEASE := 16 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

r1033 - trunk/v7
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 17:22:08 +0000 (Mon, 25 Jul 2011) New Revision: 1033 Modified: trunk/v7/certificationtest.py trunk/v7/hardwaretest.py Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/v7/certificationtest.py =================================================================== --- trunk/v7/certificationtest.py 2011-07-25 16:32:12 UTC (rev 1032) +++ trunk/v7/certificationtest.py 2011-07-25 17:22:08 UTC (rev 1033) @@ -149,7 +149,14 @@ element = self.findOrCreateElement(osElement, tag) return self.getTextNode(element).data + def getOSProductShortName(self): + longName = self.getOS(Tags.product) + if "Red Hat Enterprise Linux" in longName: + return "RHEL" + #otherwise + return longName + def appendTest(self, test): try: deviceClass = self.deviceClasses[test.getDeviceClass()].appendTest(test) Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-25 16:32:12 UTC (rev 1032) +++ trunk/v7/hardwaretest.py 2011-07-25 17:22:08 UTC (rev 1033) @@ -953,8 +953,7 @@ path += "/%s" % value self.makeDirectoryPath(path) serverPath.append(value) - for tag in Tags.name, Tags.release: - value = self.certification.getOS(tag) + for value in self.certification.getOSProductShortName(), self.certification.getOS(Tags.release): if len(value) > 0: path += "/%s" % value self.makeDirectoryPath(path)

1 0

r1032 - in trunk: server/cgi v7
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 16:32:12 +0000 (Mon, 25 Jul 2011) New Revision: 1032 Modified: trunk/server/cgi/saveFile.py trunk/v7/documentbase.py Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/server/cgi/saveFile.py =================================================================== --- trunk/server/cgi/saveFile.py 2011-07-25 14:20:26 UTC (rev 1031) +++ trunk/server/cgi/saveFile.py 2011-07-25 16:32:12 UTC (rev 1032) @@ -43,12 +43,10 @@ except: print "Error: no server-path is set" return False - print "server-path:" + if serverPath.value: - serverPath = os.path.join(*serverPath.value.split()) - print serverPath + serverPath = os.path.join(*serverPath.value.splitlines()) directory = os.path.join(environment.getServerDirectory(), "store", serverPath) - print "directory %s" % directory try: os.makedirs(directory) except OSError: Modified: trunk/v7/documentbase.py =================================================================== --- trunk/v7/documentbase.py 2011-07-25 14:20:26 UTC (rev 1031) +++ trunk/v7/documentbase.py 2011-07-25 16:32:12 UTC (rev 1032) @@ -272,7 +272,7 @@ except: pass try: - gzip = Command("gzip %s" % filename) + gzip = Command("gzip \"%s\"" % filename) gzip.run() return True except Exception, exception:

1 0

r1031 - tags
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 14:20:26 +0000 (Mon, 25 Jul 2011) New Revision: 1031 Added: tags/v7-V1-4R15/ Log: tag version

1 0

r1030 - trunk
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 14:19:54 +0000 (Mon, 25 Jul 2011) New Revision: 1030 Modified: trunk/v7.spec.in Log: changlog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-25 14:18:04 UTC (rev 1029) +++ trunk/v7.spec.in 2011-07-25 14:19:54 UTC (rev 1030) @@ -77,6 +77,12 @@ %changelog +* Mon Jul 25 2011 Greg Nichols <gnichols(a)redhat.com> + +V7 1.4 R15 + + 725441 - FEAT: save command should store results on server for review + * Thu Jul 21 2011 Greg Nichols <gnichols(a)redhat.com> V7 1.4 R14

1 0

r1029 - in trunk/server: . cgi cgi/xsl
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 14:18:04 +0000 (Mon, 25 Jul 2011) New Revision: 1029 Added: trunk/server/cgi/saveFile.py trunk/server/cgi/saved.py trunk/server/cgi/template.py Modified: trunk/server/cgi/Makefile trunk/server/cgi/v7xml.py trunk/server/cgi/xsl/summary.xsl trunk/server/index.html Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/server/cgi/Makefile =================================================================== --- trunk/server/cgi/Makefile 2011-07-25 14:16:59 UTC (rev 1028) +++ trunk/server/cgi/Makefile 2011-07-25 14:18:04 UTC (rev 1029) @@ -16,7 +16,7 @@ .PHONY: clean -FILES := v7web.py v7xml.py networkTest.py +FILES := v7web.py v7xml.py networkTest.py saveFile.py saved.py template.py SUBDIRS := xsl V7_SERVER_ROOT := /var/www/v7 Added: trunk/server/cgi/saveFile.py =================================================================== --- trunk/server/cgi/saveFile.py (rev 0) +++ trunk/server/cgi/saveFile.py 2011-07-25 14:18:04 UTC (rev 1029) @@ -0,0 +1,77 @@ +#!/usr/bin/python +# 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 +# + +# this cgi is used by the http transfer portion of the network test. It saves the file enclosure to the v7 +# storage area for the upload portion of the test. The network test uses a simple request for the file +# for the download test + +import os,sys,cgi +v7ClassLibraryPath = '/usr/share/v7/lib/' +sys.path.append(v7ClassLibraryPath) +os.putenv("PYTHONPATH", v7ClassLibraryPath) +from v7.hash import hashModule + +from v7.environment import Environment + +environment = Environment() + +import cgitb +cgitb.enable() + + +def saveFiles(): + ipAddress = cgi.escape(os.environ["REMOTE_ADDR"]) + + files = list() + fieldStorage = cgi.FieldStorage() + try: + serverPath = fieldStorage["server-path"] + except: + print "Error: no server-path is set" + return False + print "server-path:" + if serverPath.value: + serverPath = os.path.join(*serverPath.value.split()) + print serverPath + directory = os.path.join(environment.getServerDirectory(), "store", serverPath) + print "directory %s" % directory + try: + os.makedirs(directory) + except OSError: + # directory exists + pass + for key in fieldStorage.keys(): + if fieldStorage[key].name == 'file': + path = os.path.join(directory, fieldStorage[key].filename) + file = open(path, "wb") + file.write(fieldStorage[key].value.decode("base64")) + file.close() + print " Saved: " + path + + + +print "Content-type: text/plain"; +print + + +files = saveFiles() + + + +sys.stdout.flush() + + Property changes on: trunk/server/cgi/saveFile.py ___________________________________________________________________ Added: svn:executable + * Added: trunk/server/cgi/saved.py =================================================================== --- trunk/server/cgi/saved.py (rev 0) +++ trunk/server/cgi/saved.py 2011-07-25 14:18:04 UTC (rev 1029) @@ -0,0 +1,78 @@ +#!/usr/bin/python +# 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 os,sys,cgi,lxml, re +from lxml import etree +v7ClassLibraryPath = '/usr/share/v7/lib/' +sys.path.append(v7ClassLibraryPath) +os.putenv("PYTHONPATH", v7ClassLibraryPath) +v7ServerRoot = '/var/www/v7' + +from v7.environment import Environment +from template import Template + +environment = Environment() + +import cgitb +cgitb.enable() + + +def getParameters(): + fieldStorage = cgi.FieldStorage() + # convert to a regular dict() + parameters = { "path": ""} + for key in fieldStorage.keys(): + parameters[key] = fieldStorage[key].value + + return parameters + + +def showSavedResults(parameters): + localPath = os.path.join(environment.getServerDirectory(), "store") + resultsFileFilter = re.compile("\.(xml|xml.gz)$", re.IGNORECASE) + fileNamePattern = re.compile("^v7-results-(?P<hostname>[^\-]+)-(?P<date>[0-9]+)\.xml(.gz)?$") + for (root,dirs,files) in os.walk(localPath): + files = filter(resultsFileFilter.search, files) + if files: + info = root[len(localPath):] + print " ".join(info.split("/")[1:]) + "<br>" + + for file in files: + match = fileNamePattern.search(file) + if match: + dateStamp = match.group("date") + date = "%s-%s-%s" % (dateStamp[4:6], dateStamp[6:8], dateStamp[:4]) + hostname = match.group("hostname") + print "    <a href=\"v7xml.py?sheet=summary&content=html&rpath=%s/%s\">%s %s</a><br>" % (root, file, hostname, date) + print "<br>" + +parameters = getParameters() +template = Template() +template.writeHeader() +print "" + +print """ + <h2>Saved Test Results</h2> + """ +showSavedResults(parameters) +template.writeFooter() +sys.stdout.flush() + + Property changes on: trunk/server/cgi/saved.py ___________________________________________________________________ Added: svn:executable + * Added: trunk/server/cgi/template.py =================================================================== --- trunk/server/cgi/template.py (rev 0) +++ trunk/server/cgi/template.py 2011-07-25 14:18:04 UTC (rev 1029) @@ -0,0 +1,71 @@ +#!/usr/bin/python +# 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 os + +class Template: + + def __init__(self): + return + + def getHostName(self): + system,node,release,version,machine = os.uname() + return node + + def writeHeader(self): + print "Content-type: text/html"; + print """ + + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + + <head> + <title>Red Hat Hardware Certification</title> + <link rel="shortcut icon" href="/v7/images/favicon.ico"> + <link rel="stylesheet" href="/v7/css/v7.css"> + + </head> + + <body id="mainone"> + + + <div id="wrap"> + <div id="innerwrap"> + +  + <div id="header"> + <img src="/v7/images/logo_rh_home.png" alt="Red Hat Home" width="96" height="31" id="rhLogo" /> + </div> + + """ + # Navigation + print "<h1>%s</h1><h1> Hardware Certification Test Server</h1>" % self.getHostName() + print """ + <table> + <tr> + <td><a href="/v7/">Home</a></td> + </tr> + </table> + <br/><br/> + """ + + def writeFooter(self): + print """ + </div></div> + </body> + </html> + """ Modified: trunk/server/cgi/v7xml.py =================================================================== --- trunk/server/cgi/v7xml.py 2011-07-25 14:16:59 UTC (rev 1028) +++ trunk/server/cgi/v7xml.py 2011-07-25 14:18:04 UTC (rev 1029) @@ -15,13 +15,13 @@ # Author: Greg Nichols # -import os,sys,cgi,lxml +import os,sys,cgi,lxml,gzip from lxml import etree v7ClassLibraryPath = '/usr/share/v7/lib/' sys.path.append(v7ClassLibraryPath) os.putenv("PYTHONPATH", v7ClassLibraryPath) -v7ServerRoot = '/var/www/v7' + from v7.environment import Environment environment = Environment() @@ -33,36 +33,47 @@ def getParameters(): fieldStorage = cgi.FieldStorage() # convert to a regular dict() - parameters = { "sheet": "default", "content":"xml", "devices":"\'hide\'", "device-classes": "\'hide\'"} + cgiParameters = { "sheet": "default", "content":"xml", "rpath":environment.getResultsPath()} + xsltParameters = { "devices":"\'hide\'", "device-classes": "\'hide\'", "rpath":"\'%s\'" % environment.getResultsPath()} for key in fieldStorage.keys(): - if key in ["sheet", "content"]: - parameters[key] = fieldStorage[key].value - else: - # assume all parameter values are strings (wrap them in ''s) - parameters[key] = "\'%s\'" % fieldStorage[key].value - return parameters + cgiParameters[key] = fieldStorage[key].value + # assume all parameter values are strings (wrap them in ''s) + xsltParameters[key] = "\'%s\'" % fieldStorage[key].value + return (cgiParameters, xsltParameters) -def doTransform(parameters): - xslt = etree.parse("%s/xsl/%s.xsl" % (v7ServerRoot, parameters["sheet"])) +def doTransform(cgiParameters, xsltParameters): + xslt = etree.parse("%s/xsl/%s.xsl" % (environment.getServerDirectory(), cgiParameters["sheet"])) transform = etree.XSLT(xslt) - results = etree.parse(environment.getResultsPath()) - output = transform(results, **parameters) + resultsPath = environment.getResultsPath() + if "rpath" in cgiParameters: + resultsPath = cgiParameters["rpath"] + if resultsPath[-2:] == "gz": + results = gzip.open(resultsPath, 'rb') + else: + results = open(resultsPath) + + results = etree.parse(results) + output = transform(results, **xsltParameters) # write the transformed doc to the output output.write(sys.stdout) sys.stdout.flush() -parameters = getParameters() -print "Content-type: text/%s" % parameters["content"]; +(cgiParameters, xsltParameters) = getParameters() +print "Content-type: text/%s" % cgiParameters["content"]; print -print "" +print "" -doTransform(parameters) +doTransform(cgiParameters, xsltParameters) sys.stdout.flush() Modified: trunk/server/cgi/xsl/summary.xsl =================================================================== --- trunk/server/cgi/xsl/summary.xsl 2011-07-25 14:16:59 UTC (rev 1028) +++ trunk/server/cgi/xsl/summary.xsl 2011-07-25 14:18:04 UTC (rev 1029) @@ -1,5 +1,6 @@ <?xml version="1.0"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> +<xsl:variable name="results" select="HHHH" /> <xsl:template match="/certification-test">  @@ -20,7 +21,7 @@  <h1>Hardware Certification Test Suite</h1> - + <table class="overview"> <thead></thead> @@ -41,9 +42,25 @@ <table class="navigation"> <tr><td>See Also:</td> <td><a href="/v7/">Home</a></td> - <td><a href="v7xml.py?sheet=summary&content=html">Summary</a></td> + <td> + <a> + <xsl:attribute name="href"> + <xsl:text>v7xml.py?sheet=summary</xsl:text> + <xsl:text>&content=html</xsl:text> + <xsl:text>&rpath=</xsl:text><xsl:value-of select="$rpath"/> + </xsl:attribute> + Summary + </a></td> - <td><a href="v7xml.py?sheet=device">Devices</a></td> + <td> + <a> + + <xsl:attribute name="href"> + <xsl:text>v7xml.py?sheet=device&rpath=</xsl:text><xsl:value-of select="$rpath"/> + </xsl:attribute> + Devices + </a> + </td> </tr> </table> @@ -70,6 +87,7 @@ <xsl:if test="@logical-device != ''"> <xsl:text>&device=</xsl:text><xsl:value-of select="$currentTest/@logical-device"/> </xsl:if> + <xsl:text>&rpath=</xsl:text><xsl:value-of select="$rpath"/> </xsl:attribute> <xsl:value-of select="@name"/> </a> @@ -82,7 +100,7 @@ <a> <xsl:attribute name="href"> <xsl:text>v7xml.py?sheet=device&udi=</xsl:text><xsl:value-of select="@udi"/> - + <xsl:text>&rpath=</xsl:text><xsl:value-of select="$rpath"/> </xsl:attribute> <xsl:value-of select="@logical-device"/> </a> @@ -140,6 +158,7 @@ <xsl:if test="$currentTest/@logical-device != ''"> <xsl:text>&device=</xsl:text><xsl:value-of select="$currentTest/@logical-device"/> </xsl:if> + <xsl:text>&rpath=</xsl:text><xsl:value-of select="$rpath"/> </xsl:attribute> <xsl:value-of select="$currentRun/summary" /> </a> Modified: trunk/server/index.html =================================================================== --- trunk/server/index.html 2011-07-25 14:16:59 UTC (rev 1028) +++ trunk/server/index.html 2011-07-25 14:18:04 UTC (rev 1029) @@ -24,12 +24,15 @@  <h1>Hardware Certification Test Suite</h1> <p> Welcome to the Red Hat v7 Hardware Certification Test Suite.</p> + + <br> + Test Results Storage:<br> +   <a href="cgi/saved.py?sheet=summary&content=html">Saved Test Results</a><br> <br> - Test Results:<br> + This Server's Test Results:<br>   <a href="cgi/v7xml.py?sheet=summary&content=html">Summary</a><br>   <a href="cgi/v7xml.py">Filtered XML</a> <br> -   <a href="results.xml">Raw XML</a<br> <br> <a href="docs">Documentation</a><br> <br>

1 0

r1028 - trunk/v7
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 14:16:59 +0000 (Mon, 25 Jul 2011) New Revision: 1028 Modified: trunk/v7/documentbase.py trunk/v7/hardwaretest.py trunk/v7/http.py Log: 725441 - FEAT: save command should store results on server for review Modified: trunk/v7/documentbase.py =================================================================== --- trunk/v7/documentbase.py 2011-07-25 14:15:52 UTC (rev 1027) +++ trunk/v7/documentbase.py 2011-07-25 14:16:59 UTC (rev 1028) @@ -268,6 +268,10 @@ def compressToFile(self, filename): self.save(filename) try: + os.remove(filename+".gz") + except: + pass + try: gzip = Command("gzip %s" % filename) gzip.run() return True Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-25 14:15:52 UTC (rev 1027) +++ trunk/v7/hardwaretest.py 2011-07-25 14:16:59 UTC (rev 1028) @@ -46,6 +46,7 @@ from v7.redhatrelease import RedHatRelease from v7.daemon import V7Daemon from v7.log import Log +from v7.http import V7Http class HardwareTestHarness(Controller): @@ -944,17 +945,20 @@ def __save(self): if self.certification: path = self.environment.getStoreDirectory() + serverPath = list() self.makeDirectoryPath(path) - for tag in Tags.vendor, Tags.model, Tags.arch: + for tag in Tags.vendor, Tags.make, Tags.model, Tags.arch: value = self.certification.getHardware(tag) if len(value) > 0 and value != "unknown": path += "/%s" % value self.makeDirectoryPath(path) + serverPath.append(value) for tag in Tags.name, Tags.release: value = self.certification.getOS(tag) if len(value) > 0: path += "/%s" % value self.makeDirectoryPath(path) + serverPath.append(value) savedFilename = "v7-results" hostname = self.certification.getOS(Tags.hostname) @@ -965,8 +969,16 @@ savedFilename += "-%s" % self.certification.timeStringToTimestamp(runTime) savedFilename += ".xml" print "Saving current results to:" - print "%s/%s" % (path, savedFilename) - self.certification.save("%s/%s" % (path, savedFilename)) + savedFilePath = os.path.join(path, savedFilename) + print savedFilePath + self.certification.compressToFile(savedFilePath) + + if self.testServer and self.ui.promptConfirm("Copy results to test server %s?" % self.testServer): + request = V7Http(self.testServer, "/v7/cgi/saveFile.py") + request.addField("server-path", serverPath) + return request.httpUpload(savedFilePath+".gz") + + # otherwise return True #otherwise Modified: trunk/v7/http.py =================================================================== --- trunk/v7/http.py 2011-07-25 14:15:52 UTC (rev 1027) +++ trunk/v7/http.py 2011-07-25 14:16:59 UTC (rev 1028) @@ -16,7 +16,7 @@ # # HTTP library for v7's tests -import os, urllib2, httplib +import os, urllib2, httplib, re, time class V7Http: @@ -33,7 +33,11 @@ lines.append('--' + boundary) lines.append('Content-Disposition: form-data; name="%s"' % name) lines.append('') - lines.append(value) + if type(value) is list: + for item in value: + lines.append(item) + else: + lines.append(value) for (name, filename, contents) in self.files: lines.append('--' + boundary) lines.append('Content-Disposition: form-data; name="%s"; filename="%s"' % (name, filename)) @@ -71,11 +75,30 @@ responseCode, responseMessage, headers = request.getreply() if responseCode != 200: print "Error: could not send message (response code %s)" % responseCode + print "Host: %s" % self.host + print "URL: %s" % self.url print "Message: %s" % responseMessage return (0, None) return (len(self.body), request.file.read()) + def httpUpload(self, localFilePath): + if not self.addFile(localFilePath): + print "Error: could not add file %s to request" % localFilePath + return False + # otherwise + print "sending file %s " % localFilePath + startTime = time.time() + (size, response) = self.send() + stopTime = time.time() + if not response: + # send failed + return False + print "response: " + print response + print "Upload took %.2f seconds, %.2f MB/sec" % (stopTime-startTime, size/((stopTime-startTime)*1000000)) + + return True if __name__ == "__main__":

1 0

r1027 - trunk
by gnichols＠fedoraproject.org 25 Jul '11

25 Jul '11

Author: gnichols Date: 2011-07-25 14:15:52 +0000 (Mon, 25 Jul 2011) New Revision: 1027 Modified: trunk/Makefile Log: R15 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-21 13:38:34 UTC (rev 1026) +++ trunk/Makefile 2011-07-25 14:15:52 UTC (rev 1027) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 14 +V7_RELEASE := 15 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

r1026 - tags
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:38:34 +0000 (Thu, 21 Jul 2011) New Revision: 1026 Added: tags/v7-V1-4R14/ Log: tag version

1 0

r1025 - trunk
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:38:04 +0000 (Thu, 21 Jul 2011) New Revision: 1025 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-21 13:34:53 UTC (rev 1024) +++ trunk/v7.spec.in 2011-07-21 13:38:04 UTC (rev 1025) @@ -77,12 +77,17 @@ %changelog -* Fri Jul 15 2011 Greg Nichols <gnichols(a)redhat.com> +* Thu Jul 21 2011 Greg Nichols <gnichols(a)redhat.com> -V7 1.4 R13 +V7 1.4 R14 521609 - v7 plan --server says server has error: /var/v7/export 711155 - v7: sh: kudzu: command not found + 717779 - Reboot nfs test does not reliably grab an ip address causing the test to fail + 711161 - v7 usb test Error: test raised exception on zero-length/non-integer prompt response + 702140 - Unable to determine pass/fail state of logs after packaging with v7 submit + 573598 - Test Suite should give a caution when user disable INFO test. + 559834 - fv_* is not listed in v7 plan on rhel54-server-ia64-xen system * Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com>

1 0

r1024 - trunk/v7
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:34:53 +0000 (Thu, 21 Jul 2011) New Revision: 1024 Modified: trunk/v7/fvtest.py Log: 559834 - fv_* is not listed in v7 plan on rhel54-server-ia64-xen system Modified: trunk/v7/fvtest.py =================================================================== --- trunk/v7/fvtest.py 2011-07-21 13:33:06 UTC (rev 1023) +++ trunk/v7/fvtest.py 2011-07-21 13:34:53 UTC (rev 1024) @@ -145,7 +145,11 @@ return False def __hasVirtualizationCPUFlags(self, verbose=False): - """ check cpuinfo for virtualization flags """ + """ check cpuinfo for virtualization flags """ + if self.hardwarePlatform == "ia64": + print "ia64 - assuming virtualization support" + return True + # otherwise cpuflags = Command("fgrep flags /proc/cpuinfo") try: flags = cpuflags.getString(regex="(vmx|smx|svm)", singleLine=False)

1 0

r1023 - trunk/v7
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:33:06 +0000 (Thu, 21 Jul 2011) New Revision: 1023 Modified: trunk/v7/hardwaretest.py Log: 573598 - Test Suite should give a caution when user disable INFO test. Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-21 13:31:15 UTC (rev 1022) +++ trunk/v7/hardwaretest.py 2011-07-21 13:33:06 UTC (rev 1023) @@ -594,7 +594,8 @@ if not self.__checkResultsSize(): return False tests = self.addMandatoryTests(tests) - + if not tests: + return False print "\nRunning the following tests:" for test in tests: udi = test.getShortUDI() @@ -811,6 +812,11 @@ return tests # otherwise - debugging - don't add any tests + print "Warning: Test runs in debug mode are invalid for certification." + if self.certification.getMandatoryTests(): + print "The following tests will be skipped: %s" % ", ".join(map(TestDocument.getName, self.certification.getMandatoryTests())) + if not self.ui.promptConfirm("Do you wish to continue?"): + return None return requestedTests def doCertify(self): @@ -830,6 +836,8 @@ if not self.__checkResultsSize(): return False tests = self.addMandatoryTests(tests) + if not tests: + return False if not self.options.tag: print "\nThe following tests are recommended to complete the certification:" else: @@ -1144,30 +1152,20 @@ print "HardwareTest.setTestsEnabled:" disabled = True output = "Disabled" + count = 0 if self.options.enable: disabled = False output = "Enabled" for test in tests: + if disabled and test.getMandatory(): + print "The %s test must be included in every test run and can not be disabled." % test.getName() + continue test.setDisabled(disabled) + count = count + 1 if self.Debugging: print (output + " test: %s udi: %s") % (test.getName(), test.getUDI()) - print (output + " %u tests") % len(tests) + print (output + " %u tests") % count - def setTestsEnabled(self): - tests = self._getTestsFromOptions() - if self.Debugging: - print "HardwareTest.setTestsEnabled:" - disabled = True - output = "Disabled" - if self.options.enable: - disabled = False - output = "Enabled" - for test in tests: - test.setDisabled(disabled) - if self.Debugging: - print (output + " test: %s udi: %s") % (test.getName(), test.getUDI()) - print (output + " %u tests") % len(tests) - def setServerOnTests(self): tests = self._getTestsFromOptions() if self.Debugging:

1 0

r1022 - trunk/v7
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:31:15 +0000 (Thu, 21 Jul 2011) New Revision: 1022 Modified: trunk/v7/report.py Log: 702140 - Unable to determine pass/fail state of logs after packaging with v7 submit Modified: trunk/v7/report.py =================================================================== --- trunk/v7/report.py 2011-07-21 13:27:36 UTC (rev 1021) +++ trunk/v7/report.py 2011-07-21 13:31:15 UTC (rev 1022) @@ -296,9 +296,6 @@ run = test.getRun(runNumber) if not run.passed(): combinedTestPass = False - elif run.getMode() == Constants.auto and test.isInteractive(): - print "Warning: Interactive %s test run in %s mode marked as FAIL" % (test.getName(), run.getMode()) - combinedTestPass = False if len(testsByName) > 1: deviceNumber = deviceNumber + 1 @@ -307,6 +304,10 @@ if outputLog: log = codecs.open(dir + "/output.log", "a", "utf-8" ) log.write(outputLog) + if run.passed(): + log.write(Constants.PASS+"\n") + else: + log.write(Constants.FAIL+"\n") log.close() systemLog = run.getSystemLog() if systemLog:

1 0

r1021 - in trunk: tests/usb v7
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:27:36 +0000 (Thu, 21 Jul 2011) New Revision: 1021 Modified: trunk/tests/usb/usb.py trunk/v7/commandLineUI.py Log: 711161 - v7 usb test Error: test raised exception on zero-length/non-integer prompt response Modified: trunk/tests/usb/usb.py =================================================================== --- trunk/tests/usb/usb.py 2011-07-21 13:23:26 UTC (rev 1020) +++ trunk/tests/usb/usb.py 2011-07-21 13:27:36 UTC (rev 1021) @@ -83,7 +83,7 @@ self.result = Constants.FAIL return 1 - self.numberOfSockets = string.atoi(self.prompt("How many USB sockets are required to be tested? ")) + self.numberOfSockets = self.promptInteger("How many USB sockets are required to be tested? ") if self.numberOfSockets < 1: print("No USB sockets to test") self.result = Constants.PASS Modified: trunk/v7/commandLineUI.py =================================================================== --- trunk/v7/commandLineUI.py 2011-07-21 13:23:26 UTC (rev 1020) +++ trunk/v7/commandLineUI.py 2011-07-21 13:27:36 UTC (rev 1021) @@ -34,13 +34,7 @@ sys.stdout.write(question) if answers: sys.stdout.write(" (") - first = True - for answer in answers: - if first: - sys.stdout.write(answer) - first = False - else: - sys.stdout.write("|%s" % answer) + sys.stdout.write("|".join(answers)) sys.stdout.write(") ") sys.stdout.flush() response = sys.stdin.readline() @@ -48,6 +42,18 @@ sys.stdout.write("response: %s" % response) return response.strip() + def promptInteger(self, question): + while True: + sys.stdout.write(question) + sys.stdout.flush() + response = sys.stdin.readline() + try: + value = string.atoi(response.strip()) + sys.stdout.write("response: %u\n" % value) + return value + except ValueError: + sys.stdout.write("Please enter an integer.\n") + def promptConfirm(self, question): YES = "y" SAMEASYES = ["y", "yes", "ya", "yup", "affirmative", "roger", "go",

1 0

r1020 - trunk/tests/kdump
by gnichols＠fedoraproject.org 21 Jul '11

21 Jul '11

Author: gnichols Date: 2011-07-21 13:23:26 +0000 (Thu, 21 Jul 2011) New Revision: 1020 Modified: trunk/tests/kdump/kdump.py Log: https://bugzilla.redhat.com/show_bug.cgi?id=717779 Modified: trunk/tests/kdump/kdump.py =================================================================== --- trunk/tests/kdump/kdump.py 2011-07-19 10:47:11 UTC (rev 1019) +++ trunk/tests/kdump/kdump.py 2011-07-21 13:23:26 UTC (rev 1020) @@ -38,6 +38,7 @@ self.rebootTimeLimit = self.environment.getRebootTimelimit() self.priority = 1001 # run last self.coreCollector = "makedumpfile -d 31" + self.linkDelay = 60 # sec self.kdumpConfigPath = "/etc/kdump.conf" self.redHatRelease = RedHatRelease() self.serverMode = True # nfs for kdump to nfs @@ -156,14 +157,44 @@ print e verified = False - # configure kdump to use makedumpfile -d 31 + + (success, restart) = self.setKdumpConfig() + + if restart: + print "restarting kdump with new configuration..." + try: + Command("service kdump stop").echo() + Command("service kdump start").echo() + except V7CommandException, exception: + print "Error: kdump restart failed" + print exception + exception.command.printErrors() + verified = False + + + print "Checking kdump service" try: + kdump = Command("service kdump status") + kdump.getString("is operational") + print "kdump is running" + except V7CommandException, e: + print "Error: kdump is not running - can not test it" + print e + verified = False + + return verified + + def setKdumpConfig(self): + """ set kdump configuration, returns (success, restart) """ + # configure kdump to use makedumpfile -d 31 + try: configFile = ConfigFile(self.kdumpConfigPath) coreCollector = configFile.getParameter("core_collector") net = configFile.getParameter("net") + linkDelay = configFile.getParameter("link_delay") except IOError, exception: print "Error: %s" % exception - return False + return (False, False) restart = False if not coreCollector: @@ -190,34 +221,20 @@ restart = True else: print "Error: v7 test server not set for network kdump" - return False + return (False, False) + if linkDelay: + print "link_delay set to %s" % linkDelay + else: + print "Setting link_delay=%u" % self.linkDelay + configFile.addParameter("link_delay", self.linkDelay) + restart = True if restart: configFile.save() - print "restarting kdump with new configuration..." - try: - Command("service kdump stop").echo() - Command("service kdump start").echo() - except V7CommandException, exception: - print "Error: kdump restart failed" - print exception - exception.command.printErrors() - verified = False - - - print "Checking kdump service" - try: - kdump = Command("service kdump status") - kdump.getString("is operational") - print "kdump is running" - except V7CommandException, e: - print "Error: kdump is not running - can not test it" - print e - verified = False - - return verified + return (True, restart) + def panic(self): self.markOutput("initialize")

1 0

r1019 - trunk/v7
by gnichols＠fedoraproject.org 19 Jul '11

19 Jul '11

Author: gnichols Date: 2011-07-19 10:47:11 +0000 (Tue, 19 Jul 2011) New Revision: 1019 Modified: trunk/v7/hardwaretest.py Log: 711155 - v7: sh: kudzu: command not found Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-19 10:46:12 UTC (rev 1018) +++ trunk/v7/hardwaretest.py 2011-07-19 10:47:11 UTC (rev 1019) @@ -239,14 +239,14 @@ self.certification.getHardware(Tags.make), self.certification.getHardware(Tags.model)) - self.certification.setOS(Tags.name, self.redhatRelease.getCodeName()) - if self.redhatRelease.getVersionPointUpdate(): - self.certification.setOS(Tags.release, self.redhatRelease.getVersionPointUpdate()) + self.certification.setOS(Tags.name, self.redHatRelease.getCodeName()) + if self.redHatRelease.getVersionPointUpdate(): + self.certification.setOS(Tags.release, self.redHatRelease.getVersionPointUpdate()) else: print "Error: could not determine OS release number" return False - if self.redhatRelease.getProduct(): - self.certification.setOS(Tags.product, self.redhatRelease.getProduct()) + if self.redHatRelease.getProduct(): + self.certification.setOS(Tags.product, self.redHatRelease.getProduct()) else: print "Error: could not determine OS product name" return False @@ -992,6 +992,8 @@ vendor = val if key == "Product Name": model = val + # try and use the first word as the make + make = val.split()[0] if vendor and model: break dmidecode.close()

1 0

r1018 - trunk
by gnichols＠fedoraproject.org 19 Jul '11

19 Jul '11

Author: gnichols Date: 2011-07-19 10:46:12 +0000 (Tue, 19 Jul 2011) New Revision: 1018 Modified: trunk/Makefile Log: R14 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-15 16:37:30 UTC (rev 1017) +++ trunk/Makefile 2011-07-19 10:46:12 UTC (rev 1018) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 13 +V7_RELEASE := 14 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

r1017 - tags
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:37:30 +0000 (Fri, 15 Jul 2011) New Revision: 1017 Added: tags/v7-V1-4R13/ Log: tag version

1 0

r1016 - trunk
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:36:59 +0000 (Fri, 15 Jul 2011) New Revision: 1016 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-15 16:35:12 UTC (rev 1015) +++ trunk/v7.spec.in 2011-07-15 16:36:59 UTC (rev 1016) @@ -77,11 +77,12 @@ %changelog -* Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com> +* Fri Jul 15 2011 Greg Nichols <gnichols(a)redhat.com> -V7 1.4 R12 +V7 1.4 R13 521609 - v7 plan --server says server has error: /var/v7/export + 711155 - v7: sh: kudzu: command not found * Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com>

1 0

r1015 - trunk/v7
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:35:12 +0000 (Fri, 15 Jul 2011) New Revision: 1015 Modified: trunk/v7/hardwaretest.py Log: 711155 - v7: sh: kudzu: command not found Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-15 16:33:31 UTC (rev 1014) +++ trunk/v7/hardwaretest.py 2011-07-15 16:35:12 UTC (rev 1015) @@ -62,6 +62,7 @@ self.runMode = self.options.mode self.command = None self.virtualization = None + self.redHatRelease = RedHatRelease() self.commands = {'plan': self.doPlan, 'verify': self.doVerify, @@ -237,15 +238,15 @@ print "Hardware: %s %s %s" % (self.certification.getHardware(Tags.vendor), self.certification.getHardware(Tags.make), self.certification.getHardware(Tags.model)) - redHatRelease = RedHatRelease() - self.certification.setOS(Tags.name, redHatRelease.getCodeName()) - if redHatRelease.getVersionPointUpdate(): - self.certification.setOS(Tags.release, redHatRelease.getVersionPointUpdate()) + + self.certification.setOS(Tags.name, self.redhatRelease.getCodeName()) + if self.redhatRelease.getVersionPointUpdate(): + self.certification.setOS(Tags.release, self.redhatRelease.getVersionPointUpdate()) else: print "Error: could not determine OS release number" return False - if redHatRelease.getProduct(): - self.certification.setOS(Tags.product, redHatRelease.getProduct()) + if self.redhatRelease.getProduct(): + self.certification.setOS(Tags.product, self.redhatRelease.getProduct()) else: print "Error: could not determine OS product name" return False @@ -771,14 +772,15 @@ syslog.syslog("Test error: %s" % e) success = False - # use Kudzu for old rhr's hardware.out - if self.debugLevel != Constants.off: - print "Getting devices from kudzu" - kudzu = Kudzu() - if not kudzu.isValid(): - success = False - else: - run.appendDevices(deviceClass.getDevicesFromDetector(kudzu)) + # use Kudzu for old rhr's hardware.out + if self.redHatRelease.getVersion() < 6: + if self.debugLevel != Constants.off: + print "Getting devices from kudzu" + kudzu = Kudzu() + if not kudzu.isValid(): + success = False + else: + run.appendDevices(deviceClass.getDevicesFromDetector(kudzu)) return success

1 0

r1014 - trunk/tests/kdump
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:33:31 +0000 (Fri, 15 Jul 2011) New Revision: 1014 Modified: trunk/tests/kdump/kdump.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/tests/kdump/kdump.py =================================================================== --- trunk/tests/kdump/kdump.py 2011-07-15 16:32:48 UTC (rev 1013) +++ trunk/tests/kdump/kdump.py 2011-07-15 16:33:31 UTC (rev 1014) @@ -74,9 +74,9 @@ def startServer(self): os.system("service nfs start") - dataDirectory = self.environment.getDataDirectory() - exportDirectory = dataDirectory + '/export' - for directory in (dataDirectory, exportDirectory): + serverDirectory = self.environment.getServerDirectory() + exportDirectory = os.path.join(serverDirectory, self.environment.getServerExport()) + for directory in (serverDirectory, exportDirectory): try: os.mkdir(directory) print "Created %s" % directory @@ -97,7 +97,7 @@ # changed from using "exportfs" since this is called via httpd/cgi, and exportfs uses a # lock file not readable by non-root users.F exportfs = Command("cat /var/lib/nfs/etab") - exportfs.getString(regex=".*%s/export" % self.environment.getDataDirectory(), singleLine=False) + exportfs.getString(regex=".*%s/%s" % (self.environment.getServerDirectory(), self.environment.getServerExport()), singleLine=False) print "%s/export is exported" % self.environment.getDataDirectory() except V7CommandException, exception: print "Error: %s/export is not available" % self.environment.getDataDirectory() @@ -125,6 +125,9 @@ print "Checking kdump configuration" # check crashkernel on kernel command line + # typical settings: + # ppc64: 512M@64M + # x86_64: 128M kernelBootParams = Command("cat /proc/cmdline") kdump = None try: @@ -180,8 +183,8 @@ elif self.getLogicalDeviceName() == Constants.nfs: if self.getTestServer() and self.getTestServer() != "unknown": # Note: the assumption is that the environment for the SUT is the same as the environment - # for the server being used - both have the same data directory setting. - net = "%s:%s/export" % (self.getTestServer(), self.environment.getDataDirectory()) + # for the server being used - both have the same server directory setting. + net = "%s:%s/export" % (self.getTestServer(), self.environment.getServerDirectory(), self.environment.getServerExport()) print "Adding net %s to %s" % (net, self.kdumpConfigPath) configFile.addParameter("net", net) restart = True

1 0

r1013 - trunk/v7
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:32:48 +0000 (Fri, 15 Jul 2011) New Revision: 1013 Modified: trunk/v7/environment.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/v7/environment.py =================================================================== --- trunk/v7/environment.py 2011-07-15 16:25:38 UTC (rev 1012) +++ trunk/v7/environment.py 2011-07-15 16:32:48 UTC (rev 1013) @@ -28,6 +28,8 @@ DocumentBase.__init__(self) self.environmentFile = "/etc/v7.xml" self.defaultDataDirectory = "/var/v7" + self.defaultServerDirectory = "/var/www/v7" + self.defaultExport = "export" self.defaultDatabaseName = "results.xml" self.defaultTaskFile = "tasks" self.defaultLockFile = "/var/lock/subsys/v7" @@ -57,15 +59,24 @@ # set up defaults filesystemElement = self.findOrCreateElement(self.document.documentElement, Tags.file_system) - filesystemElement.setAttribute(Attributes.maximum_attachment_size, "%u" % self.defaultMaximumAttachmentFileSize) + filesystemElement.setAttribute(Attributes.maximum_attachment_size, "%u" % self.defaultMaximumAttachmentFileSize) filesystemElement.setAttribute(Attributes.results_warning_size, "%u" % self.defaultResultsWarningSize) urlElement = self.findOrCreateElement(self.document.documentElement, Tags.urls) + + # data-directory element = self.findOrCreateElement(filesystemElement, Tags.data_directory) self.setTextNode(element, self.defaultDataDirectory) element.setAttribute(Attributes.database_name, self.defaultDatabaseName) element.setAttribute(Attributes.task_file, self.defaultTaskFile) element.setAttribute(Attributes.lock_file, self.defaultLockFile) + + # server-directory + element = self.findOrCreateElement(filesystemElement, Tags.server_directory) + self.setTextNode(element, self.defaultServerDirectory) + element.setAttribute(Attributes.export, self.defaultExport) + + element = self.findOrCreateElement(filesystemElement, Tags.store_directory) self.setTextNode(element, self.defaultStoreDirectory) element = self.findOrCreateElement(filesystemElement, Tags.source_directory) @@ -106,6 +117,19 @@ dataDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.data_directory) return self.getTextNode(dataDirectoryElement).data + def getServerDirectory(self): + serverDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.server_directory) + if not self.getTextNode(serverDirectoryElement): + self.setTextNode(serverDirectoryElement, self.defaultServerDirectory) + serverDirectoryElement.setAttribute(Attributes.export, self.defaultExport) + self.save(self.environmentFile) + return self.getTextNode(serverDirectoryElement).data + + def getServerExport(self): + self.getServerDirectory() # so it gets created if not found + serverDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.server_directory) + return serverDirectoryElement.getAttribute(Attributes.export) + def getStoreDirectory(self): storeDirectoryElement = self.findOrCreateElement(self._getFilesystemElement(), Tags.store_directory) return self.getTextNode(storeDirectoryElement).data

1 0

r1012 - trunk/v7
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:25:38 +0000 (Fri, 15 Jul 2011) New Revision: 1012 Modified: trunk/v7/tags.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/v7/tags.py =================================================================== --- trunk/v7/tags.py 2011-07-15 16:24:03 UTC (rev 1011) +++ trunk/v7/tags.py 2011-07-15 16:25:38 UTC (rev 1012) @@ -43,6 +43,7 @@ v7_environment="v7-environment" file_system="file-system" data_directory="data-directory" + server_directory="server-directory" source_directory="source-directory" store_directory="store-directory" library_directory="library-directory" @@ -105,6 +106,7 @@ fv_guest_timelimit="fv-guest-timelimit" reboot_timelimit="reboot-timelimit" results_warning_size="results-warning-size" + export="export" class Constants:

1 0

r1011 - trunk
by gnichols＠fedoraproject.org 15 Jul '11

15 Jul '11

Author: gnichols Date: 2011-07-15 16:24:03 +0000 (Fri, 15 Jul 2011) New Revision: 1011 Modified: trunk/Makefile Log: R13 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-13 18:47:49 UTC (rev 1010) +++ trunk/Makefile 2011-07-15 16:24:03 UTC (rev 1011) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 12 +V7_RELEASE := 13 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

r1010 - trunk/v7
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 18:47:49 +0000 (Wed, 13 Jul 2011) New Revision: 1010 Modified: trunk/v7/hardwaretest.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-13 17:09:48 UTC (rev 1009) +++ trunk/v7/hardwaretest.py 2011-07-13 18:47:49 UTC (rev 1010) @@ -554,12 +554,12 @@ print "Status: %s" % match.group("status") if match.group("status") == Constants.running: serverRunning = True - else: - print "Warning: The v7 server on %s is reporting errors" % server - for line in response: - if "Error:" in line: - sys.stdout.write("%s says: %s" % (server, line)) - return False + else: + print "Warning: The v7 server on %s is reporting errors" % server + for line in response: + if "Error:" in line: + sys.stdout.write("%s says: %s" % (server, line)) + return False else: "Warning: The V7 server on %s is not running" % server return False

1 0

r1009 - tags
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 17:09:48 +0000 (Wed, 13 Jul 2011) New Revision: 1009 Added: tags/v7-V1-4R12/ Log: tag version

1 0

r1008 - trunk
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 17:08:59 +0000 (Wed, 13 Jul 2011) New Revision: 1008 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-13 17:08:38 UTC (rev 1007) +++ trunk/v7.spec.in 2011-07-13 17:08:59 UTC (rev 1008) @@ -79,7 +79,7 @@ %changelog * Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com> -V7 1.4 R11 +V7 1.4 R12 521609 - v7 plan --server says server has error: /var/v7/export

1 0

r1007 - trunk
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 17:08:38 +0000 (Wed, 13 Jul 2011) New Revision: 1007 Modified: trunk/Makefile Log: R12 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-13 17:08:09 UTC (rev 1006) +++ trunk/Makefile 2011-07-13 17:08:38 UTC (rev 1007) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 11 +V7_RELEASE := 12 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

r1006 - trunk/v7
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 17:08:09 +0000 (Wed, 13 Jul 2011) New Revision: 1006 Modified: trunk/v7/hardwaretest.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-13 16:25:03 UTC (rev 1005) +++ trunk/v7/hardwaretest.py 2011-07-13 17:08:09 UTC (rev 1006) @@ -455,10 +455,12 @@ # check server=specific rpms if subcommand == "start": # server web CGI uses XSLT via python-lxml - if not self.installRequiredRPMs({"python-lxml": "python-lxml", "fence-agents": "fence-agents"}): + if not self.installRequiredRPMs({"fence-agents": "fence-agents"}): result = 1 for test in tests: + print "%s test server %s:" % (test.Name(), subcommand) rv = self.runServer(test, subcommand) + print "" if rv != 0: result = rv @@ -511,11 +513,14 @@ planner.analyse(self.environment.getSourceDirectory()) tests = planner.getServerModeTests(); print "</pre>V7 Server Status:<pre>" + self.doVersion() + print "" success = True - for test in tests: + print "%s server:" % test.Name() if not test.statusServer(): success = False + print "" print "</pre>" if success: print "" % (Constants.v7serverstatus, Constants.running) @@ -530,7 +535,7 @@ request = urllib2.Request('http://%s/v7/cgi/v7web.py?command=status' % server) opener = urllib2.build_opener() response = opener.open(request).readlines() - nvrPattern = re.compile("%s[^0-9]+(?P<version>[0-9]+\.[0-9]+)[^0-9]+(?P<release>[0-9]+)" % Constants.v7) + nvrPattern = re.compile("%s[^0-9]+(?P<version>[0-9]+\.[0-9]+)[^0-9]+(?P<release>[0-9]+)" % Constants.V7) statusPattern = re.compile("%s=(?P<status>[a-zA-Z]+)" % Constants.v7serverstatus) serverRunning = False if response: @@ -1098,22 +1103,13 @@ return rv def runServer(self, test, subcommand): - "Run a test server" - testDirectory = self.environment.getSourceDirectory()+"/"+test.Name() - if self.Debugging: - print "HardwareTestHarness.runServer:" - print " test directory %s" % (testDirectory) - cwd=os.getcwd() - os.chdir(testDirectory) - runCommand = "make server %s=%s" % ( - Constants.RUNMODE, subcommand, - ) - print runCommand - rv = os.WEXITSTATUS(os.system(runCommand)) - os.chdir(cwd) - if self.Debugging: - print "...Done: return value = %u." % rv - return rv + if subcommand == "start": + return test.startServer() + if subcommand == "stop": + return test.stopServer() + + # otherwise + return test.statusServer() def saveSystemLog(self, test, run): "Save a section of the system log to the named file"

1 0

r1005 - tags
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 16:25:03 +0000 (Wed, 13 Jul 2011) New Revision: 1005 Added: tags/v7-V1-4R11/ Log: tag version

1 0

r1004 - trunk
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 16:24:27 +0000 (Wed, 13 Jul 2011) New Revision: 1004 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-13 16:24:05 UTC (rev 1003) +++ trunk/v7.spec.in 2011-07-13 16:24:27 UTC (rev 1004) @@ -77,6 +77,12 @@ %changelog +* Wed Jul 13 2011 Greg Nichols <gnichols(a)redhat.com> + +V7 1.4 R11 + + 521609 - v7 plan --server says server has error: /var/v7/export + * Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com> V7 1.4 R10

1 0

r1003 - trunk/v7
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 16:24:05 +0000 (Wed, 13 Jul 2011) New Revision: 1003 Modified: trunk/v7/tags.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/v7/tags.py =================================================================== --- trunk/v7/tags.py 2011-07-13 16:22:43 UTC (rev 1002) +++ trunk/v7/tags.py 2011-07-13 16:24:05 UTC (rev 1003) @@ -145,7 +145,7 @@ memory = "mem" disk = "disk" v7serverstatus = "v7serverstatus" - v7serverMinimumVersion = "1.3" + v7serverMinimumVersion = "1.4" running = "running" failed = "failed" V7 = "V7"

1 0

r1002 - in trunk/tests: kdump network
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 16:22:43 +0000 (Wed, 13 Jul 2011) New Revision: 1002 Modified: trunk/tests/kdump/kdump.py trunk/tests/network/network.py Log: 521609 - v7 plan --server says server has error: /var/v7/export Modified: trunk/tests/kdump/kdump.py =================================================================== --- trunk/tests/kdump/kdump.py 2011-07-13 16:22:12 UTC (rev 1001) +++ trunk/tests/kdump/kdump.py 2011-07-13 16:22:43 UTC (rev 1002) @@ -40,7 +40,9 @@ self.coreCollector = "makedumpfile -d 31" self.kdumpConfigPath = "/etc/kdump.conf" self.redHatRelease = RedHatRelease() + self.serverMode = True # nfs for kdump to nfs + def getRequiredRPMs(self): rpms = ["kexec-tools", "crash"] variantString = "" @@ -69,7 +71,48 @@ def tags(self): # nanny-prompting in --mode normal, will run --mode auto return [TestTag.noninteractive, TestTag.certification] + + def startServer(self): + os.system("service nfs start") + dataDirectory = self.environment.getDataDirectory() + exportDirectory = dataDirectory + '/export' + for directory in (dataDirectory, exportDirectory): + try: + os.mkdir(directory) + print "Created %s" % directory + except OSError: # file probably exists + if not os.path.exists(directory): + print "Warning: unable to create directory %s." % directory + if os.system("exportfs -o rw,no_root_squash,insecure *:%s" % exportDirectory): + print "Error: could not export %s" % exportDirectory + + def stopServer(self): + # nfs + os.system("service nfs stop") + + def statusServer(self): + result = True + try: + # changed from using "exportfs" since this is called via httpd/cgi, and exportfs uses a + # lock file not readable by non-root users.F + exportfs = Command("cat /var/lib/nfs/etab") + exportfs.getString(regex=".*%s/export" % self.environment.getDataDirectory(), singleLine=False) + print "%s/export is exported" % self.environment.getDataDirectory() + except V7CommandException, exception: + print "Error: %s/export is not available" % self.environment.getDataDirectory() + result = False + + try: + serviceNFSStatus = Command("service nfs status") + print "%s:" % serviceNFSStatus.command + serviceNFSStatus.echo() + except V7CommandException, exception: + print exception + result = False + + return result + def configureKDump(self): verified = True # log required rpms installation @@ -136,7 +179,9 @@ print "Network Dump set to %s" % net elif self.getLogicalDeviceName() == Constants.nfs: if self.getTestServer() and self.getTestServer() != "unknown": - net = "%s:/var/v7/export" % self.getTestServer() + # Note: the assumption is that the environment for the SUT is the same as the environment + # for the server being used - both have the same data directory setting. + net = "%s:%s/export" % (self.getTestServer(), self.environment.getDataDirectory()) print "Adding net %s to %s" % (net, self.kdumpConfigPath) configFile.addParameter("net", net) restart = True Modified: trunk/tests/network/network.py =================================================================== --- trunk/tests/network/network.py 2011-07-13 16:22:12 UTC (rev 1001) +++ trunk/tests/network/network.py 2011-07-13 16:22:43 UTC (rev 1002) @@ -434,20 +434,6 @@ else: print " done." - # nfs - leaving in so we can test prior v7 clients. - os.system("service nfs start") - dataDirectory = self.environment.getDataDirectory() - exportDirectory = dataDirectory + '/export' - for directory in (dataDirectory, exportDirectory): - try: - os.mkdir(directory) - print "Created %s" % directory - except OSError: # file probably exists - if not os.path.exists(directory): - print "Warning: unable to create directory %s." % directory - - if os.system("exportfs -o rw,no_root_squash,insecure *:%s" % exportDirectory): - print "Error: could not export %s" % exportDirectory # httpd os.system("service httpd start") @@ -470,8 +456,7 @@ os.system("bw_tcp -S localhost") os.system("lat_udp -S localhost") print " done." - # nfs - os.system("service nfs stop") + # httpd os.system("service httpd stop") @@ -486,16 +471,8 @@ except V7CommandException: print "Error: lmbench %s is NOT running" % tool result = False - - try: - Command("exportfs").getString(regex=".*%s/export" % self.environment.getDataDirectory(), singleLine=False) - print "%s/export is exported" % self.environment.getDataDirectory() - except V7CommandException: - print "Error: %s/export is not available" % self.environment.getDataDirectory() - result = False try: - Command("service nfs status ").echo() # httpd Command("service httpd status").echo() except V7CommandException, exception:

1 0

r1001 - trunk
by gnichols＠fedoraproject.org 13 Jul '11

13 Jul '11

Author: gnichols Date: 2011-07-13 16:22:12 +0000 (Wed, 13 Jul 2011) New Revision: 1001 Modified: trunk/Makefile Log: R11 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-12 10:51:11 UTC (rev 1000) +++ trunk/Makefile 2011-07-13 16:22:12 UTC (rev 1001) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 10 +V7_RELEASE := 11 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

r1000 - tags
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:51:11 +0000 (Tue, 12 Jul 2011) New Revision: 1000 Added: tags/v7-V1-4R10/ Log: tag version

1 0

r999 - trunk/tests/usb
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:48:55 +0000 (Tue, 12 Jul 2011) New Revision: 999 Modified: trunk/tests/usb/usb.py Log: 705844 - interactive tests run in --mode auto should fail Modified: trunk/tests/usb/usb.py =================================================================== --- trunk/tests/usb/usb.py 2011-07-12 10:47:40 UTC (rev 998) +++ trunk/tests/usb/usb.py 2011-07-12 10:48:55 UTC (rev 999) @@ -81,7 +81,7 @@ if self.getMode() == Constants.auto: print "Error: the usb test can not be run in auto mode." self.result = Constants.FAIL - return 0 + return 1 self.numberOfSockets = string.atoi(self.prompt("How many USB sockets are required to be tested? ")) if self.numberOfSockets < 1:

1 0

r998 - trunk/tests/suspend
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:47:40 +0000 (Tue, 12 Jul 2011) New Revision: 998 Modified: trunk/tests/suspend/suspend.py Log: 705844 - interactive tests run in --mode auto should fail Modified: trunk/tests/suspend/suspend.py =================================================================== --- trunk/tests/suspend/suspend.py 2011-07-12 10:46:46 UTC (rev 997) +++ trunk/tests/suspend/suspend.py 2011-07-12 10:47:40 UTC (rev 998) @@ -202,10 +202,9 @@ FAILED = 1 PASSED = 0 - # disable this test in auto mode if self.getMode() == Constants.auto: print "Error: suspend test can not be run in auto mode." - return FAILDED + return FAILED methods = self.getSuspendMethods() if not methods or len(methods) is 0:

1 0

r997 - trunk/tests/pccard
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:46:46 +0000 (Tue, 12 Jul 2011) New Revision: 997 Modified: trunk/tests/pccard/pccard.py Log: 705844 - interactive tests run in --mode auto should fail Modified: trunk/tests/pccard/pccard.py =================================================================== --- trunk/tests/pccard/pccard.py 2011-07-12 10:43:36 UTC (rev 996) +++ trunk/tests/pccard/pccard.py 2011-07-12 10:46:46 UTC (rev 997) @@ -16,7 +16,7 @@ # from v7.test import Test -from v7.tags import DeviceClass +from v7.tags import DeviceClass, TestTag from v7.command import Command, V7CommandException class PCCardTest(Test):

1 0

r996 - trunk
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:43:36 +0000 (Tue, 12 Jul 2011) New Revision: 996 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-12 10:42:29 UTC (rev 995) +++ trunk/v7.spec.in 2011-07-12 10:43:36 UTC (rev 996) @@ -77,6 +77,13 @@ %changelog +* Tue Jul 12 2011 Greg Nichols <gnichols(a)redhat.com> + +V7 1.4 R10 + + 701491 - kdump test should improve dependant rpm installation and logging + 705844 - interactive tests run in --mode auto should fail + * Thu Jul 07 2011 Greg Nichols <gnichols(a)redhat.com> V7 1.4 R9

1 0

r995 - in trunk/tests: audio battery bluray cdrom dvd expresscard floppy lid pccard suspend tape usb
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:42:29 +0000 (Tue, 12 Jul 2011) New Revision: 995 Modified: trunk/tests/audio/audio.py trunk/tests/battery/battery.py trunk/tests/bluray/bluray.py trunk/tests/cdrom/cdrom.py trunk/tests/dvd/dvd.py trunk/tests/expresscard/expresscard.py trunk/tests/floppy/floppy.py trunk/tests/lid/lid.py trunk/tests/pccard/pccard.py trunk/tests/suspend/suspend.py trunk/tests/tape/tape.py trunk/tests/usb/usb.py Log: 705844 - interactive tests run in --mode auto should fail Modified: trunk/tests/audio/audio.py =================================================================== --- trunk/tests/audio/audio.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/audio/audio.py 2011-07-12 10:42:29 UTC (rev 995) @@ -69,16 +69,18 @@ self.logSoundCardInfo() - if self.getMode() != Constants.normal: - print("Test Mode: %s, Audio NOT VERIFIED BY TESTER!" % self.getMode()) - else: - print "This test plays a sound sample and records it to another file." - print "Please use the Volume Control application and insure that the " - print "Capture settings will record the sound." - if not self.promptConfirm("Continue?"): - self.result = Constants.FAIL - return FAILED + if self.getMode() == Constants.auto: + print("Error: Test Mode: %s: The audio test can not be run in auto mode since audio functions must be verified by the tester." % self.getMode()) + return FAILED + # otherwise + print "This test plays a sound sample and records it to another file." + print "Please use the Volume Control application and insure that the " + print "Capture settings will record the sound." + if not self.promptConfirm("Continue?"): + self.result = Constants.FAIL + return FAILED + waveFiles=["/usr/share/system-config-soundcard/sound-sample.wav", "/usr/share/sounds/alsa/Front_Right.wav", "/usr/share/sounds/alsa/Front_Left.wav"] @@ -101,7 +103,7 @@ time.sleep(waitTime) os.system("killall -w -9 rec sox") - if self.getMode() == Constants.normal and not self.promptConfirm("Did you hear the sound?"): + if not self.promptConfirm("Did you hear the sound?"): self.result = Constants.FAIL return FAILED @@ -111,7 +113,7 @@ self.result = Constants.FAIL return FAILED - if self.getMode() == Constants.normal and not self.promptConfirm("Did you hear the sound?"): + if not self.promptConfirm("Did you hear the sound?"): self.result = Constants.FAIL return FAILED Modified: trunk/tests/battery/battery.py =================================================================== --- trunk/tests/battery/battery.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/battery/battery.py 2011-07-12 10:42:29 UTC (rev 995) @@ -147,6 +147,11 @@ def run(self): FAILED = 1 PASSED = 0 + + if self.getMode() == Constants.auto: + print "Error: battery test can not be run in auto mode, as it requires the tester to disconnect power" + return FAILED + action = None testedConnected = False testedDisconnected = False Modified: trunk/tests/bluray/bluray.py =================================================================== --- trunk/tests/bluray/bluray.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/bluray/bluray.py 2011-07-12 10:42:29 UTC (rev 995) @@ -130,10 +130,10 @@ if not self.initializeDeviceInfo(): return FAILED - # auto or self-test mode ? - if self.getMode() != Constants.normal: - print "Warning: Auto test mode - TEST WILL NOT RUN" - return PASSED + # auto mode ? + if self.getMode() == Constants.auto: + print "Error: The bluray test can not be run in auto mode." + return FAILED # if we have a UDI, maybe HAL worked? media = None Modified: trunk/tests/cdrom/cdrom.py =================================================================== --- trunk/tests/cdrom/cdrom.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/cdrom/cdrom.py 2011-07-12 10:42:29 UTC (rev 995) @@ -125,9 +125,9 @@ return FAILED # if auto or self-test mode - if self.getMode() != Constants.normal: - print "Warning: Auto test mode - TESTS NOT RUN" - return PASSED + if self.getMode() == Constants.auto: + print "Error: the CDROM test can not be run in auto mode" + return FAILED 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])): Modified: trunk/tests/dvd/dvd.py =================================================================== --- trunk/tests/dvd/dvd.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/dvd/dvd.py 2011-07-12 10:42:29 UTC (rev 995) @@ -144,8 +144,8 @@ # if auto or self-test mode if self.getMode() != Constants.normal: - print "Warning: Auto test mode - TESTS NOT RUN" - return 0 + print "Error: The DVD test can not be run in auto mode." + return FAILED self.getMediaChoice() Modified: trunk/tests/expresscard/expresscard.py =================================================================== --- trunk/tests/expresscard/expresscard.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/expresscard/expresscard.py 2011-07-12 10:42:29 UTC (rev 995) @@ -155,6 +155,10 @@ def run(self): PASSED = 0 FAILED = 1 + + if self.getMode() == Constants.auto: + print "Error: the expresscard test can not be run in auto mode." + return FAILED print "" print "ExpressCard Test:" Modified: trunk/tests/floppy/floppy.py =================================================================== --- trunk/tests/floppy/floppy.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/floppy/floppy.py 2011-07-12 10:42:29 UTC (rev 995) @@ -83,9 +83,9 @@ # start testing (noFloppyDisk,junkOutput1) = commands.getstatusoutput("dd bs=1c if=%s count=0 2>/dev/null" % floppyDevice) if noFloppyDisk != 0: - if self.getMode() != Constants.normal: - print "Warning: Auto test mode - TESTS NOT RUN" - return 0 + if self.getMode() == Constants.auto: + print "Error: the floppy test can not be run in auto mode." + return 1 # otherwise os.system("clear") print " " Modified: trunk/tests/lid/lid.py =================================================================== --- trunk/tests/lid/lid.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/lid/lid.py 2011-07-12 10:42:29 UTC (rev 995) @@ -59,6 +59,10 @@ SLEEPLIMIT=20 # sleep cycles SLEEPTIME=0.5 # sec + if self.getMode() == Constants.auto: + print "Error: the lid test can not be run in auto mode." + return FAILED + if not self.checkLid(checkForOpen=True): print "Error: lid must be open for this test" return FAILED Modified: trunk/tests/pccard/pccard.py =================================================================== --- trunk/tests/pccard/pccard.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/pccard/pccard.py 2011-07-12 10:42:29 UTC (rev 995) @@ -25,7 +25,10 @@ Test.__init__(self, name="pccard") self.deviceClass = DeviceClass.pccard + def tags(self): + return [TestTag.noninteractive, TestTag.certification] + def plan(self, devices): properties = dict() properties['pci.device_subclass'] = 7 Modified: trunk/tests/suspend/suspend.py =================================================================== --- trunk/tests/suspend/suspend.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/suspend/suspend.py 2011-07-12 10:42:29 UTC (rev 995) @@ -204,8 +204,8 @@ # disable this test in auto mode if self.getMode() == Constants.auto: - print("Warning: Test Mode %s, Suspend/Resume NOT TESTED!" % self.getMode()) - return PASSED + print "Error: suspend test can not be run in auto mode." + return FAILDED methods = self.getSuspendMethods() if not methods or len(methods) is 0: Modified: trunk/tests/tape/tape.py =================================================================== --- trunk/tests/tape/tape.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/tape/tape.py 2011-07-12 10:42:29 UTC (rev 995) @@ -33,7 +33,7 @@ self.deviceClass = DeviceClass.sequential def tags(self): - return [TestTag.interactive, TestTag.certification] + return [TestTag.noninteractive, TestTag.certification] def plan(self, devices): tests = list() Modified: trunk/tests/usb/usb.py =================================================================== --- trunk/tests/usb/usb.py 2011-07-12 10:39:28 UTC (rev 994) +++ trunk/tests/usb/usb.py 2011-07-12 10:42:29 UTC (rev 995) @@ -78,9 +78,9 @@ # check for USB devices, print info about them self.checkAllUSBPortsUnplugged() self.fixedDevices = len(self.pluggedInDevices) - if self.getMode() != Constants.normal: - print("Test Mode: %s, USB Sockets NOT TESTED!" % self.getMode()) - self.result = Constants.PASS + if self.getMode() == Constants.auto: + print "Error: the usb test can not be run in auto mode." + self.result = Constants.FAIL return 0 self.numberOfSockets = string.atoi(self.prompt("How many USB sockets are required to be tested? "))

1 0

r994 - trunk/tests/kdump
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:39:28 +0000 (Tue, 12 Jul 2011) New Revision: 994 Modified: trunk/tests/kdump/kdump.py Log: 701491 - kdump test should improve dependant rpm installation and logging Modified: trunk/tests/kdump/kdump.py =================================================================== --- trunk/tests/kdump/kdump.py 2011-07-12 10:38:57 UTC (rev 993) +++ trunk/tests/kdump/kdump.py 2011-07-12 10:39:28 UTC (rev 994) @@ -24,6 +24,7 @@ from v7.documentbase import DocumentWrapper from v7.continuation import Continuation from v7.configfile import ConfigFile +from v7.redhatrelease import RedHatRelease class KDumpTest(Test): @@ -38,9 +39,15 @@ self.priority = 1001 # run last self.coreCollector = "makedumpfile -d 31" self.kdumpConfigPath = "/etc/kdump.conf" + self.redHatRelease = RedHatRelease() def getRequiredRPMs(self): - rpms = ["kernel-debug", "kernel-debuginfo", "kexec-tools"] + rpms = ["kexec-tools", "crash"] + variantString = "" + if self.redHatRelease.getKernelFlavor(): + variantString = "-" + self.redHatRelease.getKernelFlavor() + rpms.append("kernel%s-debuginfo" % variantString) + return rpms def plan(self, devices): @@ -64,16 +71,16 @@ return [TestTag.noninteractive, TestTag.certification] def configureKDump(self): - # if kdump is set up, use it - print "Checking kdump configuration" verified = True - # log kexec-tools installation - try: - kexecRPM = Command("rpm -q kexec-tools").getString() - print "kexec-tools installed: " + kexecRPM - except: - pass + # log required rpms installation + print "Checking required packages:" + for rpm in self.getRequiredRPMs(): + try: + print Command("rpm -q %s" % rpm).getString() + except: + pass + print "Checking kdump configuration" # check crashkernel on kernel command line kernelBootParams = Command("cat /proc/cmdline") kdump = None @@ -83,7 +90,7 @@ print "Found crashkernel=%s boot parameter" % kdump except: print "Error: \"crashkernel\" is not set in boot parameters" - verified = False + return False # check kernel panic timeout, and set to 1sec if necessary try:

1 0

r993 - trunk
by gnichols＠fedoraproject.org 12 Jul '11

12 Jul '11

Author: gnichols Date: 2011-07-12 10:38:57 +0000 (Tue, 12 Jul 2011) New Revision: 993 Modified: trunk/Makefile Log: R10 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2011-07-07 19:06:00 UTC (rev 992) +++ trunk/Makefile 2011-07-12 10:38:57 UTC (rev 993) @@ -14,7 +14,7 @@ # Author: Greg Nichols V7_VERSION := 1.4 -V7_RELEASE := 9 +V7_RELEASE := 10 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

r992 - tags
by gnichols＠fedoraproject.org 07 Jul '11

07 Jul '11

Author: gnichols Date: 2011-07-07 19:06:00 +0000 (Thu, 07 Jul 2011) New Revision: 992 Added: tags/v7-V1-4R9/ Log: tag version

1 0

r991 - trunk
by gnichols＠fedoraproject.org 07 Jul '11

07 Jul '11

Author: gnichols Date: 2011-07-07 19:05:35 +0000 (Thu, 07 Jul 2011) New Revision: 991 Modified: trunk/v7.spec.in Log: changelog Modified: trunk/v7.spec.in =================================================================== --- trunk/v7.spec.in 2011-07-07 19:05:16 UTC (rev 990) +++ trunk/v7.spec.in 2011-07-07 19:05:35 UTC (rev 991) @@ -77,9 +77,22 @@ %changelog +* Thu Jul 07 2011 Greg Nichols <gnichols(a)redhat.com> + +V7 1.4 R9 + + 718290 - Can the kdump variation of the reboot test be moved to be the kdump test? + 716557 - Change v7_rteval.py maximum latency from 100us to 150us. + 708046 - info.py backtraces in checkModuleVenderAndBuildHost with "'v7CommandException' is not defined" + 714848 - Preview kernel taint should be error but not warning + 710173 - Remove test verification prompt if no errors found + 684075 - the hardware <make/> tag in results.xml is never set. + 705326 - fv_network is tagged as interactive, v7 --mode auto will result in fv failures + 704031 - Include additional LVM debugging info in storage test + * Wed Jun 15 2011 Greg Nichols <gnichols(a)redhat.com> -V7 1.4 R1 +V7 1.4 R8 690676 - FEAT: v7 should generate zipped xml file as results 702695 - v7 server should have it's own package

1 0

r990 - trunk/tests
by gnichols＠fedoraproject.org 07 Jul '11

07 Jul '11

Author: gnichols Date: 2011-07-07 19:05:16 +0000 (Thu, 07 Jul 2011) New Revision: 990 Modified: trunk/tests/Makefile Log: 718290 - Can the kdump variation of the reboot test be moved to be the kdump test? Modified: trunk/tests/Makefile =================================================================== --- trunk/tests/Makefile 2011-07-07 19:01:40 UTC (rev 989) +++ trunk/tests/Makefile 2011-07-07 19:05:16 UTC (rev 990) @@ -15,7 +15,7 @@ .PHONY: clean install -SUBDIRS := audio bluray cdrom dvd core info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval hwlatdetect reboot fencing wlan +SUBDIRS := audio bluray cdrom dvd core info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval hwlatdetect reboot fencing wlan kdump clean: for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

v7-commits July 2011