Skip to content

Commit 48b5c42

Browse files
authored
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]
1 parent bac7d33 commit 48b5c42

File tree

2 files changed

+57
-21
lines changed

2 files changed

+57
-21
lines changed

Lib/test/libregrtest/refleak.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,21 @@ def dash_R(the_module, test, indirect_test, huntrleaks):
9393
rc_before = rc_after
9494
fd_before = fd_after
9595
print(file=sys.stderr)
96+
9697
# These checkers return False on success, True on failure
9798
def check_rc_deltas(deltas):
98-
return any(deltas)
99+
# bpo-30776: Try to ignore false positives:
100+
#
101+
# [3, 0, 0]
102+
# [0, 1, 0]
103+
# [8, -8, 1]
104+
#
105+
# Expected leaks:
106+
#
107+
# [5, 5, 6]
108+
# [10, 1, 1]
109+
return all(delta >= 1 for delta in deltas)
110+
99111
def check_alloc_deltas(deltas):
100112
# At least 1/3rd of 0s
101113
if 3 * deltas.count(0) < len(deltas):
@@ -104,14 +116,21 @@ def check_alloc_deltas(deltas):
104116
if not set(deltas) <= {1,0,-1}:
105117
return True
106118
return False
119+
120+
def check_fd_deltas(deltas):
121+
return any(deltas)
122+
107123
failed = False
108124
for deltas, item_name, checker in [
109125
(rc_deltas, 'references', check_rc_deltas),
110126
(alloc_deltas, 'memory blocks', check_alloc_deltas),
111-
(fd_deltas, 'file descriptors', check_rc_deltas)]:
127+
(fd_deltas, 'file descriptors', check_fd_deltas)
128+
]:
129+
# ignore warmup runs
130+
deltas = deltas[nwarmup:]
112131
if checker(deltas):
113132
msg = '%s leaked %s %s, sum=%s' % (
114-
test, deltas[nwarmup:], item_name, sum(deltas))
133+
test, deltas, item_name, sum(deltas))
115134
print(msg, file=sys.stderr, flush=True)
116135
with open(fname, "a") as refrep:
117136
print(msg, file=refrep)

Lib/test/test_regrtest.py

Lines changed: 35 additions & 18 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
@unittest.skipUnless(Py_DEBUG, 'need a debug build')
787821
def test_huntrleaks_fd_leak(self):
788822
# test --huntrleaks for file descriptor leak
@@ -807,24 +841,7 @@ def test_leak(self):
807841
fd = os.open(__file__, os.O_RDONLY)
808842
# bug: never cloes the file descriptor
809843
""")
810-
test = self.create_test('huntrleaks', code=code)
811-
812-
filename = 'reflog.txt'
813-
self.addCleanup(support.unlink, filename)
814-
output = self.run_tests('--huntrleaks', '3:3:', test,
815-
exitcode=2,
816-
stderr=subprocess.STDOUT)
817-
self.check_executed_tests(output, [test], failed=test)
818-
819-
line = 'beginning 6 repetitions\n123456\n......\n'
820-
self.check_line(output, re.escape(line))
821-
822-
line2 = '%s leaked [1, 1, 1] file descriptors, sum=3\n' % test
823-
self.assertIn(line2, output)
824-
825-
with open(filename) as fp:
826-
reflog = fp.read()
827-
self.assertIn(line2, reflog)
844+
self.check_leak(code, 'file descriptors')
828845

829846
def test_list_tests(self):
830847
# test --list-tests

0 commit comments

Comments
 (0)