Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/test/test_re.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import locale
import re
import string
import sys
import unittest
import warnings
from re import Scanner
Expand Down Expand Up @@ -2177,6 +2178,8 @@ def test_bug_20998(self):
self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))

@unittest.skipIf(linked_to_musl(), "musl libc issue, 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)
Expand Down Expand Up @@ -2214,6 +2217,8 @@ def check_en_US_utf8(self):
self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5'))

@unittest.skipIf(linked_to_musl(), "musl libc issue, 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)
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_socket.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

VSOCKPORT = 1234
AIX = platform.system() == "AIX"
SOLARIS = sys.platform.startswith("sunos")
WSL = "microsoft-standard-WSL" in platform.release()

try:
Expand Down Expand Up @@ -3922,6 +3923,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)
Expand Down Expand Up @@ -4068,6 +4073,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):
Expand All @@ -4079,6 +4085,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)
Expand All @@ -4092,6 +4099,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):
Expand All @@ -4106,6 +4114,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)
Expand Down
Loading