From 2bcab39fdb46cbc6e65ca345a44d8414bacbc1a0 Mon Sep 17 00:00:00 2001 From: Taegyun Kim Date: Tue, 20 Jan 2026 11:23:32 -0500 Subject: [PATCH 1/2] Revert "test(profiling): unflake `test_gunicorn`, again [backport 4.1] (#15942)" This reverts commit fc843c03fe0bba4eae928f6c21b064060f2a2eb1. --- tests/profiling/test_gunicorn.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/profiling/test_gunicorn.py b/tests/profiling/test_gunicorn.py index 85635e54fac..65e45da6de8 100644 --- a/tests/profiling/test_gunicorn.py +++ b/tests/profiling/test_gunicorn.py @@ -134,7 +134,7 @@ def _test_gunicorn( # when run on GitLab CI. We need to match either of these two. filename_regex = r"^(?:__init__\.py|gunicorn-app\.py)$" - expected_location = pprof_utils.StackLocation(function_name="fib", filename=filename_regex, line_no=8) + expected_location = pprof_utils.StackLocation(function_name="fib", filename=filename_regex, line_no=12) pprof_utils.assert_profile_has_sample( profile, From c302a4763305effe393a6ce739c6e4e926e7e15f Mon Sep 17 00:00:00 2001 From: Taegyun Kim Date: Tue, 20 Jan 2026 11:43:10 -0500 Subject: [PATCH 2/2] Mark test flaky --- tests/profiling/test_gunicorn.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/profiling/test_gunicorn.py b/tests/profiling/test_gunicorn.py index 65e45da6de8..b068b943181 100644 --- a/tests/profiling/test_gunicorn.py +++ b/tests/profiling/test_gunicorn.py @@ -134,7 +134,7 @@ def _test_gunicorn( # when run on GitLab CI. We need to match either of these two. filename_regex = r"^(?:__init__\.py|gunicorn-app\.py)$" - expected_location = pprof_utils.StackLocation(function_name="fib", filename=filename_regex, line_no=12) + expected_location = pprof_utils.StackLocation(function_name="fib", filename=filename_regex, line_no=8) pprof_utils.assert_profile_has_sample( profile, @@ -144,6 +144,7 @@ def _test_gunicorn( ) +@pytest.mark.skip(reason="flaky test on 4.1 branch") def test_gunicorn( gunicorn: RunGunicornFunc, tmp_path: pathlib.Path,