From 37578f3e22257e2cf6ba65bd6c1def88ba738ca3 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 4 Jul 2025 10:11:19 -0500
Subject: [PATCH] fixes

---
 esphome/core/scheduler.cpp             |  3 +-
 tests/integration/test_defer_stress.py | 48 +++++++++++++++++++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 2086f5e3dd..1ebcc6339e 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -226,13 +226,14 @@ void HOT Scheduler::call() {
   // - No deferred items exist in to_add_, so processing order doesn't affect correctness
   while (!this->defer_queue_.empty()) {
     this->lock_.lock();
-    if (this->defer_queue_.empty()) {  // Double-check with lock held
+    if (this->defer_queue_.empty()) {
       this->lock_.unlock();
       break;
     }
     auto item = std::move(this->defer_queue_.front());
     this->defer_queue_.pop_front();
     this->lock_.unlock();
+
     // Skip if item was marked for removal or component failed
     if (!this->should_skip_item_(item.get())) {
       this->execute_item_(item.get());
diff --git a/tests/integration/test_defer_stress.py b/tests/integration/test_defer_stress.py
index 6dd9f15623..5e061e4651 100644
--- a/tests/integration/test_defer_stress.py
+++ b/tests/integration/test_defer_stress.py
@@ -2,6 +2,7 @@
 
 import asyncio
 from pathlib import Path
+import re
 
 from aioesphomeapi import UserService
 import pytest
@@ -29,14 +30,25 @@ async def test_defer_stress(
 
     # Create a future to signal test completion
     loop = asyncio.get_event_loop()
-    test_complete_future: asyncio.Future[bool] = loop.create_future()
+    test_complete_future: asyncio.Future[None] = loop.create_future()
+
+    # Track executed defers
+    executed_defers = set()
 
     def on_log_line(line: str) -> None:
-        if not test_complete_future.done():
-            if "✓ Stress test PASSED" in line:
-                test_complete_future.set_result(True)
-            elif "✗ Stress test FAILED" in line:
-                test_complete_future.set_result(False)
+        # Track all executed defers
+        match = re.search(r"Executed defer (\d+)", line)
+        if match:
+            defer_id = int(match.group(1))
+            executed_defers.add(defer_id)
+
+            # Check if we've executed all 1000 defers (0-999)
+            if (
+                defer_id == 999
+                and len(executed_defers) == 1000
+                and not test_complete_future.done()
+            ):
+                test_complete_future.set_result(None)
 
     async with (
         run_compiled(yaml_config, line_callback=on_log_line),
@@ -64,13 +76,25 @@ async def test_defer_stress(
         # Call the run_stress_test service to start the test
         client.execute_service(run_stress_test_service, {})
 
-        # Wait for test completion
+        # Wait for all defers to execute (should be quick)
         try:
-            test_passed = await asyncio.wait_for(test_complete_future, timeout=15.0)
+            await asyncio.wait_for(test_complete_future, timeout=5.0)
         except asyncio.TimeoutError:
-            pytest.fail("Stress test did not complete within 15 seconds")
+            # Report how many we got
+            pytest.fail(
+                f"Stress test timed out. Only {len(executed_defers)} of 1000 defers executed. "
+                f"Missing IDs: {sorted(set(range(1000)) - executed_defers)[:10]}..."
+            )
 
-        # Verify the test passed
-        assert test_passed is True, (
-            "Stress test failed - defer() crashed or failed under thread pressure"
+        # Verify all defers executed
+        assert len(executed_defers) == 1000, (
+            f"Expected 1000 defers, got {len(executed_defers)}"
         )
+
+        # Verify we have all IDs from 0-999
+        expected_ids = set(range(1000))
+        missing_ids = expected_ids - executed_defers
+        assert not missing_ids, f"Missing defer IDs: {sorted(missing_ids)}"
+
+        # If we got here without crashing, the test passed
+        assert True, "Test completed successfully - all 1000 defers executed in order"