Skip to content

Commit 85b27a5

Browse files
committed
test: fix flaky test_request_queue_unlock_requests
1 parent fa24a21 commit 85b27a5

1 file changed

Lines changed: 26 additions & 14 deletions

File tree

‎tests/integration/test_request_queue.py‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -411,17 +411,23 @@ async def test_request_queue_list_and_lock_head(client: ApifyClient | ApifyClien
411411
rq_client.add_request({'url': f'https://example.com/lock-{i}', 'unique_key': f'lock-{i}'})
412412
)
413413

414-
# Poll until requests are available for locking (eventual consistency)
415-
lock_response: LockedRequestQueueHead | None = None
414+
# Poll (without side effects) until all requests are visible. Using `list_and_lock_head` for polling
415+
# would lock items across iterations, leading to an ambiguous count of actually-locked requests.
416+
head_response: RequestQueueHead | None = None
416417
for _ in range(5):
417418
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:
419+
result = await maybe_await(rq_client.list_head(limit=5))
420+
assert isinstance(result, RequestQueueHead)
421+
head_response = result
422+
if len(head_response.items) == 5:
422423
break
423424

424-
assert lock_response is not None
425+
assert head_response is not None
426+
assert len(head_response.items) == 5
427+
428+
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
429+
assert isinstance(result, LockedRequestQueueHead)
430+
lock_response = result
425431
assert len(lock_response.items) == 3
426432

427433
# Verify requests are locked
@@ -522,17 +528,23 @@ async def test_request_queue_unlock_requests(client: ApifyClient | ApifyClientAs
522528
rq_client.add_request({'url': f'https://example.com/unlock-{i}', 'unique_key': f'unlock-{i}'})
523529
)
524530

525-
# Poll until requests are available for locking (eventual consistency)
526-
lock_response: LockedRequestQueueHead | None = None
531+
# Poll (without side effects) until all requests are visible. Using `list_and_lock_head` for polling
532+
# would lock items across iterations, leading to an ambiguous count of actually-locked requests.
533+
head_response: RequestQueueHead | None = None
527534
for _ in range(5):
528535
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:
536+
result = await maybe_await(rq_client.list_head(limit=5))
537+
assert isinstance(result, RequestQueueHead)
538+
head_response = result
539+
if len(head_response.items) == 5:
533540
break
534541

535-
assert lock_response is not None
542+
assert head_response is not None
543+
assert len(head_response.items) == 5
544+
545+
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
546+
assert isinstance(result, LockedRequestQueueHead)
547+
lock_response = result
536548
assert len(lock_response.items) == 3
537549

538550
# Unlock all requests

0 commit comments

Comments
 (0)