From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 13 May 2026 16:21:23 +0000 (+0200) Subject: [3.14] gh-149776: Skip UDP Lite tests if it's not supported (GH-149777) (#149781) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dedb4c846efe1f461d271ccce353d1521ce83aa;p=thirdparty%2FPython%2Fcpython.git [3.14] gh-149776: Skip UDP Lite tests if it's not supported (GH-149777) (#149781) gh-149776: Skip UDP Lite tests if it's not supported (GH-149777) Fix test_socket on Linux kernel 7.1 and newer: skip UDP Lite tests if it's not supported. (cherry picked from commit 3cfc249e11a132dc69624150843779aa96c72b2b) Co-authored-by: Victor Stinner --- diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 249bfeaa14cf..669af51d449a 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -203,6 +203,25 @@ def _have_socket_hyperv(): return True +def _have_udp_lite(): + if not hasattr(socket, "IPPROTO_UDPLITE"): + return False + # Older Android versions block UDPLITE with SELinux. + if support.is_android and platform.android_ver().api_level < 29: + return False + + try: + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDPLITE) + except OSError as exc: + # Linux 7.1 removed UDP Lite support + if exc.errno == errno.EPROTONOSUPPORT: + return False + raise + sock.close() + + return True + + @contextlib.contextmanager def socket_setdefaulttimeout(timeout): old_timeout = socket.getdefaulttimeout() @@ -245,10 +264,7 @@ HAVE_SOCKET_QIPCRTR = _have_socket_qipcrtr() HAVE_SOCKET_VSOCK = _have_socket_vsock() -# Older Android versions block UDPLITE with SELinux. -HAVE_SOCKET_UDPLITE = ( - hasattr(socket, "IPPROTO_UDPLITE") - and not (support.is_android and platform.android_ver().api_level < 29)) +HAVE_SOCKET_UDPLITE = _have_udp_lite() HAVE_SOCKET_BLUETOOTH = _have_socket_bluetooth() diff --git a/Misc/NEWS.d/next/Tests/2026-05-13-14-53-23.gh-issue-149776.orqgsn.rst b/Misc/NEWS.d/next/Tests/2026-05-13-14-53-23.gh-issue-149776.orqgsn.rst new file mode 100644 index 000000000000..e86a9130ff9b --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2026-05-13-14-53-23.gh-issue-149776.orqgsn.rst @@ -0,0 +1,2 @@ +Fix test_socket on Linux kernel 7.1 and newer: skip UDP Lite tests if it's +not supported. Patch by Victor Stinner.