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

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

Index: masters/master.tryserver.chromium.linux/master.cfg
diff --git a/masters/master.tryserver.chromium.linux/master.cfg b/masters/master.tryserver.chromium.linux/master.cfg
index 795a3e673a6481ce222383164f455dfba857a4c4..c76f9dafdc71c902441fcc14bd500fbf1fe53db8 100644
--- a/masters/master.tryserver.chromium.linux/master.cfg
+++ b/masters/master.tryserver.chromium.linux/master.cfg
@@ -57,6 +57,12 @@ def baseFactory(recipe, factory_properties=None, **kwargs):
   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'):