From b66cc92ee5a7ec0e923c7ab2055a38d07ac3515c Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Fri, 11 Apr 2014 16:26:05 +0100 Subject: [PATCH] For timeouts include the command being run in the failure string --- slave/buildslave/runprocess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slave/buildslave/runprocess.py b/slave/buildslave/runprocess.py index 88f99f632dc..29f6f35df04 100644 --- a/slave/buildslave/runprocess.py +++ b/slave/buildslave/runprocess.py @@ -768,12 +768,12 @@ def failed(self, why): def doTimeout(self): self.ioTimeoutTimer = None - msg = "command timed out: %d seconds without output" % self.timeout + msg = "command timed out: %d seconds without output running %s" % (self.timeout, self.fake_command) self.kill(msg) def doMaxTimeout(self): self.maxTimeoutTimer = None - msg = "command timed out: %d seconds elapsed" % self.maxTime + msg = "command timed out: %d seconds elapsed running %s" % (self.maxTime, self.fake_command) self.kill(msg) def isDead(self):