[Buildbot-commits] buildbot/buildbot/process step_twisted.py, 1.81, 1.82

[Brian Warner]

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

Modified Files:
	step_twisted.py 
Log Message:
[project @ Trial: track Progress from _trial_temp/test.log too]

Original author: warner at lothar.com
Date: 2006-06-20 06:22:23

Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- step_twisted.py	20 Jun 2006 08:09:10 -0000	1.81
+++ step_twisted.py	20 Jun 2006 08:09:21 -0000	1.82
@@ -230,12 +230,12 @@
     """
 
     name = "trial"
-    progressMetrics = ('output', 'tests')
+    progressMetrics = ('output', 'tests', 'test.log')
     # note: the slash only works on unix buildslaves, of course, but we have
     # no way to know what the buildslave uses as a separator. TODO: figure
     # out something clever.
     logfiles = {"test.log": "_trial_temp/test.log"}
-    # TODO: the text in test.log should feed progressMetrics too
+    # we use test.log to track Progress at the end of __init__()
 
     flunkOnFailure = True
     python = None
@@ -405,8 +405,10 @@
             self.descriptionDone = ["tests"]
 
         # this counter will feed Progress along the 'test cases' metric
-        counter = TrialTestCaseCounter()
-        self.addLogObserver('stdio', counter)
+        self.addLogObserver('stdio', TrialTestCaseCounter())
+        # this one just measures bytes of output in _trial_temp/test.log
+        self.addLogObserver('test.log',
+                            step.OutputProgressObserver('test.log'))
 
     def setupEnvironment(self, cmd):
         ShellCommand.setupEnvironment(self, cmd)