Skip to content

gh-136692:Improve test cleanup and thread handling in monitoring #136896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MengAiDev wants to merge 4 commits into from
Closed

gh-136692:Improve test cleanup and thread handling in monitoring #136896

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0c1c66
Commit message: Improve test cleanup and thread handling in monitorin…
Jul 21, 2025
945df52
add news
Jul 21, 2025
0c0f7c6
fix news
Jul 21, 2025
5b0f8a8
remove news
Jul 21, 2025
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
Next Next commit
Commit message: Improve test cleanup and thread handling in monitorin… 
…g tests

- Replace manual thread alive checks with `join()` for reliability and efficiency
- Disable monitoring events after test to prevent resource leaks
- Fix race conditions by ensuring threads terminate before test completion
  • Loading branch information
MengAiDev MengAiDev
MengAiDev authored and MengAiDev committed Jul 21, 2025
commit f0c1c666026a593119291eb8304b3be9e89f8865
16 changes: 5 additions & 11 deletions Lib/test/test_free_threading/test_monitoring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,9 @@ def test_instrumentation(self):

self.after_threads()

while True:
any_alive = False
for t in threads:
if t.is_alive():
any_alive = True
break

if not any_alive:
break

self.during_threads()
# Fix：use join() instead of is_alive()
for t in threads:
t.join()

self.after_test()

Expand Down Expand Up @@ -130,6 +122,8 @@ def callback(self, *args):
self.called = True

def after_test(self):
# 修复：确保测试结束后监控被禁用
monitoring.set_events(self.tool_id, 0)
self.assertTrue(self.called)

def during_threads(self):
Expand Down