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

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

BUG=622373
Committed: https://chromium.googlesource.com/chromium/tools/build/+/c3e4c75d8ee898904edeceb683625d5ac2d13d8e

[Paweł Hajdan Jr., 2016-07-07 13:37:37]

phajdan.jr@chromium.org changed reviewers:
+ emso@chromium.org, sergiyb@chromium.org, tandrii@chromium.org

[Paweł Hajdan Jr., 2016-07-07 13:37:41]

The CQ bit was checked by phajdan.jr@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2016-07-07 13:37:49]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-07 13:41:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-07 13:41:20]

Dry run: This issue passed the CQ dry run.

[tandrii(chromium), 2016-07-07 13:44:28]

lgtm

[Paweł Hajdan Jr., 2016-07-07 13:51:02]

The CQ bit was checked by phajdan.jr@chromium.org

[commit-bot: I haz the power, 2016-07-07 13:51:09]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-07 13:54:06]

Description was changed from

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

BUG=622373
==========

to

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

BUG=622373

Committed:
https://chromium.googlesource.com/chromium/tools/build/+/c3e4c75d8ee898904ede...
==========

[commit-bot: I haz the power, 2016-07-07 13:54:07]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/tools/build/+/c3e4c75d8ee898904ede...

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

Can we please improve the comment in a follow-up CL? It's somewhat confusing to
me.

https://codereview.chromium.org/2128843002/diff/1/masters/master.tryserver.ch...
File masters/master.tryserver.chromium.linux/master.cfg (right):

https://codereview.chromium.org/2128843002/diff/1/masters/master.tryserver.ch...
masters/master.tryserver.chromium.linux/master.cfg:63: if 'max_time' in kwargs
and 'timeout' not in kwargs:
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.