gh-106193: Rename and fix duplicated tests in test_monitoring (GH-109139)

This commit is contained in:
Hugo van Kemenade 2023-10-12 09:43:58 +02:00 committed by GitHub
parent 17d65547df
commit ea530f2f9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1185,7 +1185,7 @@ class TestLineAndInstructionEvents(CheckEvents):
sys.monitoring.set_events(TEST_TOOL, 0)
self.assertGreater(len(events), 0)
class TestInstallIncrementallly(MonitoringTestBase, unittest.TestCase):
class TestInstallIncrementally(MonitoringTestBase, unittest.TestCase):
def check_events(self, func, must_include, tool=TEST_TOOL, recorders=(ExceptionRecorder,)):
try:
@ -1214,19 +1214,19 @@ class TestInstallIncrementallly(MonitoringTestBase, unittest.TestCase):
MUST_INCLUDE_LI = [
('instruction', 'func1', 2),
('line', 'func1', 1),
('line', 'func1', 2),
('instruction', 'func1', 4),
('instruction', 'func1', 6)]
def test_line_then_instruction(self):
recorders = [ LineRecorder, InstructionRecorder ]
self.check_events(self.func1,
recorders = recorders, must_include = self.EXPECTED_LI)
recorders = recorders, must_include = self.MUST_INCLUDE_LI)
def test_instruction_then_line(self):
recorders = [ InstructionRecorder, LineRecorderLowNoise ]
recorders = [ InstructionRecorder, LineRecorder ]
self.check_events(self.func1,
recorders = recorders, must_include = self.EXPECTED_LI)
recorders = recorders, must_include = self.MUST_INCLUDE_LI)
@staticmethod
def func2():
@ -1241,12 +1241,12 @@ class TestInstallIncrementallly(MonitoringTestBase, unittest.TestCase):
def test_line_then_instruction(self):
def test_call_then_instruction(self):
recorders = [ CallRecorder, InstructionRecorder ]
self.check_events(self.func2,
recorders = recorders, must_include = self.MUST_INCLUDE_CI)
def test_instruction_then_line(self):
def test_instruction_then_call(self):
recorders = [ InstructionRecorder, CallRecorder ]
self.check_events(self.func2,
recorders = recorders, must_include = self.MUST_INCLUDE_CI)