[Buildbot-commits] buildbot/buildbot/process step.py,1.57,1.58

[Brian Warner]

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

Modified Files:
	step.py 
Log Message:
* buildbot/test/test_run.py (Disconnect.testBuild4): validate that
losing the slave in the middle of a remote step is handled too

* buildbot/process/step.py (ShellCommand.interrupt): 'reason' can
be a Failure, so be sure to stringify it before using it as the
contents of the 'interrupt' logfile
(RemoteCommand.interrupt): use stringified 'why' in
remote_interruptCommand too, just in case


Index: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- step.py	3 Dec 2004 22:54:51 -0000	1.57
+++ step.py	8 Dec 2004 03:54:56 -0000	1.58
@@ -90,8 +90,8 @@
 
         # tell the remote command to halt. Returns a Deferred that will fire
         # when the interrupt command has been delivered.
-        d = defer.maybeDeferred(self.remote.callRemote,
-                                "interruptCommand", self.commandID, why)
+        d = defer.maybeDeferred(self.remote.callRemote, "interruptCommand",
+                                self.commandID, str(why))
         return d
 
     def remote_update(self, updates):
@@ -577,8 +577,9 @@
 
     def interrupt(self, reason):
         # TODO: consider adding an INTERRUPTED or STOPPED status to use
-        # instead of FAILURE, might make the text a bit more clear
-        self.addCompleteLog('interrupt', reason)
+        # instead of FAILURE, might make the text a bit more clear.
+        # 'reason' can be a Failure, or text
+        self.addCompleteLog('interrupt', str(reason))
         d = self.cmd.interrupt(reason)
         return d
 
@@ -1184,6 +1185,7 @@
     @param results: None
     """
 
+    haltOnFailure = True
     name = "remote dummy"
 
     def __init__(self, timeout=5, **kwargs):