[Buildbot-commits] buildbot/buildbot/process step_twisted.py,1.60,1.61

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19896/buildbot/process

Modified Files:
	step_twisted.py 
Log Message:
(Trial.createSummary): bugfixes


Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- step_twisted.py	15 Oct 2004 18:44:19 -0000	1.60
+++ step_twisted.py	19 Oct 2004 18:41:40 -0000	1.61
@@ -2,7 +2,7 @@
 
 from twisted.python import log, failure
 
-from buildbot.status import tests
+from buildbot.status import tests, builder
 from buildbot.status.builder import SUCCESS, FAILURE, WARNINGS, SKIPPED
 from buildbot.process import step
 from buildbot.process.step import BuildStep, ShellCommand
@@ -464,15 +464,15 @@
         self.text = text
         self.text2 = [text2]
 
-    def addTestResult(self, testname, results, text, logs):
+    def addTestResult(self, testname, results, text, tlog):
         if self.reactor is not None:
             testname = (self.reactor,) + testname
-        tr = TestResult(testname, results, text, logs={'log': log})
+        tr = builder.TestResult(testname, results, text, logs={'log': tlog})
         #self.step_status.build.addTestResult(tr)
         self.build.build_status.addTestResult(tr)
 
-    def createSummary(self, log):
-        output = log.getText()
+    def createSummary(self, loog):
+        output = loog.getText()
         problems = ""
         sio = StringIO.StringIO(output)
         warnings = {}
@@ -502,6 +502,7 @@
             self.addCompleteLog("problems", problems)
             # now parse the problems for per-test results
             pio = StringIO.StringIO(problems)
+            pio.readline() # eat the first separator line
             testname = None
             done = False
             while not done:
@@ -533,14 +534,14 @@
                                    'SUCCESS': SUCCESS, # not reported
                                    }.get(result, WARNINGS)
                         text = result.lower().split()
-                        log = line
+                        loog = line
                         # the next line is all dashes
-                        log += pio.readline()
+                        loog += pio.readline()
                     else:
                         # the rest goes into the log
-                        log += line
+                        loog += line
                 if testname:
-                    self.addTestResult(testname, results, text, log)
+                    self.addTestResult(testname, results, text, loog)
                     testname = None
 
         if warnings: