Skip to content

Commit e0f8b43

Browse files
committed
bpo-30776: reduce regrtest -R false positives (#2422)
* Change the regrtest --huntrleaks checker to decide if a test file leaks or not. Require that each run leaks at least 1 reference. * Warmup runs are now completely ignored: ignored in the checker test and not used anymore to compute the sum. * Add an unit test for a reference leak. Example of reference differences previously considered a failure (leak) and now considered as success (success, no leak): [3, 0, 0] [0, 1, 0] [8, -8, 1] (cherry picked from commit 48b5c42)
1 parent 1f33857 commit e0f8b43

File tree

2 files changed

+52
-3
lines changed

2 files changed

+52
-3
lines changed

Lib/test/regrtest.py

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,9 +1521,21 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
15211521
alloc_deltas[i] = alloc_after - alloc_before
15221522
alloc_before, rc_before = alloc_after, rc_after
15231523
print(file=sys.stderr)
1524+
15241525
# These checkers return False on success, True on failure
15251526
def check_rc_deltas(deltas):
1526-
return any(deltas)
1527+
# bpo-30776: Try to ignore false positives:
1528+
#
1529+
# [3, 0, 0]
1530+
# [0, 1, 0]
1531+
# [8, -8, 1]
1532+
#
1533+
# Expected leaks:
1534+
#
1535+
# [5, 5, 6]
1536+
# [10, 1, 1]
1537+
return all(delta >= 1 for delta in deltas)
1538+
15271539
def check_alloc_deltas(deltas):
15281540
# At least 1/3rd of 0s
15291541
if 3 * deltas.count(0) < len(deltas):
@@ -1535,10 +1547,13 @@ def check_alloc_deltas(deltas):
15351547
failed = False
15361548
for deltas, item_name, checker in [
15371549
(rc_deltas, 'references', check_rc_deltas),
1538-
(alloc_deltas, 'memory blocks', check_alloc_deltas)]:
1550+
(alloc_deltas, 'memory blocks', check_alloc_deltas)
1551+
]:
1552+
# ignore warmup runs
1553+
deltas = deltas[nwarmup:]
15391554
if checker(deltas):
15401555
msg = '%s leaked %s %s, sum=%s' % (
1541-
test, deltas[nwarmup:], item_name, sum(deltas))
1556+
test, deltas, item_name, sum(deltas))
15421557
print(msg, file=sys.stderr)
15431558
sys.stderr.flush()
15441559
with open(fname, "a") as refrep:

Lib/test/test_regrtest.py

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,40 @@ def test_run(self):
783783
output = self.run_tests('--forever', test, exitcode=2)
784784
self.check_executed_tests(output, [test]*3, failed=test)
785785

786+
def check_leak(self, code, what):
787+
test = self.create_test('huntrleaks', code=code)
788+
789+
filename = 'reflog.txt'
790+
self.addCleanup(support.unlink, filename)
791+
output = self.run_tests('--huntrleaks', '3:3:', test,
792+
exitcode=2,
793+
stderr=subprocess.STDOUT)
794+
self.check_executed_tests(output, [test], failed=test)
795+
796+
line = 'beginning 6 repetitions\n123456\n......\n'
797+
self.check_line(output, re.escape(line))
798+
799+
line2 = '%s leaked [1, 1, 1] %s, sum=3\n' % (test, what)
800+
self.assertIn(line2, output)
801+
802+
with open(filename) as fp:
803+
reflog = fp.read()
804+
self.assertIn(line2, reflog)
805+
806+
@unittest.skipUnless(Py_DEBUG, 'need a debug build')
807+
def test_huntrleaks(self):
808+
# test --huntrleaks
809+
code = textwrap.dedent("""
810+
import unittest
811+
812+
GLOBAL_LIST = []
813+
814+
class RefLeakTest(unittest.TestCase):
815+
def test_leak(self):
816+
GLOBAL_LIST.append(object())
817+
""")
818+
self.check_leak(code, 'references')
819+
786820
def test_list_tests(self):
787821
# test --list-tests
788822
tests = [self.create_test() for i in range(5)]

0 commit comments

Comments
 (0)