https://github.com/python/cpython/commit/515d449e2650d274744838e07aa0ec21ce9d7357
commit: 515d449e2650d274744838e07aa0ec21ce9d7357
branch: 3.13
author: Jakub KulĂk <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2025-12-31T13:09:10+02:00
summary:
[3.13] gh-91214: Skip tests failing on Solaris (GH-31978) (GH-138462)
(cherry picked from commit 34ed03875a786879fe292fe472142ae0f3da0e80)
files:
M Lib/test/test_re.py
M Lib/test/test_socket.py
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 813cb4a3f54f23..809a7c565c09a6 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -2180,6 +2180,8 @@ def test_bug_20998(self):
is_emscripten or is_wasi,
"musl libc issue on Emscripten/WASI, bpo-46390"
)
+ @unittest.skipIf(sys.platform.startswith("sunos"),
+ "test doesn't work on Solaris, gh-91214")
def test_locale_caching(self):
# Issue #22410
oldlocale = locale.setlocale(locale.LC_CTYPE)
@@ -2220,6 +2222,8 @@ def check_en_US_utf8(self):
is_emscripten or is_wasi,
"musl libc issue on Emscripten/WASI, bpo-46390"
)
+ @unittest.skipIf(sys.platform.startswith("sunos"),
+ "test doesn't work on Solaris, gh-91214")
def test_locale_compiled(self):
oldlocale = locale.setlocale(locale.LC_CTYPE)
self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index dc104958588f91..4cf13b1fdd4ae4 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -52,6 +52,7 @@
VMADDR_CID_LOCAL = 1
VSOCKPORT = 1234
AIX = platform.system() == "AIX"
+SOLARIS = sys.platform.startswith("sunos")
WSL = "microsoft-standard-WSL" in platform.release()
try:
@@ -3774,6 +3775,10 @@ def testCMSG_SPACE(self):
# Test CMSG_SPACE() with various valid and invalid values,
# checking the assumptions used by sendmsg().
toobig = self.socklen_t_limit - socket.CMSG_SPACE(1) + 1
+ if SOLARIS and platform.processor() == "sparc":
+ # On Solaris SPARC, number of bytes returned by socket.CMSG_SPACE
+ # increases at different lengths; see gh-91214.
+ toobig -= 3
values = list(range(257)) + list(range(toobig - 257, toobig))
last = socket.CMSG_SPACE(0)
@@ -3920,6 +3925,7 @@ def _testFDPassCMSG_LEN(self):
self.createAndSendFDs(1)
@unittest.skipIf(is_apple, "skipping, see issue #12958")
+ @unittest.skipIf(SOLARIS, "skipping, see gh-91214")
@unittest.skipIf(AIX, "skipping, see issue #22397")
@requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparate(self):
@@ -3931,6 +3937,7 @@ def testFDPassSeparate(self):
@testFDPassSeparate.client_skip
@unittest.skipIf(is_apple, "skipping, see issue #12958")
+ @unittest.skipIf(SOLARIS, "skipping, see gh-91214")
@unittest.skipIf(AIX, "skipping, see issue #22397")
def _testFDPassSeparate(self):
fd0, fd1 = self.newFDs(2)
@@ -3944,6 +3951,7 @@ def _testFDPassSeparate(self):
len(MSG))
@unittest.skipIf(is_apple, "skipping, see issue #12958")
+ @unittest.skipIf(SOLARIS, "skipping, see gh-91214")
@unittest.skipIf(AIX, "skipping, see issue #22397")
@requireAttrs(socket, "CMSG_SPACE")
def testFDPassSeparateMinSpace(self):
@@ -3958,6 +3966,7 @@ def testFDPassSeparateMinSpace(self):
@testFDPassSeparateMinSpace.client_skip
@unittest.skipIf(is_apple, "skipping, see issue #12958")
+ @unittest.skipIf(SOLARIS, "skipping, see gh-91214")
@unittest.skipIf(AIX, "skipping, see issue #22397")
def _testFDPassSeparateMinSpace(self):
fd0, fd1 = self.newFDs(2)
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]