commit 46089e005fc3e450457eb4d1401a6f0d661d9160 parent 1908f81f8fdc01e58e313bbfa51d2d9d026e2bd9 Author: Sandor Molnar <smolnar@mozilla.com> Date: Wed, 5 Nov 2025 22:40:42 +0200 Revert "Bug 1969102 - Add Mochia to xpcshell tests r=Standard8,Gijs,frontend-codestyle-reviewers" for causing xpc failures This reverts commit 7c4b3317be721ed9cc21942ca1723c6c37535781. Revert "Bug 1969102 - Skip some telemetry tests when socketprocess is in use r=chutten,kershaw,toolkit-telemetry-reviewers" This reverts commit 6b92f541f0911637bf74b33fa69c0bf748593bc5. Revert "Bug 1969102 - Skip some networking tests when socketprocess is in use r=kershaw,cookie-reviewers,edgul" This reverts commit 2f6136c3480374423f8b2c3bcf474335bd3d3ba5. Revert "Bug 1969102 - Skip some libpref tests when socketprocess is in use r=gstoll,kershaw" This reverts commit 2fb51791a4c711292a4a356a58da11dbb8ed87e3. Diffstat:
7 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/extensions/pref/autoconfig/test/unit/xpcshell.toml b/extensions/pref/autoconfig/test/unit/xpcshell.toml @@ -14,7 +14,6 @@ run-if = ["!msix"] # Does not work in MSIX builds. ["test_autoconfig.js"] skip-if = [ "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 - "socketprocess_networking" # Fails due to Mochia (bug 1982446) ] ["test_autoconfig_custom_path.js"] @@ -27,12 +26,10 @@ run-if = ["os == 'linux'"] run-sequentially = ["true"] # fails more than 50% of the time in parallel skip-if = [ "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 - "socketprocess_networking" # Fails due to Mochia (bug 1982446) ] ["test_autoconfig_nonascii.js"] run-sequentially = ["true"] # fails 70% of the time in parallel skip-if = [ "os == 'android' && os_version == '14' && processor == 'x86_64' && debug && !fission", # Bug 1982954 - "socketprocess_networking" # Fails due to Mochia (bug 1982446) ] diff --git a/modules/libpref/test/unit/xpcshell.toml b/modules/libpref/test/unit/xpcshell.toml @@ -24,10 +24,8 @@ support-files = [ ["test_dirtyPrefs.js"] ["test_libPrefs.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) ["test_locked_file_prefs.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) support-files = [ "data/testPrefLocked.js", "data/testPrefLockedUser.js", ] @@ -39,11 +37,9 @@ support-files = ["data/testPrefUTF8.js"] head = "" ["test_parser.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) support-files = ["data/testParser.js"] ["test_stickyprefs.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) support-files = [ "data/testPrefSticky.js", "data/testPrefStickyUser.js", ] diff --git a/netwerk/cookie/test/unit/xpcshell.toml b/netwerk/cookie/test/unit/xpcshell.toml @@ -19,7 +19,6 @@ prefs = ["dom.security.https_first=false"] ["test_maybeCapExpiry.js"] ["test_migrateCookieLifetimePref.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) ["test_parser_0001.js"] diff --git a/netwerk/test/unit/xpcshell.toml b/netwerk/test/unit/xpcshell.toml @@ -1134,7 +1134,10 @@ usesNPM = true skip-if = ["true"] # Causes sporatic oranges ["test_port_remapping.js"] -skip-if = ["socketprocess_networking"] # Fails due to Mochia (bug 1982446) +skip-if = [ + "os == 'win' && os_version == '11.26100' && processor == 'x86_64' && socketprocess_networking", + "os == 'win' && os_version == '11.26100' && processor == 'x86' && socketprocess_networking", +] ["test_post.js"] diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js @@ -2033,9 +2033,3 @@ Object.defineProperty(this, "mozinfo", { return _mozinfo; }, }); - -/* import-globals-from ../modules/Mochia.js */ -Services.scriptloader.loadSubScript( - "resource://testing-common/Mochia.js", - this -); diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.toml b/toolkit/components/telemetry/tests/unit/xpcshell.toml @@ -129,10 +129,7 @@ skip-if = ["os == 'android'"] # Legacy telemetry is always disabled on Android ["test_TelemetryUtils.js"] ["test_ThirdPartyModulesPing.js"] -# Disabled for MSIX due to https://bugzilla.mozilla.org/show_bug.cgi?id=1807929 -# Disabled for artifact for bug 1982870. -# Fails with socketprocess_networking due to Mochia (bug 1982446) -run-if = ["(os == 'win' && !msix && !artifact && !socketprocess_networking)"] +run-if = ["(os == 'win' && !msix && !artifact)"] # Disabled for MSIX due to https://bugzilla.mozilla.org/show_bug.cgi?id=1807929, disabled for artifact for bug 1982870. ["test_UninstallPing.js"] support-files = ["file_UninstallPing.worker.js"] diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.mjs b/tools/lint/eslint/eslint-plugin-mozilla/lib/configs/xpcshell-test.mjs @@ -10,13 +10,6 @@ export default { "mozilla/xpcshell": true, }, - globals: { - afterEach: false, - beforeEach: false, - describe: false, - it: false, - }, - name: "mozilla/xpcshell-test", plugins: ["mozilla", "@microsoft/sdl"],