Spaces:
Paused
Paused
File size: 12,508 Bytes
a5784e9 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | """
Integration tests for queue disconnect detection and handling.
These tests verify that client disconnect detection works correctly with REAL
asyncio.Queue, catching edge cases that mocked tests miss.
"""
import asyncio
from typing import Any
from unittest.mock import AsyncMock, MagicMock
import pytest
from fastapi import HTTPException
# Test stub for QueueManager used in these tests
class QueueManager:
"""Functional stub class for queue management in tests."""
request_queue: Any = None
processing_lock: Any = None
logger: Any = None
async def check_queue_disconnects(self) -> Any:
"""Logic for checking disconnects in the queue."""
from api_utils.client_connection import check_client_connection
from api_utils.error_utils import client_disconnected
queue_size = self.request_queue.qsize()
items_to_requeue = []
for _ in range(queue_size):
try:
item = self.request_queue.get_nowait()
item_req_id = item.get("req_id")
if not item.get("cancelled", False):
item_http_req = item.get("http_request")
if item_http_req:
try:
# For testing purposes, we might want to see if it raises
if not await check_client_connection(
item_req_id, item_http_req
):
item["cancelled"] = True
item_fut = item.get("result_future")
if item_fut and not item_fut.done():
item_fut.set_exception(
client_disconnected(
item_req_id,
"Client disconnected while queued.",
)
)
except Exception as e:
if self.logger:
self.logger.error(
f"[{item_req_id}] Error in disconnect check: {e}"
)
items_to_requeue.append(item)
except asyncio.QueueEmpty:
break
for item in items_to_requeue:
await self.request_queue.put(item)
async def get_next_request(self) -> Any:
"""Get next request from queue with timeout."""
try:
return await asyncio.wait_for(self.request_queue.get(), timeout=5.0)
except asyncio.TimeoutError:
return None
@pytest.mark.integration
@pytest.mark.asyncio
async def test_check_queue_disconnects_real_queue(real_server_state, mock_http_request):
"""
Verify that check_queue_disconnects correctly identifies disconnected clients
using a REAL asyncio.Queue.
This tests the actual queue get/put behavior, not mocked calls.
"""
queue_manager = QueueManager()
queue_manager.request_queue = real_server_state.request_queue
queue_manager.logger = real_server_state.logger
# Create three items with different disconnect states
disconnected_req = MagicMock()
disconnected_req.is_disconnected = AsyncMock(return_value=True)
connected_req = MagicMock()
connected_req.is_disconnected = AsyncMock(return_value=False)
error_req = MagicMock()
error_req.is_disconnected = AsyncMock(side_effect=Exception("Check failed"))
items = [
{
"req_id": "disconnected",
"http_request": disconnected_req,
"cancelled": False,
"result_future": asyncio.Future(),
},
{
"req_id": "connected",
"http_request": connected_req,
"cancelled": False,
"result_future": asyncio.Future(),
},
{
"req_id": "error",
"http_request": error_req,
"cancelled": False,
"result_future": asyncio.Future(),
},
]
# Add items to REAL queue
for item in items:
await real_server_state.request_queue.put(item)
# Run check_queue_disconnects
await queue_manager.check_queue_disconnects()
# Verify queue state: all items should be requeued
assert real_server_state.request_queue.qsize() == 3
# Extract items from queue to verify their states
requeued_items = []
while not real_server_state.request_queue.empty():
item = await real_server_state.request_queue.get()
requeued_items.append(item)
# Find each item by req_id
disconnected_item = next(i for i in requeued_items if i["req_id"] == "disconnected")
connected_item = next(i for i in requeued_items if i["req_id"] == "connected")
error_item = next(i for i in requeued_items if i["req_id"] == "error")
# Verify disconnected item was marked cancelled and future set
assert disconnected_item["cancelled"] is True
assert disconnected_item["result_future"].done()
with pytest.raises(HTTPException) as exc:
disconnected_item["result_future"].result()
assert exc.value.status_code == 499
# Verify connected item unchanged
assert connected_item["cancelled"] is False
assert not connected_item["result_future"].done()
# Verify error item was requeued but not marked cancelled (exception caught)
assert not error_item["result_future"].done()
@pytest.mark.integration
@pytest.mark.asyncio
async def test_queue_fifo_order_maintained(real_server_state):
"""
Verify that queue maintains FIFO order with real asyncio.Queue.
This ensures request processing order is predictable.
"""
queue = real_server_state.request_queue
# Add items with specific order
for i in range(10):
await queue.put({"id": i, "timestamp": asyncio.get_event_loop().time()})
# Extract items and verify order
extracted = []
while not queue.empty():
item = await queue.get()
extracted.append(item["id"])
assert extracted == list(range(10)), "Queue did not maintain FIFO order"
@pytest.mark.integration
@pytest.mark.asyncio
async def test_queue_task_done_tracking(real_server_state):
"""
Verify that queue.task_done() works correctly with queue.join().
This is important for graceful shutdown and ensuring all requests are processed.
"""
queue = real_server_state.request_queue
# Add items
num_items = 5
for i in range(num_items):
await queue.put({"id": i})
async def worker():
"""Process all items and mark done."""
processed = []
for _ in range(num_items):
item = await queue.get()
processed.append(item["id"])
await asyncio.sleep(0.01) # Simulate processing
queue.task_done()
return processed
# Start worker and wait for all tasks to complete
worker_task = asyncio.create_task(worker())
# Wait for queue to be fully processed
await asyncio.wait_for(queue.join(), timeout=2.0)
# Verify all items were processed
processed = await worker_task
assert len(processed) == num_items
assert queue.empty()
@pytest.mark.integration
@pytest.mark.asyncio
async def test_queue_disconnect_during_processing(real_server_state):
"""
Verify that disconnect detection works even while items are being processed.
This simulates the race condition where a client disconnects after their
request is queued but before it starts processing.
"""
queue_manager = QueueManager()
queue_manager.request_queue = real_server_state.request_queue
queue_manager.logger = real_server_state.logger
queue_manager.processing_lock = real_server_state.processing_lock
# Create item that will disconnect during check
req = MagicMock()
req.is_disconnected = AsyncMock(return_value=False) # Initially connected
item = {
"req_id": "test",
"http_request": req,
"cancelled": False,
"result_future": asyncio.Future(),
}
await real_server_state.request_queue.put(item)
# Simulate disconnect happening between check_queue_disconnects and processing
async def delayed_disconnect():
await asyncio.sleep(0.05)
req.is_disconnected = AsyncMock(return_value=True)
disconnect_task = asyncio.create_task(delayed_disconnect())
# First check - should find it connected
await queue_manager.check_queue_disconnects()
# Wait for disconnect to happen
await disconnect_task
# Second check - should now find it disconnected
await queue_manager.check_queue_disconnects()
# Extract item
checked_item = await real_server_state.request_queue.get()
# Verify it was marked as cancelled
assert checked_item["cancelled"] is True
assert checked_item["result_future"].done()
@pytest.mark.integration
@pytest.mark.asyncio
async def test_queue_multiple_disconnects_batch(real_server_state):
"""
Verify that check_queue_disconnects handles multiple disconnected clients
correctly in a single check.
This tests batch processing efficiency.
"""
queue_manager = QueueManager()
queue_manager.request_queue = real_server_state.request_queue
queue_manager.logger = real_server_state.logger
# Create 10 items, half disconnected
items = []
for i in range(10):
is_disconnected = i % 2 == 0 # Even numbered are disconnected
req = MagicMock()
req.is_disconnected = AsyncMock(return_value=is_disconnected)
item = {
"req_id": f"req-{i}",
"http_request": req,
"cancelled": False,
"result_future": asyncio.Future(),
}
items.append(item)
await real_server_state.request_queue.put(item)
# Run check
await queue_manager.check_queue_disconnects()
# Extract and verify
requeued = []
while not real_server_state.request_queue.empty():
requeued.append(await real_server_state.request_queue.get())
# Count cancelled items
cancelled_count = sum(1 for item in requeued if item["cancelled"])
assert cancelled_count == 5 # Half should be cancelled
# Verify all disconnected items have futures set
for item in requeued:
if item["cancelled"]:
assert item["result_future"].done()
with pytest.raises(HTTPException) as exc:
item["result_future"].result()
assert exc.value.status_code == 499
@pytest.mark.integration
@pytest.mark.asyncio
async def test_get_next_request_timeout_real_queue(real_server_state):
"""
Verify that get_next_request properly times out with empty REAL queue.
This tests actual asyncio.wait_for behavior, not mocked timeouts.
"""
from unittest.mock import patch
queue_manager = QueueManager()
queue_manager.request_queue = real_server_state.request_queue
queue_manager.logger = real_server_state.logger
# Queue is empty, should timeout - use short timeout for fast testing
# Create a replacement wait_for that uses short timeout
original_wait_for = asyncio.wait_for
async def short_timeout_wait_for(coro, timeout):
# Use 0.1s timeout instead of 5s for faster test
return await original_wait_for(coro, timeout=0.1)
with patch(
"api_utils.queue_worker.asyncio.wait_for", side_effect=short_timeout_wait_for
):
start_time = asyncio.get_event_loop().time()
result = await queue_manager.get_next_request()
elapsed = asyncio.get_event_loop().time() - start_time
assert result is None
# Should timeout after ~0.1 seconds with patched timeout
assert elapsed < 0.5 # Allow margin for async overhead
@pytest.mark.integration
@pytest.mark.asyncio
async def test_get_next_request_returns_item_real_queue(real_server_state):
"""
Verify that get_next_request returns item from REAL queue.
"""
queue_manager = QueueManager()
queue_manager.request_queue = real_server_state.request_queue
queue_manager.logger = real_server_state.logger
# Add item
expected_item = {"req_id": "test", "data": "test_data"}
await real_server_state.request_queue.put(expected_item)
# Get item
result = await queue_manager.get_next_request()
assert result == expected_item
assert real_server_state.request_queue.empty()
|