Skip to content

gh-110529: Guard _testcapi imports in tests #110530

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
sobolevn wants to merge 7 commits into from
Closed

gh-110529: Guard _testcapi imports in tests #110530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
45d59ba
gh-110529: Guard `_testcapi` imports in tests
sobolevn Oct 8, 2023
efd0858
Skip whole `test_capi` if `_testcapi` is not present
sobolevn Oct 9, 2023
0ddcda3
Adjust import
sobolevn Oct 9, 2023
50965c9
Do not skip the whole dir, since it breaks some subinterpreter tests
sobolevn Oct 9, 2023
3100314
Update Lib/test/test_capi/__init__.py
serhiy-storchaka Oct 9, 2023
921b5eb
Do not touch test_from_format
sobolevn Oct 9, 2023
075af88
Merge branch 'issue-110529' of https://github.com/sobolevn/cpython in…
sobolevn Oct 9, 2023
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
4 changes: 3 additions & 1 deletion Lib/test/test_capi/test_abstract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import unittest
from collections import OrderedDict
import _testcapi
from test.support import import_helper

_testcapi = import_helper.import_module('_testcapi')

@vstinner vstinner Oct 8, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that such check should be done in Lib/test/test_capi/__init__.py. I don't think that it's worth to attempt to run any of sub-tests if _testcapi cannot be imported.

@sobolevn sobolevn Oct 9, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't agree that it should only be done there, because people can run only a single test file. In case of ./python.exe Lib/test/test_capi/test_WHATEVER.py, this test must also be skipped correctly.

However, I think that we can also check this in test_capi/__init__.py just to speed up test runs without _testcapi



NULL = None
Expand Down
4 changes: 3 additions & 1 deletion Lib/test/test_capi/test_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import unittest
from collections import OrderedDict, UserDict
from types import MappingProxyType
import _testcapi
from test.support import import_helper

_testcapi = import_helper.import_module('_testcapi')


NULL = None
Expand Down
Loading