Skip UDP Lite tests if it's not supported
- Fixes FTBFS on Linux kernel 7.1 and newer
This commit is contained in:
parent
79c55d4ad7
commit
dadebe1c22
2 changed files with 76 additions and 1 deletions
|
|
@ -0,0 +1,64 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Stinner <vstinner@python.org>
|
||||
Date: Wed, 13 May 2026 17:27:56 +0200
|
||||
Subject: 00491: gh-149776: Skip UDP Lite tests if it's not supported
|
||||
|
||||
Fix test_socket on Linux kernel 7.1 and newer: skip UDP Lite tests if
|
||||
it's not supported.
|
||||
|
||||
(cherry picked from commit 3cfc249e11a132dc69624150843779aa96c72b2b)
|
||||
(cherry picked from commit 49d08674d8dba50dc29539e3c7bce21d66066b06)
|
||||
---
|
||||
Lib/test/test_socket.py | 22 ++++++++++++++++++-
|
||||
...-05-13-14-53-23.gh-issue-149776.orqgsn.rst | 2 ++
|
||||
2 files changed, 23 insertions(+), 1 deletion(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Tests/2026-05-13-14-53-23.gh-issue-149776.orqgsn.rst
|
||||
|
||||
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
|
||||
index 5ea8c8e62c..c96185b2e5 100644
|
||||
--- a/Lib/test/test_socket.py
|
||||
+++ b/Lib/test/test_socket.py
|
||||
@@ -145,6 +145,26 @@ def _have_socket_bluetooth():
|
||||
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()
|
||||
@@ -169,7 +189,7 @@ def socket_setdefaulttimeout(timeout):
|
||||
|
||||
HAVE_SOCKET_VSOCK = _have_socket_vsock()
|
||||
|
||||
-HAVE_SOCKET_UDPLITE = hasattr(socket, "IPPROTO_UDPLITE")
|
||||
+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 0000000000..e86a9130ff
|
||||
--- /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.
|
||||
|
|
@ -17,7 +17,7 @@ URL: https://www.python.org/
|
|||
#global prerel ...
|
||||
%global upstream_version %{general_version}%{?prerel}
|
||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||
Release: 6%{?dist}
|
||||
Release: 7%{?dist}
|
||||
License: Python-2.0.1
|
||||
|
||||
|
||||
|
|
@ -421,6 +421,13 @@ Patch485: 00485-cve-2026-4224.patch
|
|||
# (cherry-picked from commit acfe02f3b05436658d92add6b168538b30f357f0)
|
||||
Patch489: 00489-openssl-3.5.7.patch
|
||||
|
||||
# 00491 # ac14737379922303720216b61803474c84f291ef
|
||||
# gh-149776: Skip UDP Lite tests if it's not supported
|
||||
#
|
||||
# Fix test_socket on Linux kernel 7.1 and newer: skip UDP Lite tests if
|
||||
# it's not supported.
|
||||
Patch491: 00491-gh-149776-skip-udp-lite-tests-if-it-s-not-supported.patch
|
||||
|
||||
# (New patches go here ^^^)
|
||||
#
|
||||
# When adding new patches to "python" and "python3" in Fedora, EL, etc.,
|
||||
|
|
@ -1753,6 +1760,10 @@ CheckPython optimized
|
|||
# ======================================================
|
||||
|
||||
%changelog
|
||||
* Thu Jul 30 2026 Miro Hrončok <mhroncok@redhat.com> - 3.11.15-7
|
||||
- Skip UDP Lite tests if it's not supported
|
||||
- Fixes FTBFS on Linux kernel 7.1 and newer
|
||||
|
||||
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.15-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue