From: Pablo Galindo Salgado <Pablogsal@gmail.com>
Date: Sun, 28 Dec 2025 12:52:32 +0000 (+0000)
Subject: gh-136186: Fix more flaky tests in test_external_inspection (#143235)
X-Git-Tag: v3.15.0a5~11^2~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=836b2810d501fafdefb619e282c745e7d1dfa90f;p=thirdparty%2FPython%2Fcpython.git

gh-136186: Fix more flaky tests in test_external_inspection (#143235)
---

diff --git a/Lib/test/test_external_inspection.py b/Lib/test/test_external_inspection.py
index b1a3a8e65a98..fe1b5fbe00bb 100644
--- a/Lib/test/test_external_inspection.py
+++ b/Lib/test/test_external_inspection.py
@@ -1752,7 +1752,12 @@ class TestGetStackTrace(RemoteInspectionTestBase):
                     unwinder_gil = RemoteUnwinder(
                         p.pid, only_active_thread=True
                     )
-                    gil_traces = _get_stack_trace_with_retry(unwinder_gil)
+                    # Use condition to retry until we capture a thread holding the GIL
+                    # (sampling may catch moments with no GIL holder on slow CI)
+                    gil_traces = _get_stack_trace_with_retry(
+                        unwinder_gil,
+                        condition=lambda t: sum(len(i.threads) for i in t) >= 1,
+                    )
 
                     # Count threads
                     total_threads = sum(