Final polishment

Author: vdusek

tests/integration/README.md

@@ -13,7 +13,17 @@ uv run poe integration-tests
 
 To run against a different environment, also set `APIFY_INTEGRATION_TESTS_API_URL`.
 
+## Structure
+
+| File | Description |
+| --- | --- |
+| `test_dataset.py` | Dataset operations |
+| `test_key_value_store.py` | Key-value store operations |
+| `test_request_queue.py` | Request queue operations |
+| `test_storages.py` | Cross-storage tests (aliases, unnamed defaults, explicit init) |
+
 ## Key fixtures
 
 - **`apify_client_async`** — A session-scoped `ApifyClientAsync` instance configured with the test token and API URL.
+- **`request_queue_apify`** — Creates a parametrized (`single`/`shared` access mode) Apify request queue on the platform, yields it, and drops it after the test. Defined in `conftest.py`.
 - **`prepare_test_env`** / **`_isolate_test_environment`** (autouse) — Resets global state and sets `APIFY_LOCAL_STORAGE_DIR` to a temporary directory before each test.

tests/integration/conftest.py

@@ -10,10 +10,13 @@
 from crawlee import service_locator
 
 import apify._actor
+from apify import Actor
+from apify.storage_clients import ApifyStorageClient
 from apify.storage_clients._apify._alias_resolving import AliasResolver
+from apify.storages import RequestQueue
 
 if TYPE_CHECKING:
-    from collections.abc import Callable
+    from collections.abc import AsyncGenerator, Callable
     from pathlib import Path
 
 _TOKEN_ENV_VAR = 'APIFY_TEST_USER_API_TOKEN'
@@ -78,6 +81,19 @@ def _prepare_test_env() -> None:
     return _prepare_test_env
 
 
+@pytest.fixture(params=['single', 'shared'])
+async def request_queue_apify(
+    apify_token: str, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest
+) -> AsyncGenerator[RequestQueue]:
+    """Create an instance of the Apify request queue on the platform and drop it when the test is finished."""
+    monkeypatch.setenv(ApifyEnvVars.TOKEN, apify_token)
+
+    async with Actor:
+        rq = await RequestQueue.open(storage_client=ApifyStorageClient(request_queue_access=request.param))
+        yield rq
+        await rq.drop()
+
+
 @pytest.fixture(autouse=True)
 def _isolate_test_environment(prepare_test_env: Callable[[], None]) -> None:
     """Isolate the testing environment by resetting global state before each test.

tests/integration/test_key_value_store.py

@@ -10,6 +10,7 @@
 from ._utils import generate_unique_resource_name
 from apify import Actor
 from apify.storage_clients import ApifyStorageClient
+from apify.storage_clients._apify._alias_resolving import AliasResolver
 from apify.storages import KeyValueStore
 
 if TYPE_CHECKING:
@@ -87,6 +88,8 @@ async def test_set_value_in_one_context_and_get_value_in_another(
     service_locator._event_manager = None
     service_locator._storage_client = None
     service_locator.storage_instance_manager.clear_cache()
+    AliasResolver._alias_map = {}
+    AliasResolver._alias_init_lock = None
 
     # Second context: get the value
     try:
@@ -102,6 +105,8 @@ async def test_set_value_in_one_context_and_get_value_in_another(
         service_locator._event_manager = None
         service_locator._storage_client = None
         service_locator.storage_instance_manager.clear_cache()
+        AliasResolver._alias_map = {}
+        AliasResolver._alias_init_lock = None
         async with Actor:
             kvs3 = await Actor.open_key_value_store(id=kvs_id, force_cloud=True)
             await kvs3.drop()

tests/integration/test_request_queue.py

@@ -20,27 +20,12 @@
 from apify.storages import RequestQueue
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator
-
     from apify_client import ApifyClientAsync
     from crawlee._types import BasicCrawlingContext
 
     from apify.storage_clients._apify._models import ApifyRequestQueueMetadata
 
 
-@pytest.fixture(params=['single', 'shared'])
-async def request_queue_apify(
-    apify_token: str, monkeypatch: pytest.MonkeyPatch, request: pytest.FixtureRequest
-) -> AsyncGenerator[RequestQueue]:
-    """Create an instance of the Apify request queue on the platform and drop it when the test is finished."""
-    monkeypatch.setenv(ApifyEnvVars.TOKEN, apify_token)
-
-    async with Actor:
-        rq = await RequestQueue.open(storage_client=ApifyStorageClient(request_queue_access=request.param))
-        yield rq
-        await rq.drop()
-
-
 async def test_add_and_fetch_requests(request_queue_apify: RequestQueue) -> None:
     """Test basic functionality of adding and fetching requests."""
 
@@ -976,6 +961,7 @@ async def test_request_queue_has_stats(request_queue_apify: RequestQueue) -> Non
 
 
 async def test_rq_long_url(request_queue_apify: RequestQueue) -> None:
+    """Test handling of requests with long URLs and extended unique keys."""
     rq = request_queue_apify
     request = Request.from_url(
         'https://portal.isoss.gov.cz/irj/portal/anonymous/mvrest?path=/eosm-public-offer&officeLabels=%7B%7D&page=1&pageSize=100000&sortColumn=zdatzvsm&sortOrder=-1',

tests/integration/test_apify_storages.py tests/integration/test_storages.pytests/integration/test_apify_storages.py renamed to tests/integration/test_storages.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 
 import pytest