Bug 1476053 - Handle invalid json in metadata updates, r=ato draft
authorJames Graham <james@hoppipolla.co.uk>
Mon, 23 Jul 2018 19:13:41 +0100
changeset 821568 44777ede90b9a9984c4c595a5397f7fa826c184f
parent 821567 d9e0348592e4e25698417515abca2e01eff445cd
push id117141
push userbmo:james@hoppipolla.co.uk
push dateMon, 23 Jul 2018 18:17:38 +0000
reviewersato
bugs1476053
milestone63.0a1
Bug 1476053 - Handle invalid json in metadata updates, r=ato Sometimes we get errors that result in invalid json in the logs. There's nothing reasonable to do about this during metadata updates so just skip it MozReview-Commit-ID: 4QuM7M3lXGv
testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
@@ -245,17 +245,21 @@ class ExpectedUpdater(object):
                 return
 
         log_file.seek(0)
         self.update_from_raw_log(log_file)
 
     def update_from_raw_log(self, log_file):
         action_map = self.action_map
         for line in log_file:
-            data = json.loads(line)
+            try:
+                data = json.loads(line)
+            except ValueError:
+                # Just skip lines that aren't json
+                continue
             action = data["action"]
             if action in action_map:
                 action_map[action](data)
 
     def update_from_wptreport_log(self, data):
         action_map = self.action_map
         action_map["suite_start"]({"run_info": data["run_info"]})
         for test in data["results"]: