Bug 1367745 - Use same error lists in wpt as in mochitest, r?jgraham draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 26 Apr 2017 16:47:38 +0100
changeset 584592 68541d5935a18e4702b98e7463e57986bb093fc1
parent 584432 23a341e9b53d04f80ea6a66ced2d72cdc17afffb
child 584593 37fff41e85369b5e200d540bee188345f83f2d53
push id60822
push userahalberstadt@mozilla.com
push dateThu, 25 May 2017 20:15:02 +0000
reviewersjgraham
bugs1367745
milestone55.0a1
Bug 1367745 - Use same error lists in wpt as in mochitest, r?jgraham MozReview-Commit-ID: EEy0egLwZNy
testing/mozharness/scripts/web_platform_tests.py
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -8,24 +8,26 @@ import copy
 import glob
 import json
 import os
 import sys
 
 # load modules from parent dir
 sys.path.insert(1, os.path.dirname(sys.path[0]))
 
+from mozharness.base.errors import BaseErrorList
 from mozharness.base.script import PreScriptAction
 from mozharness.base.vcs.vcsbase import MercurialScript
 from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options, TOOLTOOL_PLATFORM_DIR
 from mozharness.mozilla.testing.codecoverage import (
     CodeCoverageMixin,
     code_coverage_config_options
 )
+from mozharness.mozilla.testing.errors import HarnessErrorList
 
 from mozharness.mozilla.structuredlog import StructuredOutputParser
 from mozharness.base.log import INFO
 
 class WebPlatformTest(TestingMixin, MercurialScript, BlobUploadMixin, CodeCoverageMixin):
     config_options = [
         [['--test-type'], {
             "action": "extend",
@@ -240,17 +242,18 @@ class WebPlatformTest(TestingMixin, Merc
         self.geckodriver_path = os.path.join(dirs['abs_work_dir'], "geckodriver")
 
     def run_tests(self):
         dirs = self.query_abs_dirs()
         cmd = self._query_cmd()
 
         parser = StructuredOutputParser(config=self.config,
                                         log_obj=self.log_obj,
-                                        log_compact=True)
+                                        log_compact=True,
+                                        error_list=BaseErrorList + HarnessErrorList)
 
         env = {'MINIDUMP_SAVE_PATH': dirs['abs_blob_upload_dir']}
         env['RUST_BACKTRACE'] = '1'
 
         if self.config['allow_software_gl_layers']:
             env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
         if self.config['enable_webrender']:
             env['MOZ_WEBRENDER'] = '1'