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()):
Show replies by date