aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2024-09-20 15:37:49 +0200
committerMichał Górny <mgorny@gentoo.org>2024-10-01 21:19:59 +0200
commit29faf574607b208b51645a969b83edb776a7e4d4 (patch)
treea05ad65eebebc00e54462a5b8d4d5ff6fdf3e498
parentGH-113655: Lower the C recursion limit for HPPA, PPC64 and SPARC (#124264) (diff)
downloadcpython-gentoo-3.12.7.tar.gz
cpython-gentoo-3.12.7.tar.bz2
cpython-gentoo-3.12.7.zip
gh-124213: Skip tests failing inside systemd-nspawn --suppress-sync=true (#124215)gentoo-3.12.7
Add a helper function that checks whether the test suite is running inside a systemd-nspawn container, and skip the few tests failing with `--suppress-sync=true` in that case. The tests are failing because `--suppress-sync=true` stubs out `fsync()`, `fdatasync()` and `msync()` calls, and therefore they always return success without checking for invalid arguments. Call `os.open(__file__, os.O_RDONLY | os.O_SYNC)` and check the errno to detect whether `--suppress-sync=true` is actually used, and skip the tests only in that scenario. Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r--Lib/test/support/__init__.py33
-rw-r--r--Lib/test/test_mmap.py6
-rw-r--r--Lib/test/test_os.py8
3 files changed, 43 insertions, 4 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 8519fedf8db..6dc58b5ddaf 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -59,6 +59,7 @@ __all__ = [
"Py_DEBUG", "EXCEEDS_RECURSION_LIMIT", "C_RECURSION_LIMIT",
"skip_on_s390x",
"BrokenIter",
+ "in_systemd_nspawn_sync_suppressed",
]
@@ -2496,3 +2497,35 @@ class BrokenIter:
if self.iter_raises:
1/0
return self
+
+
+def in_systemd_nspawn_sync_suppressed() -> bool:
+ """
+ Test whether the test suite is runing in systemd-nspawn
+ with ``--suppress-sync=true``.
+
+ This can be used to skip tests that rely on ``fsync()`` calls
+ and similar not being intercepted.
+ """
+
+ if not hasattr(os, "O_SYNC"):
+ return False
+
+ try:
+ with open("/run/systemd/container", "rb") as fp:
+ if fp.read().rstrip() != b"systemd-nspawn":
+ return False
+ except FileNotFoundError:
+ return False
+
+ # If systemd-nspawn is used, O_SYNC flag will immediately
+ # trigger EINVAL. Otherwise, ENOENT will be given instead.
+ import errno
+ try:
+ with os.open(__file__, os.O_RDONLY | os.O_SYNC):
+ pass
+ except OSError as err:
+ if err.errno == errno.EINVAL:
+ return True
+
+ return False
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 1867e8c957f..d2a1165af43 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -1,5 +1,6 @@
from test.support import (
- requires, _2G, _4G, gc_collect, cpython_only, is_emscripten
+ requires, _2G, _4G, gc_collect, cpython_only, is_emscripten,
+ in_systemd_nspawn_sync_suppressed,
)
from test.support.import_helper import import_module
from test.support.os_helper import TESTFN, unlink
@@ -779,7 +780,8 @@ class MmapTests(unittest.TestCase):
mm.write(b'python')
result = mm.flush()
self.assertIsNone(result)
- if sys.platform.startswith('linux'):
+ if (sys.platform.startswith('linux')
+ and not in_systemd_nspawn_sync_suppressed()):
# 'offset' must be a multiple of mmap.PAGESIZE on Linux.
# See bpo-34754 for details.
self.assertRaises(OSError, mm.flush, 1, len(b'python'))
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 3a62d3ecf5c..8fa09488013 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2291,8 +2291,12 @@ class Win32ErrorTests(unittest.TestCase):
@unittest.skipIf(support.is_wasi, "Cannot create invalid FD on WASI.")
class TestInvalidFD(unittest.TestCase):
- singles = ["fchdir", "dup", "fdatasync", "fstat",
- "fstatvfs", "fsync", "tcgetpgrp", "ttyname"]
+ singles = ["fchdir", "dup", "fstat",
+ "fstatvfs", "tcgetpgrp", "ttyname"]
+ # systemd-nspawn --suppress-sync=true does not verify fd passed
+ # fdatasync() and fsync(), and always returns success
+ if not support.in_systemd_nspawn_sync_suppressed():
+ singles += ["fdatasync", "fsync"]
#singles.append("close")
#We omit close because it doesn't raise an exception on some platforms
def get_single(f):