tree d1fc18fbe9e01c18b08cf3834353a386b1a1fec3
parent b0d0484fb95eceaef0feaec76c6aee071fcc2229
author Jonathan Lee <jonathanjlee@google.com> 1664501514 +0000
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> 1664501514 +0000

[wptrunner] Prevent WPT report merging

Following up on crrev.com/c/3908238, this change stops the merge script
from attempting to merge wptreport files, which may contain newline-
delimited JSON objects. The merge script now ignores these files, which
are already uploaded to and consumed from ResultDB.

Also, drive-by fix to not access `ValueError.message` when failing to
parse JSON. This attribute does not generally exist:
  https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8802474725491298833/+/u/wpt_tests_suite__with_patch__experimental__on_Ubuntu-18.04/stdout?format=raw

In a follow-up change, the WPT results processor will overwrite the
unprocessed wptreport to speed up archival somewhat.

Bug: 1306222
Change-Id: I5f60e3e422b5bce0300fe145ae2961c70b695c1f
Cq-Include-Trybots: luci.chromium.try:linux-wpt-content-shell-fyi-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3914115
Commit-Queue: Jonathan Lee <jonathanjlee@google.com>
Reviewed-by: Weizhong Xia <weizhong@google.com>
Cr-Commit-Position: refs/heads/main@{#1053319}