From 897a36baddb3611865a839c6345315da689c52a1 Mon Sep 17 00:00:00 2001 From: yihong Date: Sat, 11 Oct 2025 20:32:57 +0800 Subject: [PATCH] gh-139935: fix `test_os.test_getlogin` on some platforms (#139936) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This amends 4e7e2dd043c1da85b0c157d3ed24866b77e83a4f to catch errors that `os.getlogin` can raise as specified by POSIX and Linux/glibc [1]. [1]: https://man7.org/linux/man-pages/man3/getlogin.3.html#ERRORS --------- Signed-off-by: yihong0618 Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> --- Lib/test/test_os/test_os.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_os/test_os.py b/Lib/test/test_os/test_os.py index 371771087aaf..95b175db6fcd 100644 --- a/Lib/test/test_os/test_os.py +++ b/Lib/test/test_os/test_os.py @@ -3203,7 +3203,14 @@ class LoginTests(unittest.TestCase): try: user_name = os.getlogin() except OSError as exc: - if exc.errno in (errno.ENOTTY, errno.ENXIO): + # See https://man7.org/linux/man-pages/man3/getlogin.3.html#ERRORS. + allowed_errors = ( + # defined by POSIX + errno.EMFILE, errno.ENFILE, errno.ENXIO, errno.ERANGE, + # defined by Linux/glibc + errno.ENOENT, errno.ENOMEM, errno.ENOTTY, + ) + if exc.errno in allowed_errors: self.skipTest(str(exc)) else: raise -- 2.47.3