[pypy-commit] buildbot default: allow to pass a custom timeout to own test builder

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r659:24c5ee3ae32f
Date: 2012-07-31 17:24 +0200
http://bitbucket.org/pypy/buildbot/changeset/24c5ee3ae32f/

Log:	allow to pass a custom timeout to own test builder

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -245,21 +245,22 @@
 
 class Own(factory.BuildFactory):
 
-    def __init__(self, platform='linux', cherrypick='', extra_cfgs=[]):
+    def __init__(self, platform='linux', cherrypick='', extra_cfgs=[], **kwargs):
         factory.BuildFactory.__init__(self)
 
         setup_steps(platform, self)
 
+        timeout=kwargs.get('timeout', 4000)
         self.addStep(PytestCmd(
             description="pytest",
             command=["python", "testrunner/runner.py",
                      "--logfile=testrun.log",
                      "--config=pypy/testrunner_cfg.py",
                      "--config=~/machine_cfg.py",
-                     "--root=pypy", "--timeout=10800"
+                     "--root=pypy", "--timeout=%s" % (timeout,)
                      ] + ["--config=%s" % cfg for cfg in extra_cfgs],
             logfiles={'pytestLog': 'testrun.log'},
-            timeout=4000,
+            timeout=timeout,
             env={"PYTHONPATH": ['.'],
                  "PYPYCHERRYPICK": cherrypick}))