From 17bd2fa17a697b0e326f32aa261e4b67b9504e9c Mon Sep 17 00:00:00 2001 From: Norisz Fay Date: Thu, 7 Sep 2023 13:43:55 +0000 Subject: [PATCH] Backed out 2 changesets (bug 1849972) as requested by whimboo CLOSED TREE Backed out changeset d8ac28803dd6 (bug 1849972) Backed out changeset 57929c2e184a (bug 1849972) gecko-commit: 24c5f0ac0033f113e83081775c276aa128156462 --- tools/wptrunner/wptrunner/browsers/firefox.py | 5 +++++ tools/wptrunner/wptrunner/browsers/firefox_android.py | 1 + 2 files changed, 6 insertions(+) diff --git a/tools/wptrunner/wptrunner/browsers/firefox.py b/tools/wptrunner/wptrunner/browsers/firefox.py index d91703f42dd2a2..76fab0e0a5560d 100644 --- a/tools/wptrunner/wptrunner/browsers/firefox.py +++ b/tools/wptrunner/wptrunner/browsers/firefox.py @@ -913,6 +913,11 @@ def get_env(self, binary, debug_info, headless, chaos_mode_flags): headless, chaos_mode_flags) env["RUST_BACKTRACE"] = "1" + # This doesn't work with wdspec tests + # In particular tests can create a session without passing in the capabilites + # and in those cases we get the default geckodriver profile which doesn't + # guarantee zero network access + del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"] return env def create_output_handler(self, cmd): diff --git a/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tools/wptrunner/wptrunner/browsers/firefox_android.py index 8437dd20059298..ed84534f702351 100644 --- a/tools/wptrunner/wptrunner/browsers/firefox_android.py +++ b/tools/wptrunner/wptrunner/browsers/firefox_android.py @@ -349,6 +349,7 @@ def stop(self, force=False): def get_env(self, binary, debug_info, headless, chaos_mode_flags): env = get_environ(chaos_mode_flags) env["RUST_BACKTRACE"] = "1" + del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"] return env def executor_browser(self):