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 --- testing/xpcshell/example/unit/test_import_module.js | 2 +- testing/xpcshell/head.js | 5 +---- testing/xpcshell/selftest.py | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'testing/xpcshell') diff --git a/testing/xpcshell/example/unit/test_import_module.js b/testing/xpcshell/example/unit/test_import_module.js index 089ec34f8d..7da23600ed 100644 --- a/testing/xpcshell/example/unit/test_import_module.js +++ b/testing/xpcshell/example/unit/test_import_module.js @@ -6,7 +6,7 @@ /** * Ensures that tests can import a module in the same folder through: - * ChromeUtils.importESModule("resource://test/module.jsm"); + * ChromeUtils.importESModule("resource://test/module.sys.mjs"); */ function run_test() { diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js index d3b19719ab..b12bcbceb7 100644 --- a/testing/xpcshell/head.js +++ b/testing/xpcshell/head.js @@ -1567,7 +1567,7 @@ function add_test( } /** - * Add a test function which is a Task function. + * Add a test function which is an asynchronous function. * * @param funcOrProperties * An async function to be run or an object represents test properties. @@ -1578,9 +1578,6 @@ function add_test( * @param func * An async function to be run only if the funcOrProperies is not a function. * - * Task functions are functions fed into Task.jsm's Task.spawn(). They are async - * functions that emit promises. - * * If an exception is thrown, a do_check_* comparison fails, or if a rejected * promise is yielded, the test function aborts immediately and the test is * reported as a failure. diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py index 1919042049..53666866ba 100755 --- a/testing/xpcshell/selftest.py +++ b/testing/xpcshell/selftest.py @@ -1139,7 +1139,6 @@ add_test({ self.assertInLog("this_test_will_fail") self.assertInLog("run_next_test") self.assertInLog("run_test") - self.assertNotInLog("Task.jsm") def testAddTaskSkip(self): self.writeFile("test_tasks_skip.js", ADD_TASK_SKIP) -- cgit v1.2.3