From: Victor Stinner <vstinner@redhat.com>
Date: Tue, 9 Apr 2019 16:26:16 +0000 (+0200)
Subject: bpo-36560: regrtest: don't collect the GC twice (GH-12747)
X-Git-Tag: v3.8.0a4~234
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb4447897a5f141eecf42987a1191a3330c5d7ed;p=thirdparty%2FPython%2Fcpython.git

bpo-36560: regrtest: don't collect the GC twice (GH-12747)

dash_R() function of libregrtest doesn't call support.gc_collect()
directly anymore: it's already called by dash_R_cleanup().

Call dash_R_cleanup() before starting the loop.
---

diff --git a/Lib/test/libregrtest/refleak.py b/Lib/test/libregrtest/refleak.py
index 0bb8a0a2bf08..235d6bfd3af6 100644
--- a/Lib/test/libregrtest/refleak.py
+++ b/Lib/test/libregrtest/refleak.py
@@ -82,12 +82,14 @@ def dash_R(ns, the_module, test_name, test_func):
         print(("1234567890"*(repcount//10 + 1))[:repcount], file=sys.stderr,
               flush=True)
 
+    dash_R_cleanup(fs, ps, pic, zdc, abcs)
+
     for i in rep_range:
         test_func()
         dash_R_cleanup(fs, ps, pic, zdc, abcs)
 
-        # Collect cyclic trash and read memory statistics immediately after.
-        support.gc_collect()
+        # dash_R_cleanup() ends with collecting cyclic trash:
+        # read memory statistics immediately after.
         alloc_after = getallocatedblocks()
         rc_after = gettotalrefcount()
         fd_after = fd_count()