From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- toolkit/components/backgroundtasks/tests/BackgroundTask_crash.sys.mjs | 2 +- .../backgroundtasks/tests/BackgroundTask_jsdebugger.sys.mjs | 2 +- .../backgroundtasks/tests/BackgroundTask_shouldprocessupdates.sys.mjs | 2 +- .../components/backgroundtasks/tests/BackgroundTask_targeting.sys.mjs | 2 +- .../backgroundtasks/tests/xpcshell/test_backgroundtask_experiments.js | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'toolkit/components/backgroundtasks/tests') diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.sys.mjs b/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.sys.mjs index 10764bc1f7..7afc94ed47 100644 --- a/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.sys.mjs +++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_crash.sys.mjs @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ export async function runBackgroundTask(commandLine) { - // This task depends on `CrashTestUtils.jsm` and requires the + // This task depends on `CrashTestUtils.sys.mjs` and requires the // sibling `testcrasher` library to be in the current working // directory. Fail right away if we can't find the module or the // native library. diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_jsdebugger.sys.mjs b/toolkit/components/backgroundtasks/tests/BackgroundTask_jsdebugger.sys.mjs index 45cf00a449..9479a404ff 100644 --- a/toolkit/components/backgroundtasks/tests/BackgroundTask_jsdebugger.sys.mjs +++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_jsdebugger.sys.mjs @@ -11,7 +11,7 @@ * code to exit code 0. */ -export function runBackgroundTask(commandLine) { +export function runBackgroundTask() { // In the future, will be modifed by the JS debugger (to 0, success). var exposedExitCode = 0; diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_shouldprocessupdates.sys.mjs b/toolkit/components/backgroundtasks/tests/BackgroundTask_shouldprocessupdates.sys.mjs index 4030f42e5d..0b47970dee 100644 --- a/toolkit/components/backgroundtasks/tests/BackgroundTask_shouldprocessupdates.sys.mjs +++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_shouldprocessupdates.sys.mjs @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -export async function runBackgroundTask(commandLine) { +export async function runBackgroundTask() { const get = Services.env.get("MOZ_TEST_PROCESS_UPDATES"); let exitCode = 81; if (get == "ShouldNotProcessUpdates(): OtherInstanceRunning") { diff --git a/toolkit/components/backgroundtasks/tests/BackgroundTask_targeting.sys.mjs b/toolkit/components/backgroundtasks/tests/BackgroundTask_targeting.sys.mjs index fd47d18470..b7a9d08896 100644 --- a/toolkit/components/backgroundtasks/tests/BackgroundTask_targeting.sys.mjs +++ b/toolkit/components/backgroundtasks/tests/BackgroundTask_targeting.sys.mjs @@ -20,7 +20,7 @@ const EXCLUDED_NAMES = [ * Return 0 (success) if all targeting getters succeed, 11 (failure) * otherwise. */ -export async function runBackgroundTask(commandLine) { +export async function runBackgroundTask() { let exitCode = EXIT_CODE.SUCCESS; // Can't use `ASRouterTargeting.getEnvironmentSnapshot`, since that diff --git a/toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_experiments.js b/toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_experiments.js index 9d834bfd5b..cb4f3bb957 100644 --- a/toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_experiments.js +++ b/toolkit/components/backgroundtasks/tests/xpcshell/test_backgroundtask_experiments.js @@ -136,8 +136,8 @@ async function doMessage({ extraArgs = [], extraEnv = {} } = {}) { // i.e., persisted. Verify that messages are shown until we hit the lifetime // frequency caps. // -// It's awkward to inspect the `ASRouter.jsm` internal state directly in this -// manner, but this is the pattern for testing such things at the time of +// It's awkward to inspect the `ASRouter.sys.mjs` internal state directly in +// this manner, but this is the pattern for testing such things at the time of // writing. add_task(async function test_backgroundtask_caps() { let experimentFile = do_get_file("experiment.json"); -- cgit v1.2.3