Skip to content

Commit f90bfd5

Browse files
committed
test: fix flaky test_request_queue_unlock_requests
The polling loop called `list_and_lock_head` repeatedly, which has the side effect of locking items. Across iterations the total set of actually-locked requests no longer matched the last response's items, causing `unlock_requests` to occasionally report a different count. Replace the polling with read-only `list_head` until all requests are visible, then call `list_and_lock_head` exactly once. Apply the same treatment to `test_request_queue_list_and_lock_head`, which shared the racy pattern.
1 parent 9cf3794 commit f90bfd5

1 file changed

Lines changed: 22 additions & 10 deletions

File tree

‎tests/integration/test_request_queue.py‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,21 @@ async def test_request_queue_list_and_lock_head(client: ApifyClient | ApifyClien
421421
rq_client.add_request({'url': f'https://example.com/lock-{i}', 'unique_key': f'lock-{i}'})
422422
)
423423

424-
# Poll until requests are available for locking (eventual consistency)
425-
lock_response: LockedRequestQueueHead | None = None
424+
# Poll (without side effects) until all requests are visible. Using `list_and_lock_head` for polling
425+
# would lock items across iterations, leading to an ambiguous count of actually-locked requests.
426+
head_response: RequestQueueHead | None = None
426427
for _ in range(5):
427428
await maybe_sleep(1, is_async=is_async)
428-
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
429-
lock_response = cast('LockedRequestQueueHead', result)
430-
if len(lock_response.items) == 3:
429+
result = await maybe_await(rq_client.list_head(limit=5))
430+
head_response = cast('RequestQueueHead', result)
431+
if len(head_response.items) == 5:
431432
break
432433

434+
assert head_response is not None
435+
assert len(head_response.items) == 5
436+
437+
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
438+
lock_response = cast('LockedRequestQueueHead', result)
433439
assert lock_response is not None
434440
assert len(lock_response.items) == 3
435441

@@ -530,15 +536,21 @@ async def test_request_queue_unlock_requests(client: ApifyClient | ApifyClientAs
530536
rq_client.add_request({'url': f'https://example.com/unlock-{i}', 'unique_key': f'unlock-{i}'})
531537
)
532538

533-
# Poll until requests are available for locking (eventual consistency)
534-
lock_response: LockedRequestQueueHead | None = None
539+
# Poll (without side effects) until all requests are visible. Using `list_and_lock_head` for polling
540+
# would lock items across iterations, leading to an ambiguous count of actually-locked requests.
541+
head_response: RequestQueueHead | None = None
535542
for _ in range(5):
536543
await maybe_sleep(1, is_async=is_async)
537-
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
538-
lock_response = cast('LockedRequestQueueHead', result)
539-
if len(lock_response.items) == 3:
544+
result = await maybe_await(rq_client.list_head(limit=5))
545+
head_response = cast('RequestQueueHead', result)
546+
if len(head_response.items) == 5:
540547
break
541548

549+
assert head_response is not None
550+
assert len(head_response.items) == 5
551+
552+
result = await maybe_await(rq_client.list_and_lock_head(limit=3, lock_duration=timedelta(seconds=60)))
553+
lock_response = cast('LockedRequestQueueHead', result)
542554
assert lock_response is not None
543555
assert len(lock_response.items) == 3
544556

0 commit comments

Comments
 (0)