https://github.com/python/cpython/commit/f869bcfc5bd4755c7c1d6a00b82919543c8ee6e5
commit: f869bcfc5bd4755c7c1d6a00b82919543c8ee6e5
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-06-18T17:15:04+02:00
summary:
gh-120417: Use import_helper() in test_regrtest (#120680)
files:
M Lib/test/test_regrtest.py
diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py
index 97ce797f0f6acb..0a15170a99e757 100644
--- a/Lib/test/test_regrtest.py
+++ b/Lib/test/test_regrtest.py
@@ -22,7 +22,8 @@
import textwrap
import unittest
from test import support
-from test.support import os_helper, without_optimizer
+from test.support import import_helper
+from test.support import os_helper
from test.libregrtest import cmdline
from test.libregrtest import main
from test.libregrtest import setup
@@ -1178,7 +1179,7 @@ def test_run(self):
stats=TestStats(4, 1),
forever=True)
- @without_optimizer
+ @support.without_optimizer
def check_leak(self, code, what, *, run_workers=False):
test = self.create_test('huntrleaks', code=code)
@@ -1746,10 +1747,9 @@ def test_other_bug(self):
@support.cpython_only
def test_uncollectable(self):
- try:
- import _testcapi
- except ImportError:
- raise unittest.SkipTest("requires _testcapi")
+ # Skip test if _testcapi is missing
+ import_helper.import_module('_testcapi')
+
code = textwrap.dedent(r"""
import _testcapi
import gc
@@ -2132,10 +2132,10 @@ def test_unload_tests(self):
def check_add_python_opts(self, option):
# --fast-ci and --slow-ci add "-u -W default -bb -E" options to Python
- try:
- import _testinternalcapi
- except ImportError:
- raise unittest.SkipTest("requires _testinternalcapi")
+
+ # Skip test if _testinternalcapi is missing
+ import_helper.import_module('_testinternalcapi')
+
code = textwrap.dedent(r"""
import sys
import unittest
@@ -2198,10 +2198,8 @@ def test_add_python_opts(self):
@unittest.skipIf(support.is_android,
'raising SIGSEGV on Android is unreliable')
def test_worker_output_on_failure(self):
- try:
- from faulthandler import _sigsegv
- except ImportError:
- self.skipTest("need faulthandler._sigsegv")
+ # Skip test if faulthandler is missing
+ import_helper.import_module('faulthandler')
code = textwrap.dedent(r"""
import faulthandler
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
