diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-08 15:12:12 +0000 |
commit | a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431 (patch) | |
tree | 54617b4f5f04ee87a2c9e3b97cc88b8626859124 /testing/mozharness | |
parent | Releasing progress-linux version 115.7.0esr-1~deb12u1progress7u1. (diff) | |
download | firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.tar.xz firefox-esr-a7c14e2f29831f4bc5eb18e23e55eb6f7a4e3431.zip |
Merging upstream version 115.8.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/mozharness')
-rwxr-xr-x | testing/mozharness/scripts/desktop_unittest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index 336f2c752b..b2bf44c2b2 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -12,7 +12,6 @@ author: Jordan Lund import copy import glob -import imp import json import multiprocessing import os @@ -25,6 +24,7 @@ from datetime import datetime, timedelta here = os.path.abspath(os.path.dirname(__file__)) sys.path.insert(1, os.path.dirname(here)) +from mozfile import load_source from mozharness.base.errors import BaseErrorList from mozharness.base.log import INFO, WARNING from mozharness.base.script import PreScriptAction @@ -1167,7 +1167,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM ) if suite_category == "reftest": - ref_formatter = imp.load_source( + ref_formatter = load_source( "ReftestFormatter", os.path.abspath( os.path.join(dirs["abs_reftest_dir"], "output.py") |