◐ Shell
reader mode source ↗
Skip to content

Commit deaa294

Browse files
serhiy-storchakaserhiy-storchaka
committed
bpo-25130: Add calls of gc.collect() in tests to support PyPy
1 parent 28db1f6 commit deaa294

37 files changed

Lines changed: 149 additions & 16 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ def test_type_map_usage(self):
126126
con = sqlite.connect(":memory:",detect_types=sqlite.PARSE_DECLTYPES)
127127
con.execute("create table foo(bar timestamp)")
128128
con.execute("insert into foo(bar) values (?)", (datetime.datetime.now(),))
129-
con.execute(SELECT)
129+
con.execute(SELECT).close()
130130
con.execute("drop table foo")
131131
con.execute("create table foo(bar integer)")
132132
con.execute("insert into foo(bar) values (5)")
133-
con.execute(SELECT)
133+
con.execute(SELECT).close()
134134

135135
def test_bind_mutating_list(self):
136136
# Issue41662: Crash when mutate a list of parameters during iteration.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,8 @@ def test_lose_target_ref(self):
611611
del c
612612
p.start()
613613
p.join()
614+
for i in range(3):
615+
gc.collect()
614616
self.assertIs(wr(), None)
615617
self.assertEqual(q.get(), 5)
616618
close_queue(q)
@@ -2667,6 +2669,8 @@ def test_release_task_refs(self):
26672669
self.pool.map(identity, objs)
26682670

26692671
del objs
2672+
for i in range(3):
2673+
gc.collect()
26702674
time.sleep(DELTA) # let threaded cleanup code run
26712675
self.assertEqual(set(wr() for wr in refs), {None})
26722676
# With a process pool, copies of the objects are returned, check
@@ -4198,6 +4202,8 @@ def setUp(self):
41984202
util._finalizer_registry.clear()
41994203

42004204
def tearDown(self):
4205+
for i in range(3):
4206+
gc.collect()
42014207
self.assertFalse(util._finalizer_registry)
42024208
util._finalizer_registry.update(self.registry_backup)
42034209

@@ -4209,12 +4215,14 @@ class Foo(object):
42094215
a = Foo()
42104216
util.Finalize(a, conn.send, args=('a',))
42114217
del a # triggers callback for a
4218+
gc.collect()
42124219

42134220
b = Foo()
42144221
close_b = util.Finalize(b, conn.send, args=('b',))
42154222
close_b() # triggers callback for b
42164223
close_b() # does nothing because callback has already been called
42174224
del b # does nothing because callback has already been called
4225+
gc.collect()
42184226

42194227
c = Foo()
42204228
util.Finalize(c, conn.send, args=('c',))
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44

55
import os
6+
import gc
67
import sys
78
import time
89
from _thread import start_new_thread, TIMEOUT_MAX
@@ -221,6 +222,7 @@ def test_weakref_deleted(self):
221222
lock = self.locktype()
222223
ref = weakref.ref(lock)
223224
del lock
225+
gc.collect()
224226
self.assertIsNone(ref())
225227

226228

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,7 @@ def test_weakref(self):
10971097
p = weakref.proxy(s)
10981098
self.assertEqual(p.tobytes(), s.tobytes())
10991099
s = None
1100+
support.gc_collect()
11001101
self.assertRaises(ReferenceError, len, p)
11011102

11021103
@unittest.skipUnless(hasattr(sys, 'getrefcount'),
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import unittest
44

55
from test.support.import_helper import import_module
6+
from test.support import gc_collect
67
asyncio = import_module("asyncio")
78

89

@@ -871,6 +872,7 @@ async def run():
871872
await g.__anext__()
872873
await g.__anext__()
873874
del g
875+
gc_collect()
874876

875877
await asyncio.sleep(0.1)
876878

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,6 +2307,7 @@ async def coro():
23072307
self.new_task(self.loop, gen)
23082308
finally:
23092309
gen.close()
2310+
gc.collect()
23102311

23112312
self.assertTrue(m_log.error.called)
23122313
message = m_log.error.call_args[0][0]
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@
137137
except ImportError:
138138
ctypes = None
139139
from test.support import (run_doctest, run_unittest, cpython_only,
140-
check_impl_detail, requires_debug_ranges)
140+
check_impl_detail, requires_debug_ranges,
141+
gc_collect)
141142
from test.support.script_helper import assert_python_ok
142143

143144

@@ -510,6 +511,7 @@ def callback(code):
510511
coderef = weakref.ref(f.__code__, callback)
511512
self.assertTrue(bool(coderef()))
512513
del f
514+
gc_collect()
513515
self.assertFalse(bool(coderef()))
514516
self.assertTrue(self.called)
515517

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,7 @@ def test_thread_names_assigned(self):
463463
executor.map(abs, range(-5, 5))
464464
threads = executor._threads
465465
del executor
466+
support.gc_collect()
466467

467468
for t in threads:
468469
self.assertRegex(t.name, r'^SpecialPool_[0-4]$')
@@ -473,6 +474,7 @@ def test_thread_names_default(self):
473474
executor.map(abs, range(-5, 5))
474475
threads = executor._threads
475476
del executor
477+
support.gc_collect()
476478

477479
for t in threads:
478480
# Ensure that our default name is reasonably sane and unique when
@@ -535,6 +537,7 @@ def test_del_shutdown(self):
535537
call_queue = executor._call_queue
536538
executor_manager_thread = executor._executor_manager_thread
537539
del executor
540+
support.gc_collect()
538541

539542
# Make sure that all the executor resources were properly cleaned by
540543
# the shutdown process
@@ -759,13 +762,15 @@ def test_free_reference_yielded_future(self):
759762
futures_list.remove(future)
760763
wr = weakref.ref(future)
761764
del future
765+
support.gc_collect()
762766
self.assertIsNone(wr())
763767

764768
futures_list[0].set_result("test")
765769
for future in futures.as_completed(futures_list):
766770
futures_list.remove(future)
767771
wr = weakref.ref(future)
768772
del future
773+
support.gc_collect()
769774
self.assertIsNone(wr())
770775
if futures_list:
771776
futures_list[0].set_result("test")
@@ -865,6 +870,7 @@ def test_free_reference(self):
865870
for obj in self.executor.map(make_dummy_object, range(10)):
866871
wr = weakref.ref(obj)
867872
del obj
873+
support.gc_collect()
868874
self.assertIsNone(wr())
869875

870876

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from operator import le, lt, ge, gt, eq, ne
88

99
import unittest
10+
from test import support
1011

1112
order_comparisons = le, lt, ge, gt
1213
equality_comparisons = eq, ne
@@ -805,6 +806,7 @@ class C(object):
805806
self.assertEqual(v[c], d)
806807
self.assertEqual(len(v), 2)
807808
del c, d
809+
support.gc_collect()
808810
self.assertEqual(len(v), 1)
809811
x, y = C(), C()
810812
# The underlying containers are decoupled
@@ -834,6 +836,7 @@ def __init__(self, i):
834836
self.assertEqual(v[a].i, b.i)
835837
self.assertEqual(v[c].i, d.i)
836838
del c
839+
support.gc_collect()
837840
self.assertEqual(len(v), 1)
838841

839842
def test_deepcopy_weakvaluedict(self):
@@ -857,6 +860,7 @@ def __init__(self, i):
857860
self.assertIs(t, d)
858861
del x, y, z, t
859862
del d
863+
support.gc_collect()
860864
self.assertEqual(len(v), 1)
861865

862866
def test_deepcopy_bound_method(self):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,7 @@ def test_weakref(self):
870870
p = weakref.proxy(d)
871871
self.assertEqual(str(p), str(d))
872872
d = None
873+
support.gc_collect()
873874
self.assertRaises(ReferenceError, str, p)
874875

875876
def test_strange_subclass(self):

0 commit comments

Comments
 (0)