From f6bc17e625e214f23981fa0611670f53623f8220 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Fri, 26 Feb 2021 15:01:51 +0000 Subject: [PATCH] Bug 1694525 - End browsertime test process when error encountered; r=perftest-reviewers,sparky Currently, raising an exception in a mozprocess callback is not guaranteed to end the managed process; after bug 1694275, the exception will be reported but otherwise suppressed. Instead of raising an exception, report the error and end the test process. Differential Revision: https://phabricator.services.mozilla.com/D106538 --- testing/raptor/raptor/browsertime/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/raptor/raptor/browsertime/base.py b/testing/raptor/raptor/browsertime/base.py index f9aba8edfed4..507745f9c2bd 100644 --- a/testing/raptor/raptor/browsertime/base.py +++ b/testing/raptor/raptor/browsertime/base.py @@ -415,8 +415,8 @@ class Browsertime(Perftest): level = level.lower() if "error" in level: self.browsertime_failure = msg - # Raising this kills mozprocess - raise Exception("Browsertime failed to run") + LOG.error("Browsertime failed to run") + proc.kill() elif "warning" in level: LOG.warning(msg) else: