Skip to content

Commit 3dd6c51

Browse files
authored
Merge branch 'master' into optimize_write_latency
2 parents b0ea7f6 + 3ea5c85 commit 3dd6c51

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

tests/test_process.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,12 @@ async def cancel_make_transport():
685685
self.loop.run_until_complete(cancel_make_transport())
686686

687687
def test_cancel_post_init(self):
688+
if sys.version_info >= (3, 13) and self.implementation == 'asyncio':
689+
# https://github.com/python/cpython/issues/103847#issuecomment-3736561321
690+
# This test started to flake on CPython 3.13 and later,
691+
# so we skip it for asyncio tests until the issue is resolved.
692+
self.skipTest('flaky test on CPython 3.13+')
693+
688694
async def cancel_make_transport():
689695
coro = self.loop.subprocess_exec(asyncio.SubprocessProtocol,
690696
*self.PROGRAM_BLOCKED)

tests/test_tcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ async def client(addr):
405405
self.assertEqual(await reader.readexactly(2), b'OK')
406406

407407
re = r'(a bytes-like object)|(must be byte-ish)'
408-
if sys.version_info >= (3, 14):
408+
if sys.version_info >= (3, 13, 9):
409409
re += r'|(must be a bytes, bytearray, or memoryview object)'
410410
with self.assertRaisesRegex(TypeError, re):
411411
writer.write('AAAA')

0 commit comments

Comments
 (0)