X Tutup
Skip to content

gh-124213: Skip tests failing with --suppress-sync=true when inside systemd-nspawn container #124215

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

Merged
vstinner merged 8 commits into from
Sep 20, 2024
Merged

gh-124213: Skip tests failing with --suppress-sync=true when inside systemd-nspawn container #124215

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dac1143
gh-124213: Skip tests failing with ``--suppress-sync=true`` when insi…
mgorny Sep 18, 2024
c4dbdeb
Implement review comments from @vstinner
mgorny Sep 20, 2024
e580bb5
Detect `--suppress-sync=true` and limit the skips to that
mgorny Sep 20, 2024
ce85e75
Fix formatting (typo) in the news entry
mgorny Sep 20, 2024
e016a82
Apply suggestions from @vstinner
mgorny Sep 20, 2024
68802f8
Inline in_systemd_nspawn() in *_sync_suppressed()
mgorny Sep 20, 2024
ed0fc42
Apply suggestions from code review
vstinner Sep 20, 2024
222fcc0
Update Lib/test/test_mmap.py
vstinner Sep 20, 2024
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
Apply suggestions from @vstinner 
Co-authored-by: Victor Stinner <vstinner@python.org>
  • Loading branch information
@mgorny @vstinner
mgorny and vstinner authored Sep 20, 2024
commit e016a82f84834a77b0861d88f46028676d153d44
11 changes: 5 additions & 6 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2890,12 +2890,11 @@ def in_systemd_nspawn() -> bool:

def in_systemd_nspawn_sync_suppressed() -> bool:
"""
Test whether the test suite is runing in systemd-nspawn with ``--suppress-sync=true``
Test whether the test suite is runing in systemd-nspawn
with ``--suppress-sync=true``.

Return True if the test suite is being run inside a systemd-nspawn
container and ``--suppress-sync=true`` option is detected to be used,
False otherwise. This can be used to skip tests that rely
on ``fsync()`` calls and similar not being intercepted.
This can be used to skip tests that rely on ``fsync()`` calls
and similar not being intercepted.
"""

if hasattr(os, "O_SYNC") and in_systemd_nspawn():
Expand All @@ -2904,7 +2903,7 @@ def in_systemd_nspawn_sync_suppressed() -> bool:
# If systemd-nspawn is used, O_SYNC flag will immediately trigger
# EINVAL. Otherwise, ENOENT will be given instead.
try:
with os.open("", os.O_RDONLY | os.O_SYNC):
with os.open(__file__, os.O_RDONLY | os.O_SYNC):
pass
except OSError as err:
if err.errno == errno.EINVAL:
Expand Down
X Tutup