using prepared stmts and context managers in tests

Author: millerjp

BUILD_TEST_PROGRESS.md

@@ -26,3 +26,10 @@
   - black: ✅ 105 files would be left unchanged
   - isort: ✅ All checks passed
   - mypy: ✅ Success: no issues found in 12 source files
+
+#### 3. ✅ `make test-unit` - Completed
+- Fixed hanging tests by correcting mock future callback patterns:
+  - test_schema_changes.py::test_concurrent_ddl_operations
+  - test_session_edge_cases.py::test_execute_batch_statement
+- Key fix: Use `asyncio.get_running_loop().call_soon()` to delay callbacks
+- All 560 unit tests passing with coverage report generated

tests/unit/test_schema_changes.py

@@ -51,6 +51,46 @@ def add_callbacks(callback=None, errback=None):
         future.clear_callbacks = Mock()
         return future
 
+    def _create_mock_future(self, result=None, error=None):
+        """Create a properly configured mock future that simulates driver behavior."""
+        future = Mock()
+
+        # Store callbacks
+        callbacks = []
+        errbacks = []
+
+        def add_callbacks(callback=None, errback=None):
+            if callback:
+                callbacks.append(callback)
+            if errback:
+                errbacks.append(errback)
+
+            # Delay the callback execution to allow AsyncResultHandler to set up properly
+            def execute_callback():
+                if error:
+                    if errback:
+                        errback(error)
+                else:
+                    if callback and result is not None:
+                        # For successful results, pass rows
+                        rows = getattr(result, "rows", [])
+                        callback(rows)
+
+            # Schedule callback for next event loop iteration
+            try:
+                loop = asyncio.get_running_loop()
+                loop.call_soon(execute_callback)
+            except RuntimeError:
+                # No event loop, execute immediately
+                execute_callback()
+
+        future.add_callbacks = add_callbacks
+        future.has_more_pages = False
+        future.timeout = None
+        future.clear_callbacks = Mock()
+
+        return future
+
     @pytest.mark.asyncio
     async def test_create_table_already_exists(self, mock_session):
         """Test handling of AlreadyExists errors during schema changes."""
@@ -115,14 +155,10 @@ def execute_async_side_effect(*args, **kwargs):
             query = args[0] if args else kwargs.get("query", "")
             ddl_operations.append(query)
 
-            # Create a successful future
-            future = Mock()
-            future.result = Mock(return_value=Mock(one=Mock(return_value=None)))
-            future.add_callbacks = Mock()
-            future.has_more_pages = False
-            future.timeout = None
-            future.clear_callbacks = Mock()
-            return future
+            # Use the same pattern as test_session_edge_cases
+            result = Mock()
+            result.rows = []  # DDL operations return no rows
+            return self._create_mock_future(result=result)
 
         mock_session.execute_async.side_effect = execute_async_side_effect
 

tests/unit/test_session_edge_cases.py

@@ -34,15 +34,24 @@ def add_callbacks(callback=None, errback=None):
             if errback:
                 errbacks.append(errback)
 
-            # Immediately call the appropriate callback
-            if error:
-                if errback:
-                    errback(error)
-            else:
-                if callback and result is not None:
-                    # For successful results, pass rows
-                    rows = getattr(result, "rows", [])
-                    callback(rows)
+            # Delay the callback execution to allow AsyncResultHandler to set up properly
+            def execute_callback():
+                if error:
+                    if errback:
+                        errback(error)
+                else:
+                    if callback and result is not None:
+                        # For successful results, pass rows
+                        rows = getattr(result, "rows", [])
+                        callback(rows)
+
+            # Schedule callback for next event loop iteration
+            try:
+                loop = asyncio.get_running_loop()
+                loop.call_soon(execute_callback)
+            except RuntimeError:
+                # No event loop, execute immediately
+                execute_callback()
 
         future.add_callbacks = add_callbacks
         future.has_more_pages = False