https://github.com/python/cpython/commit/a494a3dd8e0e74861972698c37b14a4087a4688c
commit: a494a3dd8e0e74861972698c37b14a4087a4688c
branch: main
author: Brett Simmers <[email protected]>
committer: carljm <[email protected]>
date: 2024-02-23T03:14:17Z
summary:
gh-115836: Don't use hardcoded line numbers in test_monitoring (#115837)
files:
M Lib/test/test_monitoring.py
diff --git a/Lib/test/test_monitoring.py b/Lib/test/test_monitoring.py
index 58aa4bca7534b1..2fd822036bcff5 100644
--- a/Lib/test/test_monitoring.py
+++ b/Lib/test/test_monitoring.py
@@ -35,6 +35,9 @@ def g1():
TEST_TOOL2 = 3
TEST_TOOL3 = 4
+def nth_line(func, offset):
+ return func.__code__.co_firstlineno + offset
+
class MonitoringBasicTest(unittest.TestCase):
def test_has_objects(self):
@@ -529,8 +532,8 @@ def test_lines_single(self):
f1()
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
- start =
LineMonitoringTest.test_lines_single.__code__.co_firstlineno
- self.assertEqual(events, [start+7, 16, start+8])
+ start = nth_line(LineMonitoringTest.test_lines_single, 0)
+ self.assertEqual(events, [start+7, nth_line(f1, 1), start+8])
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
@@ -547,8 +550,13 @@ def test_lines_loop(self):
floop()
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
- start = LineMonitoringTest.test_lines_loop.__code__.co_firstlineno
- self.assertEqual(events, [start+7, 23, 24, 23, 24, 23, start+8])
+ start = nth_line(LineMonitoringTest.test_lines_loop, 0)
+ floop_1 = nth_line(floop, 1)
+ floop_2 = nth_line(floop, 2)
+ self.assertEqual(
+ events,
+ [start+7, floop_1, floop_2, floop_1, floop_2, floop_1, start+8]
+ )
finally:
sys.monitoring.set_events(TEST_TOOL, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
@@ -569,8 +577,8 @@ def test_lines_two(self):
sys.monitoring.set_events(TEST_TOOL, 0);
sys.monitoring.set_events(TEST_TOOL2, 0)
sys.monitoring.register_callback(TEST_TOOL, E.LINE, None)
sys.monitoring.register_callback(TEST_TOOL2, E.LINE, None)
- start = LineMonitoringTest.test_lines_two.__code__.co_firstlineno
- expected = [start+10, 16, start+11]
+ start = nth_line(LineMonitoringTest.test_lines_two, 0)
+ expected = [start+10, nth_line(f1, 1), start+11]
self.assertEqual(events, expected)
self.assertEqual(events2, expected)
finally:
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
