webkitpy: Small changes to merging script

webkitpy: Small changes to merging script

Small changes to allow the merging script to work in the buildbot 
environment.

BUG=524758
Review-Url: https://codereview.chromium.org/2759913002
Cr-Commit-Position: refs/heads/master@{#458395}
Committed: https://chromium.googlesource.com/chromium/src/+/d2908c0a13e525bffd180f9aa541078de4b9df8e

[mithro, 2017-03-21 05:28:02]

Description was changed from

==========
Enable exparchive for Linux Trusty..

BUG=
==========

to

==========
webkitpy: Small changes to merging script

Small changes to allow the merging script to work in the buildbot 
environment.

BUG=524758
==========

[mithro, 2017-03-21 05:28:02]

tansell@chromium.org changed reviewers:
+ mcgreevy@chromium.org

[dsansome, 2017-03-21 09:18:34]

dsansome@chromium.org changed reviewers:
+ dsansome@chromium.org

[dsansome, 2017-03-21 09:18:35]

lgtm

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:104:
logging.info(argv)
Remove this line before submitting

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:115: raise
SystemError(
I would use parser.error(...) instead so it prints a usage message.

[engedy, 2017-03-21 09:39:37]

Sheriff star rubberstamp LGTM!

[mithro, 2017-03-21 09:43:01]

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
File third_party/WebKit/Tools/Scripts/merge-layout-test-results (right):

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:104:
logging.info(argv)
On 2017/03/21 09:18:34, dsansome wrote:
> Remove this line before submitting

Done.

https://codereview.chromium.org/2759913002/diff/200001/third_party/WebKit/Too...
third_party/WebKit/Tools/Scripts/merge-layout-test-results:115: raise
SystemError(
On 2017/03/21 09:18:35, dsansome wrote:
> I would use parser.error(...) instead so it prints a usage message.

Done.

[mithro, 2017-03-21 12:26:27]

The CQ bit was checked by tansell@chromium.org

[mithro, 2017-03-21 12:26:28]

The patchset sent to the CQ was uploaded after l-g-t-m from
dsansome@chromium.org, engedy@chromium.org
Link to the patchset: https://codereview.chromium.org/2759913002/#ps340001
(title: "Reverting change to chromium.linux.json for landing.")

[commit-bot: I haz the power, 2017-03-21 12:26:41]

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, 2017-03-21 13:11:29]

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

[commit-bot: I haz the power, 2017-03-21 13:11:30]

Try jobs failed on following builders:
  linux_chromium_chromeos_ozone_rel_ng on master.tryserver.chromium.linux
(JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[mithro, 2017-03-21 13:18:31]

The CQ bit was checked by tansell@chromium.org

[commit-bot: I haz the power, 2017-03-21 13:18:47]

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, 2017-03-21 14:01:23]

CQ is committing da patch.

Bot data: {"patchset_id": 340001, "attempt_start_ts": 1490102311607810,
"parent_rev": "b827afb8443405affee559ef0d511a359cc1476b", "commit_rev":
"d2908c0a13e525bffd180f9aa541078de4b9df8e"}

[commit-bot: I haz the power, 2017-03-21 14:02:07]

Description was changed from

==========
webkitpy: Small changes to merging script

Small changes to allow the merging script to work in the buildbot 
environment.

BUG=524758
==========

to

==========
webkitpy: Small changes to merging script

Small changes to allow the merging script to work in the buildbot 
environment.

BUG=524758

Review-Url: https://codereview.chromium.org/2759913002
Cr-Commit-Position: refs/heads/master@{#458395}
Committed:
https://chromium.googlesource.com/chromium/src/+/d2908c0a13e525bffd180f9aa541...
==========

[commit-bot: I haz the power, 2017-03-21 14:02:09]

Committed patchset #18 (id:340001) as
https://chromium.googlesource.com/chromium/src/+/d2908c0a13e525bffd180f9aa541...

[Dirk Pranke, 2017-04-02 22:56:51]

dpranke@chromium.org changed reviewers:
+ dpranke@chromium.org

[Dirk Pranke, 2017-04-02 22:56:52]

https://codereview.chromium.org/2759913002/diff/340001/testing/buildbot/chrom...
File testing/buildbot/chromium.fyi.json (right):

https://codereview.chromium.org/2759913002/diff/340001/testing/buildbot/chrom...
testing/buildbot/chromium.fyi.json:12924: ],
Why did you make these all arguments, rather than just hardcoding the logic in
the merge script? The merge script only has one purpose, so it seems like
there's no need for the configurability?