Skip to content

Commit 063f9f9

Browse files
committed
Skip failing tests on Solaris
1 parent c779f23 commit 063f9f9

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

Lib/test/test_locale.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ def test_strcoll(self):
336336
self.assertRaises(ValueError, locale.strcoll, 'a\0', 'a')
337337
self.assertRaises(ValueError, locale.strcoll, 'a', 'a\0')
338338

339+
@unittest.skipIf(sys.platform.startswith('sunos'),
340+
'bpo-xxxxx: broken on Solaris')
339341
def test_strxfrm(self):
340342
self.assertLess(locale.strxfrm('a'), locale.strxfrm('b'))
341343
# embedded null character
@@ -369,6 +371,8 @@ def test_strcoll_with_diacritic(self):
369371
@unittest.skipIf(linked_to_musl(), "musl libc issue, bpo-46390")
370372
@unittest.skipIf(sys.platform.startswith("netbsd"),
371373
"gh-124108: NetBSD doesn't support UTF-8 for LC_COLLATE")
374+
@unittest.skipIf(sys.platform.startswith('sunos'),
375+
'bpo-xxxxx: broken on Solaris')
372376
def test_strxfrm_with_diacritic(self):
373377
self.assertLess(locale.strxfrm('à'), locale.strxfrm('b'))
374378

Lib/test/test_re.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2177,6 +2177,8 @@ def test_bug_20998(self):
21772177
self.assertEqual(re.fullmatch('[a-c]+', 'ABC', re.I).span(), (0, 3))
21782178

21792179
@unittest.skipIf(linked_to_musl(), "musl libc issue, bpo-46390")
2180+
@unittest.skipIf(sys.platform.startswith("sunos"),
2181+
"test doesn't work well on sparc Solaris")
21802182
def test_locale_caching(self):
21812183
# Issue #22410
21822184
oldlocale = locale.setlocale(locale.LC_CTYPE)
@@ -2214,6 +2216,8 @@ def check_en_US_utf8(self):
22142216
self.assertIsNone(re.match(b'(?Li)\xe5', b'\xc5'))
22152217

22162218
@unittest.skipIf(linked_to_musl(), "musl libc issue, bpo-46390")
2219+
@unittest.skipIf(sys.platform.startswith("sunos"),
2220+
"test doesn't work well on sparc Solaris")
22172221
def test_locale_compiled(self):
22182222
oldlocale = locale.setlocale(locale.LC_CTYPE)
22192223
self.addCleanup(locale.setlocale, locale.LC_CTYPE, oldlocale)

Lib/test/test_socket.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252

5353
VSOCKPORT = 1234
5454
AIX = platform.system() == "AIX"
55+
SOLARIS = sys.platform.startswith("sunos")
5556
WSL = "microsoft-standard-WSL" in platform.release()
5657

5758
try:
@@ -3922,7 +3923,7 @@ def testCMSG_SPACE(self):
39223923
# Test CMSG_SPACE() with various valid and invalid values,
39233924
# checking the assumptions used by sendmsg().
39243925
toobig = self.socklen_t_limit - socket.CMSG_SPACE(1) + 1
3925-
values = list(range(257)) + list(range(toobig - 257, toobig))
3926+
values = list(range(257)) + list(range(toobig - 257, toobig - 8))
39263927

39273928
last = socket.CMSG_SPACE(0)
39283929
# struct cmsghdr has at least three members, two of which are ints
@@ -4068,6 +4069,7 @@ def _testFDPassCMSG_LEN(self):
40684069
self.createAndSendFDs(1)
40694070

40704071
@unittest.skipIf(is_apple, "skipping, see issue #12958")
4072+
@unittest.skipIf(SOLARIS, "skipping, see issue #00000")
40714073
@unittest.skipIf(AIX, "skipping, see issue #22397")
40724074
@requireAttrs(socket, "CMSG_SPACE")
40734075
def testFDPassSeparate(self):
@@ -4079,6 +4081,7 @@ def testFDPassSeparate(self):
40794081

40804082
@testFDPassSeparate.client_skip
40814083
@unittest.skipIf(is_apple, "skipping, see issue #12958")
4084+
@unittest.skipIf(SOLARIS, "skipping, see issue #00000")
40824085
@unittest.skipIf(AIX, "skipping, see issue #22397")
40834086
def _testFDPassSeparate(self):
40844087
fd0, fd1 = self.newFDs(2)
@@ -4092,6 +4095,7 @@ def _testFDPassSeparate(self):
40924095
len(MSG))
40934096

40944097
@unittest.skipIf(is_apple, "skipping, see issue #12958")
4098+
@unittest.skipIf(SOLARIS, "skipping, see issue #00000")
40954099
@unittest.skipIf(AIX, "skipping, see issue #22397")
40964100
@requireAttrs(socket, "CMSG_SPACE")
40974101
def testFDPassSeparateMinSpace(self):
@@ -4106,6 +4110,7 @@ def testFDPassSeparateMinSpace(self):
41064110

41074111
@testFDPassSeparateMinSpace.client_skip
41084112
@unittest.skipIf(is_apple, "skipping, see issue #12958")
4113+
@unittest.skipIf(SOLARIS, "skipping, see issue #00000")
41094114
@unittest.skipIf(AIX, "skipping, see issue #22397")
41104115
def _testFDPassSeparateMinSpace(self):
41114116
fd0, fd1 = self.newFDs(2)

0 commit comments

Comments
 (0)