Adapt to new test structure

Author: Pijukatel

src/apify/_actor.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import os
 import sys
 import warnings
 from contextlib import suppress
@@ -205,9 +204,9 @@ async def __aenter__(self) -> Self:
         if not Actor.is_at_home():
             # Make sure that the input related KVS is initialized to ensure that the input aware client is used
             await self.open_key_value_store()
-
-        # Load non-default aliased storages from configuration
-        #await AliasResolver.register_aliases(configuration=self.configuration)
+        else:
+            # Load non-default aliased storages from configuration
+            await AliasResolver.register_aliases(configuration=self.configuration)
         return self
 
     async def __aexit__(

src/apify/storage_clients/_apify/_alias_resolving.py

@@ -265,13 +265,13 @@ async def _get_default_kvs_client(configuration: Configuration) -> KeyValueStore
 
     @classmethod
     async def register_aliases(cls, configuration: Configuration) -> None:
-        """Load any alias mapping from configuration to the default kvs."""
+        """Load alias mapping from configuration to the default kvs."""
         if configuration.actor_storages is None:
             return
+
         configuration_mapping = {}
 
-        if configuration.default_dataset_id != configuration.actor_storages.datasets.get(
-            'default'):
+        if configuration.default_dataset_id != configuration.actor_storages.datasets.get('default'):
             logger.warning(
                 f'Conflicting default dataset ids: {configuration.default_dataset_id=},'
                 f" {configuration.actor_storages.datasets.get('default')=}"
@@ -291,12 +291,6 @@ async def register_aliases(cls, configuration: Configuration) -> None:
                     )._storage_key
                 ] = storage_id
 
-        # Aliased storage can be also default storage!!!
-        # Should we store such second alias to the default storage or ignore it in such case? Probably
-
-        # What if existing default dataset already has conflicting keys?
-        # Just override it, that will teach it to have conflicting values!
         client = await cls._get_default_kvs_client(configuration=configuration)
-        existing_mapping = ((await client.get_record(cls._ALIAS_MAPPING_KEY)) or {'value': {}}).get('value',
-                                                                                                    {})
+        existing_mapping = ((await client.get_record(cls._ALIAS_MAPPING_KEY)) or {'value': {}}).get('value', {})
         await client.set_record(cls._ALIAS_MAPPING_KEY, {**existing_mapping, **configuration_mapping})

tests/e2e/test_schema_storages/__init__.py

@@ -0,0 +1,24 @@
+{
+    "actorSpecification": 1,
+    "version": "0.0",
+    "storages": {
+        "datasets": {
+			"default": {
+                "actorSpecification": 1,
+				"fields": {
+					"properties": {
+						"id": { "type": "string" }
+					}
+				}
+            },
+			"custom": {
+                "actorSpecification": 1,
+                "fields": {
+					"properties": {
+						"id": { "type": "string" }
+					}
+				}
+            }
+        }
+    }
+}

tests/e2e/test_schema_storages/actor_source/actor.json

@@ -0,0 +1,7 @@
+from apify import Actor
+
+
+async def main() -> None:
+    async with Actor:
+        assert Actor.configuration.actor_storages
+        assert (await Actor.open_dataset(alias='custom')).id == Actor.configuration.actor_storages.datasets['custom']

tests/e2e/test_schema_storages/actor_source/main.py

@@ -0,0 +1,22 @@
+from pathlib import Path
+
+from tests.e2e.conftest import MakeActorFunction, RunActorFunction
+
+_ACTOR_SOURCE_DIR = Path(__file__).parent / 'actor_source'
+
+
+def read_actor_source(filename: str) -> str:
+    return (_ACTOR_SOURCE_DIR / filename).read_text()
+
+
+async def test_configuration_storages(make_actor: MakeActorFunction, run_actor: RunActorFunction) -> None:
+    actor = await make_actor(
+        label='schema_storages',
+        source_files={
+            'src/main.py': read_actor_source('main.py'),
+            '.actor/actor.json': read_actor_source('actor.json'),
+        },
+    )
+    run_result = await run_actor(actor)
+
+    assert run_result.status == 'SUCCEEDED'

tests/e2e/test_schema_storages/test_schema_storages.py

@@ -1,4 +1,3 @@
-import json
 from pathlib import Path
 
 import pytest
@@ -8,7 +7,6 @@
 from crawlee.configuration import Configuration as CrawleeConfiguration
 from crawlee.crawlers import BasicCrawler
 from crawlee.errors import ServiceConflictError
-from crawlee.storage_clients import MemoryStorageClient
 
 from apify import Actor
 from apify import Configuration as ApifyConfiguration