Skip to content

gh-132413: Extend datetime C-API tests for subinterpreters #133111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
neonene wants to merge 15 commits into from
Closed

gh-132413: Extend datetime C-API tests for subinterpreters #133111

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
30c30cd
Update datetime.c
neonene Apr 28, 2025
9c11843
Update datetimetester.py
neonene Apr 28, 2025
da91cdb
Add a note
neonene Apr 28, 2025
7d79dd9
Reword
neonene Apr 29, 2025
ce0a687
Merge branch 'main' into crashtester
neonene Apr 29, 2025
a862456
Rename a keyword to be replaced
neonene Apr 29, 2025
be5791c
Reconsider arguments
neonene Apr 29, 2025
cccdd2c
Add a testcase
neonene Apr 29, 2025
4298825
Add a test for using subinterp twice
neonene Apr 29, 2025
b3f3f21
Do not dedent subinterp's code
neonene Apr 29, 2025
0ee6e3d
Introduce test_datetime_capi_newinterp()
neonene Apr 30, 2025
ca98adb
Cleanup
neonene May 1, 2025
8bcad71
Add a test to test_embed
neonene May 1, 2025
a2919f7
Smaller patch for tests
neonene May 13, 2025
01ac886
Merge branch 'main' into crashtester
neonene May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Do not dedent subinterp's code
  • Loading branch information
@neonene
neonene authored Apr 29, 2025
commit b3f3f2102909a265d1e33e96986e7c783b9e2d3f
40 changes: 18 additions & 22 deletions Lib/test/datetimetester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7165,28 +7165,25 @@ def assert_python_in_subinterp(self, check_if_ok, script, init='',
extension_loader = "ExtensionFileLoader"

code = textwrap.dedent(f'''
import textwrap
from test import support

subinterp_code = textwrap.dedent("""
if {_interpreters is None}:
import _testcapi
else:
import importlib.machinery
import importlib.util
fullname = '_testcapi_datetime'
origin = importlib.util.find_spec('_testcapi').origin
loader = importlib.machinery.{extension_loader}(fullname, origin)
spec = importlib.util.spec_from_loader(fullname, loader)
_testcapi = importlib.util.module_from_spec(spec)
spec.loader.exec_module(_testcapi)
INDEX = $INDEX$

setup = _testcapi.test_datetime_capi # call it if needed
____$SCRIPT$
""")
subinterp_code = """
if {_interpreters is None}:
import _testcapi
else:
import importlib.machinery
import importlib.util
fullname = '_testcapi_datetime'
origin = importlib.util.find_spec('_testcapi').origin
loader = importlib.machinery.{extension_loader}(fullname, origin)
spec = importlib.util.spec_from_loader(fullname, loader)
_testcapi = importlib.util.module_from_spec(spec)
spec.loader.exec_module(_testcapi)
INDEX = $INDEX$
setup = _testcapi.test_datetime_capi # call it if needed
$SCRIPT$
"""

import _testcapi
from test import support
setup = _testcapi.test_datetime_capi
$INIT$

Expand All @@ -7199,11 +7196,10 @@ def assert_python_in_subinterp(self, check_if_ok, script, init='',
config = _interpreters.new_config('{config}').__dict__
ret = support.run_in_subinterp_with_config(subcode, **config)
assert ret == 0

$FINI$
''')
code = code.replace('$INIT$', init).replace('$FINI$', fini)
code = code.replace('____$SCRIPT$', textwrap.indent(script, '\x20'*4))
code = code.replace('$SCRIPT$', script)

if check_if_ok:
res = script_helper.assert_python_ok('-c', code)
Expand Down