tryserver.chromium.linux: disable time-without-output timeout when build timeout is used

masters/master.tryserver.chromium.linux/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
 import os
@@ skipping 39 matching lines @@
 pools = BuildersPools('chrome')
 
 chromium_builders = []
 chromeos_boards = ('x86-generic', 'amd64-generic', 'daisy')
 
 def baseFactory(recipe, factory_properties=None, **kwargs):
   fp = factory_properties or {}
   fp.update({
     '$recipe_engine': {'mode_flags': {'use_subprocess42': True}}
   })
+
+  # Disable "max time without output" timeout if total build timeout
+  # is in effect.
+  if 'max_time' in kwargs and 'timeout' not in kwargs:

[Sergiy Byelozyorov, 2016/07/08 08:20:43]

The comment and statement is confusing. Comment says that we disable 'max time
without output timeout', which seems to correspond to max_time variable, yet we
change timeout property. Perhaps mention which timeout corresponds to which
variable in kwargs. I think it also makes sense to mention that by default
timeout is 2400, otherwise it's not clear why we set timeout to 'None' if it's
not set.

+    kwargs['timeout'] = None
+
   return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
 
 for targ in ('_rel', '_dbg'):
   chromium_builders.extend([{
     'name': 'linux_chromium_compile%s_ng' % targ,
     'factory': baseFactory('chromium_trybot', timeout=3600),
     # Share build directory with compatible existing builders to save space.
     'slavebuilddir': 'linux'
   }, {
     'name': 'linux_chromium%s_ng' % targ,
@@ skipping 455 matching lines @@
 #  base.make_stop_form = hack_stop(base.make_stop_form)
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://dev.chromium.org/developers/testing/try-server-usage'
 
 # vi: set ts=4 sts=2 sw=2 et: