commit b23ce96f5a670378cb9514ea630a3ab82e4d04d0
parent 15ab9c0506de5faad6f3deebb2046d0589286145
Author: Atila Butkovits <abutkovits@mozilla.com>
Date: Tue, 16 Dec 2025 16:52:14 +0200
Revert "Bug 2004381 - Disable socketprocess_networking tests, r=necko-reviewers,taskgraph-reviewers,valentin,jcristau" for causing taskgraph related failures.
This reverts commit 7dbca98aff1dcd2e4db8df935e1fda476b5c31a5.
Diffstat:
5 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/taskcluster/kinds/mochitest/kind.yml b/taskcluster/kinds/mochitest/kind.yml
@@ -124,6 +124,7 @@ tasks:
- conditioned_profile
- xorigin
- no-fission
+ - socketprocess_networking
- headless
- http3
- http2
@@ -152,6 +153,13 @@ 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
@@ -271,9 +279,14 @@ 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
@@ -293,6 +306,7 @@ tasks:
variants:
- webrender-sw
- webrender-sw+a11y-checks
+ - socketprocess_networking
- msix
- vertical-tabs
- inc-origin-init
@@ -330,6 +344,14 @@ 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
@@ -382,6 +404,10 @@ 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
@@ -558,10 +584,17 @@ 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
@@ -597,6 +630,7 @@ tasks:
loopback-video: true
variants:
- a11y-checks
+ - socketprocess_networking
- http3
run-on-projects:
by-variant:
@@ -608,6 +642,12 @@ 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.*: []
@@ -779,9 +819,11 @@ 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
@@ -1211,8 +1253,15 @@ 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,6 +45,8 @@ xpcshell:
treeherder-symbol: X(X)
variants:
- conditioned_profile
+ - socketprocess_networking+no-fission
+ - socketprocess_networking
- no-fission
- msix
- geckoview-no-fission-no-ship
@@ -66,6 +68,18 @@ 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: []
@@ -137,6 +151,10 @@ 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,6 +317,28 @@ 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,9 +245,17 @@ def test_runtimes():
assert platform_info.test_variant == "!e10s+xorigin"
# combines multiple runtimes 2
- test_settings["runtime"] = {"no-fission": True}
+ test_settings["runtime"] = {"no-fission": True, "socketprocess_networking": True}
platform_info = PlatformInfo(test_settings)
- assert platform_info.test_variant == "!fission"
+ assert platform_info.test_variant == "!fission+socketprocess_networking"
+
+ # combines multiple runtimes 3
+ test_settings["runtime"] = {
+ "socketprocess_networking": True,
+ "no-fission": True,
+ }
+ platform_info = PlatformInfo(test_settings)
+ assert platform_info.test_variant == "!fission+socketprocess_networking"
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", [""])
+@pytest.mark.parametrize("variant", ["", "spi-nw"])
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,6 +104,7 @@ 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-*",
]
