Skip to content

Commit 9900e7b

Browse files
Tests are added
1 parent d78d7a5 commit 9900e7b

File tree

2 files changed

+38
-6
lines changed

2 files changed

+38
-6
lines changed

Lib/test/test_capi/test_tuple.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ class TupleSubclass(tuple):
1414

1515

1616
class CAPITest(unittest.TestCase):
17+
def _not_tracked(self, t):
18+
self.assertFalse(gc.is_tracked(t), t)
19+
20+
def _tracked(self, t):
21+
self.assertTrue(gc.is_tracked(t), t)
22+
1723
def test_check(self):
1824
# Test PyTuple_Check()
1925
check = _testlimitedcapi.tuple_check
@@ -52,11 +58,14 @@ def test_tuple_new(self):
5258
self.assertEqual(tup1, ())
5359
self.assertEqual(size(tup1), 0)
5460
self.assertIs(type(tup1), tuple)
61+
self._not_tracked(tup1)
62+
5563
tup2 = tuple_new(1)
5664
self.assertIs(type(tup2), tuple)
5765
self.assertEqual(size(tup2), 1)
5866
self.assertIsNot(tup2, tup1)
5967
self.assertTrue(checknull(tup2, 0))
68+
self._tracked(tup2)
6069

6170
self.assertRaises(SystemError, tuple_new, -1)
6271
self.assertRaises(SystemError, tuple_new, PY_SSIZE_T_MIN)
@@ -69,6 +78,12 @@ def test_tuple_fromarray(self):
6978
tup = tuple([i] for i in range(5))
7079
copy = tuple_fromarray(tup)
7180
self.assertEqual(copy, tup)
81+
self._tracked(copy)
82+
83+
tup = tuple(42**i for i in range(5))
84+
copy = tuple_fromarray(tup)
85+
self.assertEqual(copy, tup)
86+
self._not_tracked(copy)
7287

7388
tup = ()
7489
copy = tuple_fromarray(tup)
@@ -92,6 +107,10 @@ def test_tuple_pack(self):
92107
self.assertEqual(pack(1, [1]), ([1],))
93108
self.assertEqual(pack(2, [1], [2]), ([1], [2]))
94109

110+
self._tracked(pack(1, [1]))
111+
self._tracked(pack(2, [1], b'abc'))
112+
self._not_tracked(pack(2, 42, b'abc'))
113+
95114
self.assertRaises(SystemError, pack, PY_SSIZE_T_MIN)
96115
self.assertRaises(SystemError, pack, -1)
97116
self.assertRaises(MemoryError, pack, PY_SSIZE_T_MAX)

Lib/test/test_tuple.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ def test_repr(self):
290290
self.assertEqual(repr(a0), "()")
291291
self.assertEqual(repr(a2), "(0, 1, 2)")
292292

293+
def _not_tracked_instantly(self, t):
294+
self.assertFalse(gc.is_tracked(t), t)
295+
293296
def _not_tracked(self, t):
294297
# Nested tuples can take several collections to untrack
295298
gc.collect()
@@ -307,13 +310,17 @@ def test_track_literals(self):
307310
# Test GC-optimization of tuple literals
308311
x, y, z = 1.5, "a", []
309312

310-
self._not_tracked(())
311-
self._not_tracked((1,))
312-
self._not_tracked((1, 2))
313-
self._not_tracked((1, 2, "a"))
314-
self._not_tracked((1, 2, (None, True, False, ()), int))
315-
self._not_tracked((object(),))
313+
self._not_tracked_instantly(())
314+
self._not_tracked_instantly((1,))
315+
self._not_tracked_instantly((1, 2))
316+
self._not_tracked_instantly((1, 2, "a"))
317+
self._not_tracked_instantly((1, 2) * 5)
318+
self._not_tracked_instantly((12, 10**10, 'a_' * 100))
319+
self._not_tracked_instantly((object(),))
320+
316321
self._not_tracked(((1, x), y, (2, 3)))
322+
self._not_tracked((1, 2, (None, True, False, ()), int))
323+
self._not_tracked((object(), ()))
317324

318325
# Tuples with mutable elements are always tracked, even if those
319326
# elements are not tracked right now.
@@ -343,6 +350,12 @@ def check_track_dynamic(self, tp, always_track):
343350
self._tracked(tp(tuple([obj]) for obj in [x, y, z]))
344351
self._tracked(tuple(tp([obj]) for obj in [x, y, z]))
345352

353+
t = tp([1, x, y, z])
354+
self.assertEqual(type(t), tp)
355+
self._tracked(t)
356+
self.assertEqual(type(t[:]), tuple)
357+
self._tracked(t[:])
358+
346359
@support.cpython_only
347360
def test_track_dynamic(self):
348361
# Test GC-optimization of dynamically constructed tuples.

0 commit comments

Comments
 (0)