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

[Brian Warner]

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

Modified Files:
	step_twisted.py 
Log Message:
[project @ step_twisted.Trial: use logfiles= to get test.log instead of 'cat']

Original author: warner at lothar.com
Date: 2006-06-20 05:11:41

Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- step_twisted.py	15 Jun 2006 05:47:48 -0000	1.80
+++ step_twisted.py	20 Jun 2006 08:09:10 -0000	1.81
@@ -231,6 +231,11 @@
 
     name = "trial"
     progressMetrics = ('output', 'tests')
+    # 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
 
     flunkOnFailure = True
     python = None
@@ -440,25 +445,6 @@
         ShellCommand.start(self)
 
 
-    def _commandComplete(self, cmd):
-        # before doing the summary, etc, fetch _trial_temp/test.log
-        # TODO: refactor ShellCommand so I don't have to override such
-        # an internal method
-        catcmd = ["cat", "_trial_temp/test.log"]
-        c2 = step.RemoteShellCommand(command=catcmd,
-                                     workdir=self.workdir,
-                                     )
-        self.cmd = c2
-        loog = self.addLog("test.log")
-        c2.useLog(loog, True)
-        d = c2.run(self, self.remote)
-        d.addCallback(self._commandComplete2, cmd)
-        return d
-
-    def _commandComplete2(self, c2, cmd):
-        # pass the original RemoteShellCommand to the summarizer
-        return ShellCommand._commandComplete(self, cmd)
-
     def rtext(self, fmt='%s'):
         if self.reactor:
             rtext = fmt % self.reactor