|
22 | 22 |
|
23 | 23 | if TYPE_CHECKING: |
24 | 24 | from apify_client import ApifyClient, ApifyClientAsync |
| 25 | + from apify_client._resource_clients.request_queue import RequestQueueClient, RequestQueueClientAsync |
25 | 26 | from apify_client._typeddicts import RequestDict, RequestDraftDeleteDict, RequestDraftDict |
26 | 27 |
|
27 | 28 |
|
| 29 | +async def ensure_queue_is_populated( |
| 30 | + rq_client: RequestQueueClient | RequestQueueClientAsync, |
| 31 | + *, |
| 32 | + expected_count: int, |
| 33 | + is_async: bool, |
| 34 | +) -> None: |
| 35 | + """Poll the queue until `expected_count` requests are visible. |
| 36 | +
|
| 37 | + Uses `list_head` (without side effects) so polling does not lock items, which would otherwise |
| 38 | + lead to an ambiguous count of actually-locked requests in tests that exercise locking. |
| 39 | + """ |
| 40 | + head_response: RequestQueueHead | None = None |
| 41 | + for _ in range(5): |
| 42 | + await maybe_sleep(1, is_async=is_async) |
| 43 | + result = await maybe_await(rq_client.list_head(limit=expected_count)) |
| 44 | + assert isinstance(result, RequestQueueHead) |
| 45 | + head_response = result |
| 46 | + if len(head_response.items) == expected_count: |
| 47 | + break |
| 48 | + |
| 49 | + assert head_response is not None |
| 50 | + assert len(head_response.items) == expected_count |
| 51 | + |
| 52 | + |
28 | 53 | async def test_request_queue_collection_list(client: ApifyClient | ApifyClientAsync) -> None: |
29 | 54 | """Test listing request queues.""" |
30 | 55 | rq_page = await maybe_await(client.request_queues().list(limit=10)) |
@@ -411,17 +436,11 @@ async def test_request_queue_list_and_lock_head(client: ApifyClient | ApifyClien |
411 | 436 | rq_client.add_request({'url': f'https://example.com/lock-{i}', 'unique_key': f'lock-{i}'}) |
412 | 437 | ) |
413 | 438 |
|
414 | | - # Poll until requests are available for locking (eventual consistency) |
415 | | - lock_response: LockedRequestQueueHead | None = None |
416 | | - for _ in range(5): |
417 | | - await maybe_sleep(1, is_async=is_async) |
418 | | - result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60))) |
419 | | - assert isinstance(result, LockedRequestQueueHead) |
420 | | - lock_response = result |
421 | | - if len(lock_response.items) == 3: |
422 | | - break |
| 439 | + await ensure_queue_is_populated(rq_client, expected_count=5, is_async=is_async) |
423 | 440 |
|
424 | | - assert lock_response is not None |
| 441 | + result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60))) |
| 442 | + assert isinstance(result, LockedRequestQueueHead) |
| 443 | + lock_response = result |
425 | 444 | assert len(lock_response.items) == 3 |
426 | 445 |
|
427 | 446 | # Verify requests are locked |
@@ -522,17 +541,11 @@ async def test_request_queue_unlock_requests(client: ApifyClient | ApifyClientAs |
522 | 541 | rq_client.add_request({'url': f'https://example.com/unlock-{i}', 'unique_key': f'unlock-{i}'}) |
523 | 542 | ) |
524 | 543 |
|
525 | | - # Poll until requests are available for locking (eventual consistency) |
526 | | - lock_response: LockedRequestQueueHead | None = None |
527 | | - for _ in range(5): |
528 | | - await maybe_sleep(1, is_async=is_async) |
529 | | - result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60))) |
530 | | - assert isinstance(result, LockedRequestQueueHead) |
531 | | - lock_response = result |
532 | | - if len(lock_response.items) == 3: |
533 | | - break |
| 544 | + await ensure_queue_is_populated(rq_client, expected_count=5, is_async=is_async) |
534 | 545 |
|
535 | | - assert lock_response is not None |
| 546 | + result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60))) |
| 547 | + assert isinstance(result, LockedRequestQueueHead) |
| 548 | + lock_response = result |
536 | 549 | assert len(lock_response.items) == 3 |
537 | 550 |
|
538 | 551 | # Unlock all requests |
|
0 commit comments