Make master-side source steps respect timeout option.

Fixes #2248, #2203.
buildbot · May 28, 2012 · 5a18dc6 · 5a18dc6
1 parent 25fff52
commit 5a18dc6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/master/buildbot/steps/source/base.py b/master/buildbot/steps/source/base.py
@@ -149,7 +149,6 @@ def __init__(self, workdir=None, mode='update', alwaysUseLatest=False,
             assert isinstance(repeats, int)
             assert repeats > 0
         self.args = {'mode': mode,
-                     'timeout': timeout,
                      'retry': retry,
                      'patch': None, # set during .start
                      }
@@ -166,6 +165,7 @@ def __init__(self, workdir=None, mode='update', alwaysUseLatest=False,
 
         self.logEnviron = logEnviron
         self.env = env
+        self.timeout = timeout
 
         descriptions_for_mode = {
             "clobber": "checkout",
@@ -285,6 +285,7 @@ def start(self):
 
         self.args['logEnviron'] = self.logEnviron
         self.args['env'] = self.env
+        self.args['timeout'] = self.timeout
         self.startVC(branch, revision, patch)
 
     def commandComplete(self, cmd):

diff --git a/master/buildbot/steps/source/bzr.py b/master/buildbot/steps/source/bzr.py
@@ -196,6 +196,7 @@ def _dovccmd(self, command, abandonOnFailure=True, collectStdout=False):
         cmd = buildstep.RemoteShellCommand(self.workdir, ['bzr'] + command,
                                            env=self.env,
                                            logEnviron=self.logEnviron,
+                                           timeout=self.timeout,
                                            collectStdout=collectStdout)
         cmd.useLog(self.stdio_log, False)
         d = self.runCommand(cmd)

diff --git a/master/buildbot/steps/source/cvs.py b/master/buildbot/steps/source/cvs.py
@@ -211,6 +211,7 @@ def _dovccmd(self, command, workdir=None):
         cmd = buildstep.RemoteShellCommand(workdir, ['cvs'] +
                                            command,
                                            env=self.env,
+                                           timeout=self.timeout,
                                            logEnviron=self.logEnviron)
         cmd.useLog(self.stdio_log, False)
         d = self.runCommand(cmd)

diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -294,6 +294,7 @@ def _dovccmd(self, command, abandonOnFailure=True, collectStdout=False, initialS
         cmd = buildstep.RemoteShellCommand(self.workdir, ['git'] + command,
                                            env=self.env,
                                            logEnviron=self.logEnviron,
+                                           timeout=self.timeout,
                                            collectStdout=collectStdout,
                                            initialStdin=initialStdin)
         cmd.useLog(self.stdio_log, False)

diff --git a/master/buildbot/steps/source/mercurial.py b/master/buildbot/steps/source/mercurial.py
@@ -224,6 +224,7 @@ def _dovccmd(self, command, collectStdout=False):
         cmd = buildstep.RemoteShellCommand(self.workdir, ['hg', '--verbose'] + command,
                                            env=self.env,
                                            logEnviron=self.logEnviron,
+                                           timeout=self.timeout,
                                            collectStdout=collectStdout)
         cmd.useLog(self.stdio_log, False)
         log.msg("Starting mercurial command : hg %s" % (" ".join(command), ))

diff --git a/master/buildbot/steps/source/svn.py b/master/buildbot/steps/source/svn.py
@@ -228,6 +228,7 @@ def _dovccmd(self, command, collectStdout=False):
         cmd = buildstep.RemoteShellCommand(self.workdir, ['svn'] + command,
                                            env=self.env,
                                            logEnviron=self.logEnviron,
+                                           timeout=self.timeout,
                                            collectStdout=collectStdout)
         cmd.useLog(self.stdio_log, False)
         log.msg("Starting SVN command : svn %s" % (" ".join(command), ))