From e78a2933964672fc4dcff6d595d09aa7b8d66e07 Mon Sep 17 00:00:00 2001 From: Marian Raiciof Date: Fri, 7 Jun 2019 08:33:25 +0000 Subject: [PATCH] Bug 1522604 - Enhance mozharness error list for Raptor tests. r=jgraham RaptorErrorList now includes HarnessErrorList and regular expressions for Error and Critical log levels. Differential Revision: https://phabricator.services.mozilla.com/D32983 --HG-- extra : moz-landing-system : lando --- .../mozharness/mozharness/mozilla/testing/raptor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/testing/raptor.py b/testing/mozharness/mozharness/mozilla/testing/raptor.py index 5537f538c866..eac1bfa130cf 100644 --- a/testing/mozharness/mozharness/mozilla/testing/raptor.py +++ b/testing/mozharness/mozharness/mozilla/testing/raptor.py @@ -18,8 +18,9 @@ import mozharness from mozharness.base.errors import PythonErrorList from mozharness.base.log import OutputParser, DEBUG, ERROR, CRITICAL, INFO -from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options from mozharness.mozilla.testing.android import AndroidMixin +from mozharness.mozilla.testing.errors import HarnessErrorList +from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options from mozharness.base.vcs.vcsbase import MercurialScript from mozharness.mozilla.testing.codecoverage import ( CodeCoverageMixin, @@ -30,12 +31,11 @@ scripts_path = os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file external_tools_path = os.path.join(scripts_path, 'external_tools') here = os.path.abspath(os.path.dirname(__file__)) -RaptorErrorList = PythonErrorList + [ +RaptorErrorList = PythonErrorList + HarnessErrorList + [ {'regex': re.compile(r'''run-as: Package '.*' is unknown'''), 'level': DEBUG}, - {'substr': r'''FAIL: Busted:''', 'level': CRITICAL}, - {'substr': r'''FAIL: failed to cleanup''', 'level': ERROR}, - {'substr': r'''erfConfigurator.py: Unknown error''', 'level': CRITICAL}, - {'substr': r'''raptorError''', 'level': CRITICAL}, + {'substr': r'''raptorDebug''', 'level': DEBUG}, + {'regex': re.compile(r'''^raptor[a-zA-Z-]*( - )?( )?(?i)error(:)?'''), 'level': ERROR}, + {'regex': re.compile(r'''^raptor[a-zA-Z-]*( - )?( )?(?i)critical(:)?'''), 'level': CRITICAL}, {'regex': re.compile(r'''No machine_name called '.*' can be found'''), 'level': CRITICAL}, {'substr': r"""No such file or directory: 'browser_output.txt'""", 'level': CRITICAL,