From 8ded34a1ff2d355e95213ab72493908f2ca25dd9 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Fri, 22 Sep 2023 23:51:58 +0300 Subject: gh-109721: Guard `_testinternalcapi` imports in tests (GH-109722) --- Lib/test/test_cmd_line.py | 1 + Lib/test/test_import/__init__.py | 5 ++++- Lib/test/test_opcache.py | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index e88b7c8..f4754db 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -799,6 +799,7 @@ class CmdLineTest(unittest.TestCase): self.assertEqual(proc.stdout.rstrip(), name) self.assertEqual(proc.returncode, 0) + @support.cpython_only def test_pythonmalloc(self): # Test the PYTHONMALLOC environment variable pymalloc = support.with_pymalloc() diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py index a302a60..48553f9 100644 --- a/Lib/test/test_import/__init__.py +++ b/Lib/test/test_import/__init__.py @@ -22,7 +22,6 @@ import time import types import unittest from unittest import mock -import _testinternalcapi import _imp from test.support import os_helper @@ -50,6 +49,10 @@ try: import _xxsubinterpreters as _interpreters except ModuleNotFoundError: _interpreters = None +try: + import _testinternalcapi +except ImportError: + _testinternalcapi = None skip_if_dont_write_bytecode = unittest.skipIf( diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py index 692e03f..2b2783d 100644 --- a/Lib/test/test_opcache.py +++ b/Lib/test/test_opcache.py @@ -4,13 +4,17 @@ import dis import threading import types import unittest -from test.support import threading_helper +from test.support import threading_helper, check_impl_detail + +# Skip this module on other interpreters, it is cpython specific: +if check_impl_detail(cpython=False): + raise unittest.SkipTest('implementation detail specific to cpython') + import _testinternalcapi def disabling_optimizer(func): def wrapper(*args, **kwargs): - import _testinternalcapi old_opt = _testinternalcapi.get_optimizer() _testinternalcapi.set_optimizer(None) try: -- cgit v0.12