commit 7dbca98aff1dcd2e4db8df935e1fda476b5c31a5
parent 14fad281ab8df4c2242bae1f3db477536692c1ea
Author: Kershaw Chang <kershaw@mozilla.com>
Date: Mon, 15 Dec 2025 21:30:19 +0000
Bug 2004381 - Disable socketprocess_networking tests, r=necko-reviewers,taskgraph-reviewers,valentin,jcristau
Differential Revision: https://phabricator.services.mozilla.com/D275223
Diffstat:
5 files changed, 3 insertions(+), 101 deletions(-)
diff --git a/taskcluster/kinds/mochitest/kind.yml b/taskcluster/kinds/mochitest/kind.yml
@@ -124,7 +124,6 @@ tasks:
- conditioned_profile
- xorigin
- no-fission
- - socketprocess_networking
- headless
- http3
- http2
@@ -153,13 +152,6 @@ tasks:
android-em.*/debug-isolated-process: ['trunk']
android-em.*: ['trunk']
default: []
- socketprocess_networking:
- by-test-platform:
- .*-ccov.*: []
- .*-asan.*: []
- .*-wayland.*: []
- linux2404-64/debug: ['autoland', 'mozilla-central']
- default: []
aab+no-fission:
by-test-platform:
android-em.*/debug: built-projects
@@ -279,14 +271,9 @@ tasks:
run-without-variant: false
variants:
- 1proc
- - socketprocess_networking+1proc
- webrender-sw+1proc
run-on-projects:
by-variant:
- socketprocess_networking+1proc:
- by-test-platform:
- linux.*64/debug: ['autoland', 'mozilla-central']
- default: []
webrender-sw+1proc:
by-test-platform:
android-em.*/debug: built-projects
@@ -306,7 +293,6 @@ tasks:
variants:
- webrender-sw
- webrender-sw+a11y-checks
- - socketprocess_networking
- msix
- vertical-tabs
- inc-origin-init
@@ -344,14 +330,6 @@ tasks:
by-test-platform:
linux.*64(-shippable)?/opt: ['trunk']
default: []
- socketprocess_networking:
- by-test-platform:
- .*-asan.*: []
- .*-ccov.*: []
- linux.*64(-shippable)?/.*: ['autoland', 'mozilla-central']
- macosx.*64(-shippable)?(-qr)?/.*: ['autoland', 'mozilla-central']
- windows1.*-64.*(-shippable)?/.*: ['autoland', 'mozilla-central']
- default: []
msix:
by-test-platform:
windows11-64.*: built-projects
@@ -404,10 +382,6 @@ tasks:
max-run-time:
by-variant:
msix: 5400
- socketprocess_networking:
- by-test-platform:
- linux.*/debug: 7200
- default: 5400
default:
by-test-platform:
linux.*64-ccov/opt: 9000
@@ -584,17 +558,10 @@ tasks:
run-without-variant: false
variants:
- 1proc
- - socketprocess_networking+1proc
- webrender-sw+1proc
- inc-origin-init
run-on-projects:
by-variant:
- socketprocess_networking+1proc:
- by-test-platform:
- .*-asan.*: []
- .*-ccov.*: []
- linux2404-64/debug: ['autoland', 'mozilla-central']
- default: []
webrender-sw+1proc:
by-test-platform:
android-em.*/debug: built-projects
@@ -630,7 +597,6 @@ tasks:
loopback-video: true
variants:
- a11y-checks
- - socketprocess_networking
- http3
run-on-projects:
by-variant:
@@ -642,12 +608,6 @@ tasks:
by-test-platform:
linux2404-64/debug: built-projects
default: []
- socketprocess_networking:
- by-test-platform:
- .*-asan.*: []
- .*-ccov.*: []
- linux2404-64/debug: ['autoland', 'mozilla-central']
- default: []
default:
by-test-platform:
android.*: []
@@ -819,11 +779,9 @@ tasks:
run-without-variant: false
variants:
- 1proc
- - socketprocess_networking+1proc
- webrender-sw+1proc
run-on-projects:
by-variant:
- socketprocess_networking+1proc: []
webrender-sw+1proc:
by-test-platform:
android-em.*/debug: built-projects
@@ -1253,15 +1211,8 @@ tasks:
loopback-video: true
variants:
- no-fission
- - socketprocess_networking
run-on-projects:
by-variant:
- socketprocess_networking:
- by-test-platform:
- .*-asan.*: []
- .*-ccov.*: []
- linux2404-64/debug: ['autoland', 'mozilla-central']
- default: []
no-fission:
by-test-platform:
linux2404-64/.*: ['trunk']
diff --git a/taskcluster/kinds/test/xpcshell.yml b/taskcluster/kinds/test/xpcshell.yml
@@ -45,8 +45,6 @@ xpcshell:
treeherder-symbol: X(X)
variants:
- conditioned_profile
- - socketprocess_networking+no-fission
- - socketprocess_networking
- no-fission
- msix
- geckoview-no-fission-no-ship
@@ -68,18 +66,6 @@ xpcshell:
linux2404-64.*/opt: ['trunk']
windows11-64.*/opt: ['trunk']
default: []
- socketprocess_networking+no-fission:
- by-test-platform:
- linux1804-64.*: ['mozilla-central']
- linux2404-64.*: ['mozilla-central']
- default: []
- socketprocess_networking:
- by-test-platform:
- macosx1015.*: ['trunk'] # All Mac variants
- macosx1470.*: ['trunk'] # All Mac variants
- windows.*-asan.*: []
- windows11.*: ['trunk'] # All Windows11 except ASAN
- default: []
no-fission:
by-test-platform:
android-em.*/debug-isolated-process: []
@@ -151,10 +137,6 @@ xpcshell:
by-test-platform:
linux.*: 2
default: default
- socketprocess_networking+no-fission:
- by-test-platform:
- linux.*: 2
- default: default
default:
by-test-platform:
windows.*-asan.*: 3
diff --git a/taskcluster/test_configs/variants.yml b/taskcluster/test_configs/variants.yml
@@ -317,28 +317,6 @@ socketprocess:
- "--setpref=media.peerconnection.mtransport_process=true"
- "--setpref=network.process.enabled=true"
-socketprocess_networking:
- description: "{description} with networking on socket process enabled"
- component: "Core::Networking"
- expiration: "2026-03-01"
- suffix: "spi-nw"
- mozinfo: "socketprocess_networking"
- when:
- $eval: '
- (
- "linux" in task["test-platform"]
- || "windows" in task["test-platform"]
- || "macosx" in task["test-platform"]
- ) && (
- "mochitest" in task["try-name"]
- || "xpcshell" == task["try-name"]
- )'
- merge:
- mozharness:
- extra-options:
- - "--setpref=network.process.enabled=true"
- - "--setpref=network.http.network_access_on_socket_process.enabled=true"
-
# -
# Webrender DComp variants for Win10
diff --git a/testing/mozbase/mozinfo/tests/test_platforminfo.py b/testing/mozbase/mozinfo/tests/test_platforminfo.py
@@ -245,17 +245,9 @@ def test_runtimes():
assert platform_info.test_variant == "!e10s+xorigin"
# combines multiple runtimes 2
- test_settings["runtime"] = {"no-fission": True, "socketprocess_networking": True}
- platform_info = PlatformInfo(test_settings)
- assert platform_info.test_variant == "!fission+socketprocess_networking"
-
- # combines multiple runtimes 3
- test_settings["runtime"] = {
- "socketprocess_networking": True,
- "no-fission": True,
- }
+ test_settings["runtime"] = {"no-fission": True}
platform_info = PlatformInfo(test_settings)
- assert platform_info.test_variant == "!fission+socketprocess_networking"
+ assert platform_info.test_variant == "!fission"
if __name__ == "__main__":
diff --git a/tools/tryselect/test/test_fuzzy.py b/tools/tryselect/test/test_fuzzy.py
@@ -71,7 +71,7 @@ def test_query_paths_no_chunks(run_mach, capfd, show_chunk_numbers):
@pytest.mark.skipif(os.name == "nt", reason="fzf not installed on host")
-@pytest.mark.parametrize("variant", ["", "spi-nw"])
+@pytest.mark.parametrize("variant", [""])
def test_query_paths_variants(monkeypatch, run_mach, capfd, variant):
# Freeze time to avoid test failures due to an expired variant
datetime_mock = MagicMock(wraps=datetime.datetime)
@@ -104,7 +104,6 @@ def test_query_paths_variants(monkeypatch, run_mach, capfd, variant):
expected = ["test-linux2404-64/debug-mochitest-browser-chrome%s-*" % variant]
else:
expected = [
- "test-linux2404-64/debug-mochitest-browser-chrome-spi-nw-*",
"test-linux2404-64/debug-mochitest-browser-chrome-swr-*",
]
