r1229 - trunk/server/cgi
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:42:04 +0000 (Fri, 16 Mar 2012)
New Revision: 1229
Modified:
trunk/server/cgi/v7xml.py
Log:
755473 - v7-server traceback: No such file or directory: u/var/v7/results.xml
Modified: trunk/server/cgi/v7xml.py
===================================================================
--- trunk/server/cgi/v7xml.py 2012-03-16 16:40:34 UTC (rev 1228)
+++ trunk/server/cgi/v7xml.py 2012-03-16 16:42:04 UTC (rev 1229)
@@ -48,17 +48,20 @@
resultsPath = environment.getResultsPath()
if "rpath" in cgiParameters:
resultsPath = cgiParameters["rpath"]
- if resultsPath[-2:] == "gz":
- results = gzip.open(resultsPath, 'rb')
- else:
- results = open(resultsPath)
+ try:
+ if resultsPath[-2:] == "gz":
+ results = gzip.open(resultsPath, 'rb')
+ else:
+ results = open(resultsPath)
- results = etree.parse(results)
- output = transform(results, **xsltParameters)
+ results = etree.parse(results)
+ output = transform(results, **xsltParameters)
+ # write the transformed doc to the output
+ output.write(sys.stdout)
+ except IOError, e:
+ sys.stdout.write("<pre>There are no test results\n")
+ sys.stdout.write("(%s)\n</pre>" % e)
-
- # write the transformed doc to the output
- output.write(sys.stdout)
sys.stdout.flush()
(cgiParameters, xsltParameters) = getParameters()
12 years, 1 month
r1228 - trunk/tests/audio
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:40:34 +0000 (Fri, 16 Mar 2012)
New Revision: 1228
Modified:
trunk/tests/audio/audio.py
Log:
750721 - audio: Warning: could not log sound card information
Modified: trunk/tests/audio/audio.py
===================================================================
--- trunk/tests/audio/audio.py 2012-03-16 16:38:07 UTC (rev 1227)
+++ trunk/tests/audio/audio.py 2012-03-16 16:40:34 UTC (rev 1228)
@@ -46,8 +46,6 @@
return rpms
def logSoundCardInfo(self):
-
-
if self.getUDI():
hal = Hal()
self.device = hal.getDevice(self.getUDI())
@@ -57,17 +55,17 @@
print "\nSound Card:"
print hal.dumpDevice(parentUDI)
print ""
+ return True
# otherwise
- print "Warning: could not log sound card information"
return False
-
-
def run(self):
FAILED = 1
PASSED = 0
- self.logSoundCardInfo()
+ if not self.logSoundCardInfo():
+ print "Error: could not log sound card information"
+ 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())
12 years, 1 month
r1227 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:38:07 +0000 (Fri, 16 Mar 2012)
New Revision: 1227
Modified:
trunk/v7/controller.py
Log:
748753 - Unicode decode error in /var/log/messages
Modified: trunk/v7/controller.py
===================================================================
--- trunk/v7/controller.py 2012-03-16 16:36:57 UTC (rev 1226)
+++ trunk/v7/controller.py 2012-03-16 16:38:07 UTC (rev 1227)
@@ -25,15 +25,17 @@
from v7.commandLineUI import CommandLineUI
+from v7.tags import Constants
class Controller:
- def __init__(self):
+ def __init__(self, debug=Constants.off):
self.ui = CommandLineUI()
self.systemLogMarker = "v7/runtests"
self.systemLogBootMarker = "kernel: Linux version"
-
+ self.debug = debug
+
def removeDirectory(self, dir):
"Remove a directory (and all its contents)"
try:
@@ -86,7 +88,8 @@
if l.find(endMark) >= 0:
break
except UnicodeDecodeError, error:
- print "Warning: Unicode decode error in %s" % syslog
+ if self.debug != Constants.off:
+ print "Warning: Unicode decode error in %s" % syslog
print error
# if we can't decode it, skip the whole line
continue
12 years, 1 month
r1226 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:36:57 +0000 (Fri, 16 Mar 2012)
New Revision: 1226
Modified:
trunk/v7/report.py
trunk/v7/reporthtml.py
Log:
747990 - interactive tests run in --mode auto should fail -- code clean up part
Modified: trunk/v7/report.py
===================================================================
--- trunk/v7/report.py 2012-03-16 16:33:10 UTC (rev 1225)
+++ trunk/v7/report.py 2012-03-16 16:36:57 UTC (rev 1226)
@@ -114,8 +114,6 @@
if run:
returnValue = run.getReturnValue()
summary = "- %s" % run.getSummary()
- if test.isInteractive() and run.getMode() == Constants.auto and run.getSummary() == Constants.PASS:
- summary = "- AUTO"
elif test.isDisabled():
returnValue = ""
summary = "- DISABLED"
Modified: trunk/v7/reporthtml.py
===================================================================
--- trunk/v7/reporthtml.py 2012-03-16 16:33:10 UTC (rev 1225)
+++ trunk/v7/reporthtml.py 2012-03-16 16:36:57 UTC (rev 1226)
@@ -156,8 +156,6 @@
run = test.getRun(runNumber)
if run and run.getSummary():
result = run.getSummary()
- if result == Constants.PASS and run.getMode() == Constants.auto and test.isInteractive():
- result = "auto"
print "<td class=\"%s\"><a href=\"v7xml.py?test=%s&udi=%s&device=%s&run=%u\">%s</a></td>" % (result.lower(), test.getName(), test.getUDI(), test.getLogicalDeviceName(), runNumber, result.lower())
else:
print "<td> </td>"
12 years, 1 month
r1225 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:33:10 +0000 (Fri, 16 Mar 2012)
New Revision: 1225
Modified:
trunk/v7/hardwaretest.py
Log:
799897 - v7 server starts/stops returns 1\n 752753\n 748753 - Unicode decode error in /var/log/messages
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-03-16 16:30:54 UTC (rev 1224)
+++ trunk/v7/hardwaretest.py 2012-03-16 16:33:10 UTC (rev 1225)
@@ -54,8 +54,8 @@
Debugging=True
def __init__(self):
- Controller.__init__(self)
self.getOptions()
+ Controller.__init__(self, self.options.debug)
self.environment = Environment()
self.testServer = self.options.server
self.Debugging = self.options.debug != Constants.off
@@ -511,14 +511,14 @@
testCount = 0
tests = planner.getServerModeTests();
- result = 0
+ result = True
for test in tests:
print "%s test server %s:" % (test.Name(), subcommand)
- rv = self.runServer(test, subcommand)
+ if not self.runServer(test, subcommand):
+ result = False
print ""
- if rv != 0:
- result = rv
+
# do the daemon
if not daemon.do(subcommand):
@@ -997,8 +997,12 @@
if self.options.mode != Constants.auto:
# offer to open a certification in the catalog if there's no id on the results
catalog = Catalog()
- if catalog.isReachable() and self.certification.getCertificationID() <= 0:
- catalog.openCertification(self.certification)
+ if catalog.isReachable():
+ if self.certification.getCertificationID() <= 0:
+ catalog.openCertification(self.certification)
+ # opening the cert may have worked, or we had the certification number already.
+ if self.certification.getCertificationID() > 0:
+ catalog.submitResults(self.certification)
report = Report(self.options, self.certification)
if report.WriteResultsRPM(self.environment.getLogDirectory()):
12 years, 1 month
r1224 - trunk/tests/network
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:30:54 +0000 (Fri, 16 Mar 2012)
New Revision: 1224
Modified:
trunk/tests/network/network.py
Log:
799897 - v7 server starts/stops returns 1
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2012-03-16 16:30:06 UTC (rev 1223)
+++ trunk/tests/network/network.py 2012-03-16 16:30:54 UTC (rev 1224)
@@ -463,19 +463,31 @@
def startServer(self):
- self.checkSELinux()
+ result = self.checkSELinux()
# start the bandwidth test server
sys.stdout.write("Starting lmbench services...")
sys.stdout.flush()
if not os.system("bw_tcp -s") is 0:
print " FAILED"
+ result = False
elif not os.system("lat_udp -s") is 0:
print " FAILED"
+ result = False
else:
print " done."
# httpd
- os.system("service httpd start")
+ try:
+ start = Command("service httpd start")
+ start.echo()
+ if "[FAILED]" in "".join(start.output):
+ result = False
+ except Exception, e:
+ print "Error: could not start httpd"
+ print e
+ result = False
+
+ return result
def checkSELinux(self):
try:
@@ -493,12 +505,28 @@
def stopServer(self):
sys.stdout.write("Stopping lmbench services...")
sys.stdout.flush()
- os.system("bw_tcp -S localhost")
- os.system("lat_udp -S localhost")
+ result = True
+ for service in ["bw_tcp", "lat_udp"]:
+ try:
+ Command("%s -S localhost" % service).echo()
+ except Exception, e:
+ print "Error: could not stop %s" % service
+ print e
+ result = False
print " done."
# httpd
- os.system("service httpd stop")
+ try:
+ stop = Command("service httpd stop")
+ stop.echo()
+ if "[FAILED]" in "".join(stop.output):
+ result = False
+ except Exception, e:
+ print "Error: could not stop httpd."
+ print e
+ result = False
+
+ return result
# YK: added statusServer
def statusServer(self):
12 years, 1 month
r1223 - trunk/tests/kdump
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:30:06 +0000 (Fri, 16 Mar 2012)
New Revision: 1223
Modified:
trunk/tests/kdump/kdump.py
Log:
799897 - v7 server starts/stops returns 1\n 752753 - v7 server status reporting /var/v7/export is exported in v7-1.4
Modified: trunk/tests/kdump/kdump.py
===================================================================
--- trunk/tests/kdump/kdump.py 2012-03-16 16:24:42 UTC (rev 1222)
+++ trunk/tests/kdump/kdump.py 2012-03-16 16:30:06 UTC (rev 1223)
@@ -74,7 +74,17 @@
return [TestTag.noninteractive, TestTag.certification]
def startServer(self):
- os.system("service nfs start")
+ result = True
+ try:
+ start = Command("service nfs start")
+ start.echo()
+ if "[FAILED]" in "".join(start.output):
+ result = False
+ except Exception, e:
+ print "Error: could not start NFS service"
+ print e
+ result = False
+
serverDirectory = self.environment.getServerDirectory()
exportDirectory = os.path.join(serverDirectory, self.environment.getServerExport())
for directory in (serverDirectory, exportDirectory):
@@ -85,12 +95,25 @@
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):
+ if not os.system("exportfs -o rw,no_root_squash,insecure *:%s" % exportDirectory) is 0:
print "Error: could not export %s" % exportDirectory
+ result = False
+ return result
+
def stopServer(self):
# nfs
- os.system("service nfs stop")
+ try:
+ stop = Command("service nfs stop")
+ stop.echo()
+ if "[FAILED]" in "".join(stop.output):
+ return False
+ except Exception, e:
+ print "Error: could not stop nfs"
+ print e
+ return False
+
+ return True
def statusServer(self):
result = True
@@ -99,7 +122,7 @@
# lock file not readable by non-root users.F
exportfs = Command("cat /var/lib/nfs/etab")
exportfs.getString(regex=".*%s/%s" % (self.environment.getServerDirectory(), self.environment.getServerExport()), singleLine=False)
- print "%s/export is exported" % self.environment.getDataDirectory()
+ print "%s/%s is exported" % (self.environment.getServerDirectory(), self.environment.getServerExport())
except V7CommandException, exception:
print "Error: %s/export is not available" % self.environment.getDataDirectory()
result = False
12 years, 1 month
r1222 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-16 16:24:42 +0000 (Fri, 16 Mar 2012)
New Revision: 1222
Modified:
trunk/tests/info/info.py
Log:
687990 - FV_CORE INFO test fails because sosreport expects user response\n 767059 - info: kmod rpm verify command is not running
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-03-09 12:35:37 UTC (rev 1221)
+++ trunk/tests/info/info.py 2012-03-16 16:24:42 UTC (rev 1222)
@@ -270,8 +270,14 @@
print "Error: Non-Red Hat kernel module %s" % module
success = False
# RH kmods are allowed
- elif self.checkModuleVenderAndBuildHost(module) and Command("rpm -Vf %s" % moduleFile):
- print "kmod package: %s" % Command("rpm -qf %s" % moduleFile).getString()
+ elif self.checkModuleVenderAndBuildHost(module):
+ try:
+ Command("rpm -Vf %s" % moduleFile).run()
+ print "kmod package: %s" % Command("rpm -qf %s" % moduleFile).getString()
+ except Exception, e:
+ print "Error: verification failed for kmod %s" % moduleFile
+ print e
+ success = False
# Check non-RH modules ABI; but still fail
else:
self.abiCheck(module)
@@ -453,10 +459,10 @@
# otherwise, uses sosreport
else:
# try --no-progressbar for some RHEL5's
- result = self.__processSystemReport("sosreport -n selinux --no-progressbar")
+ result = self.__processSystemReport("sosreport --batch -n selinux --batch --no-progressbar")
# if that fails, leave off --no-progressbar
if not result:
- result = self.__processSystemReport("sosreport -n selinux")
+ result = self.__processSystemReport("sosreport --batch -n selinux")
dmidecode = "/usr/sbin/dmidecode"
12 years, 1 month
r1221 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-09 12:35:37 +0000 (Fri, 09 Mar 2012)
New Revision: 1221
Added:
tags/v7-V1-5R8/
Log:
tag version
12 years, 2 months
r1220 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-03-09 12:33:04 +0000 (Fri, 09 Mar 2012)
New Revision: 1220
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-03-09 12:30:38 UTC (rev 1219)
+++ trunk/v7.spec.in 2012-03-09 12:33:04 UTC (rev 1220)
@@ -79,6 +79,13 @@
%changelog
+* Fri Mar 09 2012 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.5 R8
+
+ 782191 - FEAT: v7 should be able to open a new certification request
+ 799921 - v7 1.5 R7 may trace-back on older /etc/v7.xml environment file.
+
* Fri Feb 03 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R7
12 years, 2 months