Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions Lib/test/test_monitoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
import test.support
from test.support import import_helper, requires_specialization, script_helper

_testcapi = import_helper.import_module("_testcapi")
_testinternalcapi = import_helper.import_module("_testinternalcapi")

PAIR = (0,1)

def f1():
Expand Down Expand Up @@ -867,6 +864,8 @@ def test_implicit_stop_iteration(self):
This test checks that both paths record an equivalent event.
"""

_testinternalcapi = import_helper.import_module("_testinternalcapi")

def gen():
yield 1
return 2
Expand Down Expand Up @@ -1034,6 +1033,8 @@ def func():

@requires_specialization
def test_no_unwind_for_shim_frame(self):
_testinternalcapi = import_helper.import_module("_testinternalcapi")

class ValueErrorRaiser:
def __init__(self):
raise ValueError()
Expand Down Expand Up @@ -2455,6 +2456,7 @@ def run():
sys.monitoring.set_events(TEST_TOOL, 0)

def test_108390(self):
_testinternalcapi = import_helper.import_module("_testinternalcapi")

class Foo:
def __init__(self, set_event):
Expand Down Expand Up @@ -2546,6 +2548,8 @@ def test_func(x):
class TestTier2Optimizer(CheckEvents):

def test_monitoring_already_opimized_loop(self):
_testinternalcapi = import_helper.import_module("_testinternalcapi")

def test_func(recorder):
set_events = sys.monitoring.set_events
line = E.LINE
Expand Down Expand Up @@ -2582,18 +2586,20 @@ class TestCApiEventGeneration(MonitoringTestBase, unittest.TestCase):

class Scope:
def __init__(self, *args):
self._testcapi = import_helper.import_module("_testcapi")
self.args = args

def __enter__(self):
_testcapi.monitoring_enter_scope(*self.args)
self._testcapi.monitoring_enter_scope(*self.args)

def __exit__(self, *args):
_testcapi.monitoring_exit_scope()
self._testcapi.monitoring_exit_scope()

def setUp(self):
super(TestCApiEventGeneration, self).setUp()

capi = _testcapi
self._testcapi = import_helper.import_module("_testcapi")
capi = self._testcapi

self.codelike = capi.CodeLike(2)

Expand Down Expand Up @@ -2662,7 +2668,7 @@ def __call__(self, *args):
def test_fire_event(self):
for expected, event, function, *args in self.cases:
offset = 0
self.codelike = _testcapi.CodeLike(1)
self.codelike = self._testcapi.CodeLike(1)
with self.subTest(function.__name__):
args_ = (self.codelike, offset) + tuple(args)
self.check_event_count(event, function, args_, expected)
Expand All @@ -2673,7 +2679,7 @@ def test_missing_exception(self):
continue
assert args and isinstance(args[-1], BaseException)
offset = 0
self.codelike = _testcapi.CodeLike(1)
self.codelike = self._testcapi.CodeLike(1)
with self.subTest(function.__name__):
args_ = (self.codelike, offset) + tuple(args[:-1]) + (None,)
evt = int(math.log2(event))
Expand All @@ -2683,7 +2689,7 @@ def test_missing_exception(self):
def test_fire_event_failing_callback(self):
for expected, event, function, *args in self.cases:
offset = 0
self.codelike = _testcapi.CodeLike(1)
self.codelike = self._testcapi.CodeLike(1)
with self.subTest(function.__name__):
args_ = (self.codelike, offset) + tuple(args)
exc = OSError(42)
Expand Down Expand Up @@ -2733,12 +2739,14 @@ def check_disable(self, event, func, args, expected):
def test_disable_event(self):
for expected, event, function, *args in self.cases:
offset = 0
self.codelike = _testcapi.CodeLike(2)
self.codelike = self._testcapi.CodeLike(2)
with self.subTest(function.__name__):
args_ = (self.codelike, 0) + tuple(args)
self.check_disable(event, function, args_, expected)

def test_enter_scope_two_events(self):
_testcapi = self._testcapi

try:
yield_counter = CounterWithDisable()
unwind_counter = CounterWithDisable()
Expand Down
Loading