From: Jeff Lyon <146767590+secengjeff@users.noreply.github.com>
Date: Fri, 8 May 2026 20:33:05 +0000 (-0700)
Subject: gh-149496: Fix MacOSTest.test_default regression when BROWSER env var is set (GH... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45c47d26c230086163ac1ef0aa9f955f794fb69c;p=thirdparty%2FPython%2Fcpython.git

gh-149496: Fix MacOSTest.test_default regression when BROWSER env var is set (GH-149579)

gh-149496: Fix MacOSTest.test_default failing when BROWSER env var is set

MacOSTest.test_default calls webbrowser.get() and asserts it returns a
MacOS instance. When BROWSER is set in the environment (e.g. BROWSER=open,
a common macOS workaround for the old osascript-based implementation),
register_standard_browsers() registers a GenericBrowser as the preferred
browser instead, causing the assertion to fail.

This is a regression introduced in gh-137586, which added MacOSTest and
moved test_default into it from MacOSXOSAScriptTest. MacOSXOSAScriptTest
had an identical setUp() guard added in gh-131254 specifically to fix this
same failure. The guard was not carried over to MacOSTest.

Add setUp() to MacOSTest to unset BROWSER for the duration of each test,
restoring the isolation that was already established as the correct pattern
for macOS webbrowser tests.
---

diff --git a/Lib/test/test_webbrowser.py b/Lib/test/test_webbrowser.py
index 51d627d24c5a..82f14ca968f2 100644
--- a/Lib/test/test_webbrowser.py
+++ b/Lib/test/test_webbrowser.py
@@ -340,6 +340,10 @@ class MockPopenPipe:
 @requires_subprocess()
 class MacOSTest(unittest.TestCase):
 
+    def setUp(self):
+        env = self.enterContext(os_helper.EnvironmentVarGuard())
+        env.unset("BROWSER")
+
     def test_default(self):
         browser = webbrowser.get()
         self.assertIsInstance(browser, webbrowser.MacOS)