Skip to content

Commit 89c58d6

Browse files
authored
Merge pull request #6037 from ShaharNaveh/update-support-init
Update `Lib/test/support/__init__.py` from 3.13.5
2 parents 38ca076 + 69f6423 commit 89c58d6

File tree

11 files changed

+3046
-719
lines changed

11 files changed

+3046
-719
lines changed

Lib/test/pickletester.py

Lines changed: 865 additions & 130 deletions
Large diffs are not rendered by default.

Lib/test/support/__init__.py

Lines changed: 767 additions & 424 deletions
Large diffs are not rendered by default.

Lib/test/test_collections.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Unit tests for collections.py."""
22

3+
import array
34
import collections
45
import copy
56
import doctest
@@ -469,6 +470,8 @@ def test_module_parameter(self):
469470
NT = namedtuple('NT', ['x', 'y'], module=collections)
470471
self.assertEqual(NT.__module__, collections)
471472

473+
# TODO: RUSTPYTHON
474+
@unittest.expectedFailure
472475
def test_instance(self):
473476
Point = namedtuple('Point', 'x y')
474477
p = Point(11, 22)
@@ -490,12 +493,8 @@ def test_instance(self):
490493
self.assertEqual(p._replace(x=1), (1, 22)) # test _replace method
491494
self.assertEqual(p._asdict(), dict(x=11, y=22)) # test _asdict method
492495

493-
try:
496+
with self.assertRaises(TypeError):
494497
p._replace(x=1, error=2)
495-
except ValueError:
496-
pass
497-
else:
498-
self._fail('Did not detect an incorrect fieldname')
499498

500499
# verify that field string can have commas
501500
Point = namedtuple('Point', 'x, y')
@@ -547,7 +546,9 @@ def test_odd_sizes(self):
547546
self.assertEqual(Dot(1)._replace(d=999), (999,))
548547
self.assertEqual(Dot(1)._fields, ('d',))
549548

550-
n = support.EXCEEDS_RECURSION_LIMIT
549+
@support.requires_resource('cpu')
550+
def test_large_size(self):
551+
n = support.exceeds_recursion_limit()
551552
names = list(set(''.join([choice(string.ascii_letters)
552553
for j in range(10)]) for i in range(n)))
553554
n = len(names)
@@ -1150,6 +1151,7 @@ class NonCol(ColImpl):
11501151
self.assertFalse(issubclass(NonCol, Collection))
11511152
self.assertFalse(isinstance(NonCol(), Collection))
11521153

1154+
11531155
def test_Iterator(self):
11541156
non_samples = [None, 42, 3.14, 1j, b"", "", (), [], {}, set()]
11551157
for x in non_samples:
@@ -1985,6 +1987,7 @@ def test_MutableSequence(self):
19851987
for sample in [list, bytearray, deque]:
19861988
self.assertIsInstance(sample(), MutableSequence)
19871989
self.assertTrue(issubclass(sample, MutableSequence))
1990+
self.assertTrue(issubclass(array.array, MutableSequence))
19881991
self.assertFalse(issubclass(str, MutableSequence))
19891992
self.validate_abstract_methods(MutableSequence, '__contains__', '__iter__',
19901993
'__len__', '__getitem__', '__setitem__', '__delitem__', 'insert')

Lib/test/test_dictviews.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import collections.abc
22
import copy
33
import pickle
4-
import sys
54
import unittest
6-
from test.support import C_RECURSION_LIMIT
5+
from test.support import get_c_recursion_limit
76

87
class DictSetTest(unittest.TestCase):
98

@@ -282,7 +281,7 @@ def test_recursive_repr(self):
282281
@unittest.expectedFailure
283282
def test_deeply_nested_repr(self):
284283
d = {}
285-
for i in range(C_RECURSION_LIMIT//2 + 100):
284+
for i in range(get_c_recursion_limit()//2 + 100):
286285
d = {42: d.values()}
287286
self.assertRaises(RecursionError, repr, d)
288287

0 commit comments

Comments
 (0)