diff --git a/browser/components/doh/test/unit/xpcshell.ini b/browser/components/doh/test/unit/xpcshell.ini index f86b521cae8c..6ffac1696da4 100644 --- a/browser/components/doh/test/unit/xpcshell.ini +++ b/browser/components/doh/test/unit/xpcshell.ini @@ -7,4 +7,6 @@ support-files = [test_DNSLookup.js] skip-if = debug # Bug 1617845 [test_LookupAggregator.js] +skip-if = socketprocess_networking [test_TRRRacer.js] +skip-if = socketprocess_networking diff --git a/image/test/unit/xpcshell.ini b/image/test/unit/xpcshell.ini index 5f475e7068f0..58b18b341628 100644 --- a/image/test/unit/xpcshell.ini +++ b/image/test/unit/xpcshell.ini @@ -38,3 +38,4 @@ support-files = [test_imgtools.js] [test_moz_icon_uri.js] [test_private_channel.js] +skip-if = socketprocess_networking diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini index f14cf3768c9b..f0a71c405c14 100644 --- a/netwerk/test/unit/xpcshell.ini +++ b/netwerk/test/unit/xpcshell.ini @@ -305,8 +305,10 @@ fail-if = os == "android" # http2 unit tests require us to have node available to run the spdy and http2 server [test_http2.js] run-sequentially = node server exceptions dont replay well +skip-if = socketprocess_networking [test_altsvc.js] run-sequentially = node server exceptions dont replay well +skip-if = socketprocess_networking [test_speculative_connect.js] [test_standardurl.js] [test_standardurl_default_port.js] @@ -329,12 +331,14 @@ run-sequentially = Hardcoded hash value includes port 4444. [test_unix_domain.js] [test_addr_in_use_error.js] [test_about_networking.js] +skip-if = socketprocess_networking [test_ping_aboutnetworking.js] skip-if = (verify && (os == 'mac')) [test_referrer.js] [test_referrer_cross_origin.js] [test_referrer_policy.js] [test_predictor.js] +skip-if = socketprocess_networking [test_signature_extraction.js] skip-if = os != "win" [test_synthesized_response.js] @@ -346,6 +350,7 @@ skip-if = os != "win" firefox-appdir = browser [test_be_conservative_error_handling.js] firefox-appdir = browser +skip-if = socketprocess_networking [test_tls_server.js] firefox-appdir = browser [test_tls_server_multiple_clients.js] @@ -366,6 +371,7 @@ skip-if = appname == "thunderbird" skip-if = appname == "thunderbird" [test_alt-data_simple.js] [test_alt-data_stream.js] +skip-if = socketprocess_networking [test_alt-data_too_big.js] [test_alt-data_overwrite.js] [test_alt-data_closeWithStatus.js] @@ -374,10 +380,11 @@ skip-if = appname == "thunderbird" [test_throttlequeue.js] [test_throttlechannel.js] [test_throttling.js] +skip-if = socketprocess_networking [test_separate_connections.js] [test_trackingProtection_annotateChannels.js] [test_race_cache_with_network.js] -skip-if = (verify && !debug && (os == 'win')) +skip-if = (verify && !debug && (os == 'win')) || socketprocess_networking [test_rcwn_always_cache_new_content.js] [test_channel_priority.js] [test_bug1312774_http1.js] @@ -393,14 +400,16 @@ skip-if = (verify && (os == 'linux')) || (os == "android" && processor == "x86_6 run-sequentially = node server exceptions dont replay well [test_trr.js] # test_trr.js is not working in Thunderbird due to bug 1608066. -skip-if = appname == "thunderbird" +skip-if = appname == "thunderbird" || socketprocess_networking [test_ioservice.js] [test_substituting_protocol_handler.js] [test_proxyconnect.js] -skip-if = tsan # Bug 1614708 +skip-if = tsan || socketprocess_networking # Bug 1614708 [test_captive_portal_service.js] run-sequentially = node server exceptions dont replay well +skip-if = socketprocess_networking [test_esni_dns_fetch.js] +skip-if = socketprocess_networking [test_network_connectivity_service.js] [test_suspend_channel_on_authRetry.js] [test_suspend_channel_on_examine_merged_response.js] @@ -414,8 +423,10 @@ run-sequentially = node server exceptions dont replay well run-sequentially = one http2 node proxy is used for all tests, this test is using global session counter skip-if = os == "android" [test_head_request_no_response_body.js] +skip-if = socketprocess_networking [test_disabled_ftp.js] [test_cache_204_response.js] +skip-if = socketprocess_networking [test_http3.js] # disabled for now due to intermittent failures caused by neqo bugs skip-if = true || asan || tsan || os == 'win' || os =='android' @@ -427,5 +438,6 @@ skip-if = true || asan || tsan || os == 'win' || os =='android' [test_dns_override.js] [test_no_cookies_after_last_pb_exit.js] [test_trr_httpssvc.js] +skip-if = socketprocess_networking [test_trr_case_sensitivity.js] -skip-if = os == "android" || verify +skip-if = os == "android" || verify || socketprocess_networking diff --git a/netwerk/test/unit_ipc/xpcshell.ini b/netwerk/test/unit_ipc/xpcshell.ini index 6508f55efcae..c85b0feded13 100644 --- a/netwerk/test/unit_ipc/xpcshell.ini +++ b/netwerk/test/unit_ipc/xpcshell.ini @@ -65,6 +65,7 @@ support-files = [test_cookie_header_stripped.js] [test_cacheflags_wrap.js] +skip-if = socketprocess_networking [test_cache-entry-id_wrap.js] [test_cache_jar_wrap.js] [test_channel_close_wrap.js] @@ -91,6 +92,7 @@ skip-if = true [test_redirect_different-protocol_wrap.js] [test_reentrancy_wrap.js] [test_resumable_channel_wrap.js] +skip-if = socketprocess_networking [test_simple_wrap.js] [test_synthesized_response_wrap.js] [test_xmlhttprequest_wrap.js] @@ -100,6 +102,7 @@ skip-if = true [test_getHost_wrap.js] [test_alt-data_simple_wrap.js] [test_alt-data_stream_wrap.js] +skip-if = socketprocess_networking [test_alt-data_closeWithStatus_wrap.js] [test_original_sent_received_head_wrap.js] [test_channel_id.js] @@ -110,4 +113,6 @@ skip-if = true [test_alt-data_cross_process_wrap.js] [test_httpcancel_wrap.js] [test_esni_dns_fetch_wrap.js] +skip-if = socketprocess_networking [test_trr_httpssvc_wrap.js] +skip-if = socketprocess_networking diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index 39a3e4231759..4ebe0c39369e 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -143,6 +143,7 @@ run-sequentially = hardcoded ports run-sequentially = hardcoded ports [test_local_cert.js] [test_logoutAndTeardown.js] +skip-if = socketprocess_networking run-sequentially = hardcoded ports [test_missing_intermediate.js] run-sequentially = hardcoded ports diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index 7f5b3a36ba52..5f0151696238 100755 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -1358,6 +1358,9 @@ class XPCShellTests(object): self.mozInfo['verify'] = options.get('verify', False) self.mozInfo['webrender'] = self.enable_webrender + self.mozInfo['socketprocess_networking'] = prefs.get( + 'network.http.network_access_on_socket_process.enabled', False) + mozinfo.update(self.mozInfo) return True diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini index 595d5a59f754..816b48ffcdbd 100644 --- a/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini +++ b/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini @@ -56,6 +56,7 @@ skip-if = os == 'android' && debug # The generated script takes too long to load skip-if = appname == "thunderbird" || os == "android" # Containers are not exposed to android. [test_ext_debugging_utils.js] [test_ext_dns.js] +skip-if = socketprocess_networking [test_ext_downloads.js] skip-if = appname == "thunderbird" [test_ext_downloads_download.js] @@ -112,6 +113,7 @@ skip-if = appname == "thunderbird" [test_ext_proxy_settings.js] skip-if = appname == "thunderbird" || os == "android" # proxy settings are not supported on android [test_ext_proxy_socks.js] +skip-if = socketprocess_networking run-sequentially = TCPServerSocket fails otherwise [test_ext_proxy_speculative.js] skip-if = ccov && os == 'linux' # bug 1607581 @@ -193,6 +195,7 @@ skip-if = os == "android" && debug [test_ext_webRequest_permission.js] skip-if = os == "android" && debug [test_ext_webRequest_requestSize.js] +skip-if = socketprocess_networking [test_ext_webRequest_responseBody.js] skip-if = os == "android" && debug [test_ext_webRequest_set_cookie.js] diff --git a/toolkit/components/mediasniffer/test/unit/xpcshell.ini b/toolkit/components/mediasniffer/test/unit/xpcshell.ini index fbeea084607b..ca82dea1a260 100644 --- a/toolkit/components/mediasniffer/test/unit/xpcshell.ini +++ b/toolkit/components/mediasniffer/test/unit/xpcshell.ini @@ -15,4 +15,5 @@ support-files = data/notags.mp3 [test_mediasniffer.js] +skip-if = socketprocess_networking [test_mediasniffer_ext.js] diff --git a/tools/profiler/tests/xpcshell/xpcshell.ini b/tools/profiler/tests/xpcshell/xpcshell.ini index 6979565eb06b..01bde1de6eeb 100644 --- a/tools/profiler/tests/xpcshell/xpcshell.ini +++ b/tools/profiler/tests/xpcshell/xpcshell.ini @@ -2,7 +2,7 @@ head = head.js support-files = ../shared-head.js -skip-if = toolkit == 'android' +skip-if = toolkit == 'android' || socketprocess_networking [test_active_configuration.js] [test_start.js]