Skip to content

Commit 080197e

Browse files
committed
gh-137586: Fix MacOSXOSAScriptTest for MacOSX registration change
- Add test_default to MacOSXTest asserting webbrowser.get() returns MacOSX - Remove test_default from MacOSXOSAScriptTest (no longer the registered default) - Suppress DeprecationWarning in MacOSXOSAScriptTest setUp and test_explicit_browser using warnings.catch_warnings() so tests for OSAScript behaviour still run cleanly - Add warnings import
1 parent d54293f commit 080197e

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

Lib/test/test_webbrowser.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import subprocess
66
import sys
77
import unittest
8+
import warnings
89
import webbrowser
910
from test import support
1011
from test.support import force_not_colorized_test_class
@@ -327,6 +328,11 @@ def close(self):
327328
@requires_subprocess()
328329
class MacOSXTest(unittest.TestCase):
329330

331+
def test_default(self):
332+
browser = webbrowser.get()
333+
self.assertIsInstance(browser, webbrowser.MacOSX)
334+
self.assertEqual(browser.name, 'default')
335+
330336
def test_default_open(self):
331337
browser = webbrowser.MacOSX('default')
332338
with mock.patch('subprocess.run') as mock_run:
@@ -377,16 +383,14 @@ def setUp(self):
377383
env.unset("BROWSER")
378384

379385
support.patch(self, os, "popen", self.mock_popen)
386+
self.enterContext(warnings.catch_warnings())
387+
warnings.simplefilter("ignore", DeprecationWarning)
380388
self.browser = webbrowser.MacOSXOSAScript("default")
381389

382390
def mock_popen(self, cmd, mode):
383391
self.popen_pipe = MockPopenPipe(cmd, mode)
384392
return self.popen_pipe
385393

386-
def test_default(self):
387-
browser = webbrowser.get()
388-
assert isinstance(browser, webbrowser.MacOSXOSAScript)
389-
self.assertEqual(browser.name, "default")
390394

391395
def test_default_open(self):
392396
url = "https://python.org"
@@ -413,7 +417,9 @@ def test_default_browser_lookup(self):
413417
self.assertIn(f'open location "{url}"', script)
414418

415419
def test_explicit_browser(self):
416-
browser = webbrowser.MacOSXOSAScript("safari")
420+
with warnings.catch_warnings():
421+
warnings.simplefilter("ignore", DeprecationWarning)
422+
browser = webbrowser.MacOSXOSAScript("safari")
417423
browser.open("https://python.org")
418424
script = self.popen_pipe.pipe.getvalue()
419425
self.assertIn('tell application "safari"', script)

0 commit comments

Comments
 (0)