chore(profiling): fix flaky test: 'test_upload_resets_profile'

Author: vlad-scherbich

tests/profiling_v2/collector/test_threading.py

@@ -5,6 +5,7 @@
 import os
 import sys
 import threading
+import time
 from typing import Callable
 from typing import List
 from typing import Optional
@@ -1022,6 +1023,10 @@ def test_upload_resets_profile(self) -> None:
         with self.collector_class(capture_pct=100):
             with self.lock_class():  # !CREATE! !ACQUIRE! !RELEASE! test_upload_resets_profile
                 pass
+
+        # Wait for collector to fully stop before uploading
+        time.sleep(0.05)
+
         ddup.upload()  # pyright: ignore[reportCallIssue]
 
         linenos: LineNo = get_lock_linenos("test_upload_resets_profile", with_stmt=True)
@@ -1049,20 +1054,19 @@ def test_upload_resets_profile(self) -> None:
             # This can be flaky due to timing or interference from other tests
             pytest.skip(f"Profile validation failed (known flaky on some platforms): {e}")
 
-        # Now we call upload() again without any new lock operations
-        # We expect the profile to be empty or contain no samples
+        # Now we call upload() again, and we expect the profile to be empty
+        num_files_before_second_upload: int = len(glob.glob(self.output_filename + ".*"))
+
         ddup.upload()  # pyright: ignore[reportCallIssue]
 
-        # Try to parse the newest profile - it should either not exist (no new file)
-        # or have no samples (which would raise AssertionError in parse_newest_profile)
-        try:
-            _ = pprof_utils.parse_newest_profile(self.output_filename)
-            # If we got here, a profile with samples exists
-            # This might be okay if other collectors are running
-            pytest.skip("Profile still has samples (possibly from other activity - known flaky)")
-        except (AssertionError, IndexError):
-            # Expected: no profile file or no samples
-            pass
+        time.sleep(0.05)
+
+        num_files_after_second_upload: int = len(glob.glob(self.output_filename + ".*"))
+
+        # If a new file was created, it means the profile was *not* empty, and an AssertionError is raised
+        if num_files_before_second_upload != num_files_after_second_upload:
+            with pytest.raises(AssertionError):
+                pprof_utils.parse_newest_profile(self.output_filename)
 
     def test_lock_hash(self) -> None:
         """Test that __hash__ allows profiled locks to be used in sets and dicts."""