Fix tests

Author: vdusek

tests/integration/actor/conftest.py

@@ -230,7 +230,7 @@ async def _make_actor(
                 {
                     'versionNumber': '0.0',
                     'buildTag': 'latest',
-                    'sourceType': VersionSourceType.SOURCE_FILES,
+                    'sourceType': VersionSourceType.SOURCE_FILES.value,
                     'sourceFiles': source_files_for_api,
                 }
             ],

tests/integration/actor/test_actor_api_helpers.py

@@ -4,7 +4,7 @@
 import json
 from typing import TYPE_CHECKING
 
-from apify_client._models import ActorPermissionLevel
+from apify_client._models import ActorJobStatus, ActorPermissionLevel
 from crawlee._utils.crypto import crypto_random_object_id
 
 from .._utils import generate_unique_resource_name
@@ -28,7 +28,7 @@ async def main() -> None:
     actor = await make_actor(label='is-at-home', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_actor_retrieves_env_vars(
@@ -52,7 +52,7 @@ async def main() -> None:
     actor = await make_actor(label='get-env', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_actor_creates_new_client_instance(
@@ -76,7 +76,7 @@ async def main() -> None:
     actor = await make_actor(label='new-client', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
     output_record = await actor.last_run().key_value_store().get_record('OUTPUT')
     assert output_record is not None
@@ -95,13 +95,13 @@ async def main() -> None:
     actor = await make_actor(label='set-status-message', main_func=main)
     run_result_1 = await run_actor(actor)
 
-    assert run_result_1.status == 'SUCCEEDED'
+    assert run_result_1.status == ActorJobStatus.SUCCEEDED
     assert run_result_1.status_message == 'testing-status-message'
     assert run_result_1.is_status_message_terminal is None
 
     run_result_2 = await run_actor(actor, run_input={'is_terminal': True})
 
-    assert run_result_2.status == 'SUCCEEDED'
+    assert run_result_2.status == ActorJobStatus.SUCCEEDED
     assert run_result_2.status_message == 'testing-status-message'
     assert run_result_2.is_status_message_terminal is True
 
@@ -145,7 +145,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status == ActorJobStatus.SUCCEEDED
 
     await inner_actor.last_run().wait_for_finish(wait_secs=600)
 
@@ -177,7 +177,7 @@ async def main_outer() -> None:
 
             inner_run_status = await Actor.apify_client.actor(inner_actor_id).last_run().get()
             assert inner_run_status is not None
-            assert inner_run_status.status == 'SUCCEEDED'
+            assert inner_run_status.status == ActorJobStatus.SUCCEEDED
 
     inner_actor = await make_actor(label='call-inner', main_func=main_inner)
     outer_actor = await make_actor(label='call-outer', main_func=main_outer)
@@ -193,7 +193,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status == ActorJobStatus.SUCCEEDED
 
     await inner_actor.last_run().wait_for_finish(wait_secs=600)
 
@@ -225,7 +225,7 @@ async def main_outer() -> None:
 
             inner_run_status = await Actor.apify_client.task(inner_task_id).last_run().get()
             assert inner_run_status is not None
-            assert inner_run_status.status == 'SUCCEEDED'
+            assert inner_run_status.status == ActorJobStatus.SUCCEEDED
 
     inner_actor = await make_actor(label='call-task-inner', main_func=main_inner)
     outer_actor = await make_actor(label='call-task-outer', main_func=main_outer)
@@ -248,7 +248,7 @@ async def main_outer() -> None:
         force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS,
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status == ActorJobStatus.SUCCEEDED
 
     await inner_actor.last_run().wait_for_finish(wait_secs=600)
 
@@ -290,7 +290,7 @@ async def main_outer() -> None:
         force_permission_level=ActorPermissionLevel.FULL_PERMISSIONS,
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status == ActorJobStatus.SUCCEEDED
 
     inner_actor_run_client = inner_actor.last_run()
     inner_actor_run = await inner_actor_run_client.wait_for_finish(wait_secs=600)
@@ -301,7 +301,7 @@ async def main_outer() -> None:
     inner_actor_run_dict = inner_actor_run.model_dump(by_alias=True)
     inner_actor_last_run = ActorRun.model_validate(inner_actor_run_dict)
 
-    assert inner_actor_last_run.status == 'ABORTED'
+    assert inner_actor_last_run.status == ActorJobStatus.ABORTED
 
     inner_output_record = await inner_actor.last_run().key_value_store().get_record('OUTPUT')
     assert inner_output_record is None
@@ -356,7 +356,7 @@ async def main_outer() -> None:
         run_input={'test_value': test_value, 'inner_actor_id': inner_actor_id},
     )
 
-    assert run_result_outer.status == 'SUCCEEDED'
+    assert run_result_outer.status == ActorJobStatus.SUCCEEDED
 
     outer_run_key_value_store = outer_actor.last_run().key_value_store()
 
@@ -394,7 +394,7 @@ async def main() -> None:
         run_input={'counter_key': 'reboot_counter'},
     )
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
     not_written_value = await actor.last_run().key_value_store().get_record('THIS_KEY_SHOULD_NOT_BE_WRITTEN')
     assert not_written_value is None
@@ -473,7 +473,7 @@ async def main_client() -> None:
         run_input={'server_actor_container_url': server_actor_container_url},
     )
 
-    assert ac_run_result.status == 'SUCCEEDED'
+    assert ac_run_result.status == ActorJobStatus.SUCCEEDED
 
     sa_run_client = server_actor.last_run()
     sa_run_client_run = await sa_run_client.wait_for_finish(wait_secs=600)
@@ -484,7 +484,7 @@ async def main_client() -> None:
     sa_run_client_run_dict = sa_run_client_run.model_dump(by_alias=True)
     sa_run_result = ActorRun.model_validate(sa_run_client_run_dict)
 
-    assert sa_run_result.status == 'SUCCEEDED'
+    assert sa_run_result.status == ActorJobStatus.SUCCEEDED
 
     webhook_body_record = await server_actor.last_run().key_value_store().get_record('WEBHOOK_BODY')
     assert webhook_body_record is not None

tests/integration/actor/test_actor_call_timeouts.py

@@ -3,6 +3,8 @@
 import asyncio
 from typing import TYPE_CHECKING
 
+from apify_client._models import ActorJobStatus
+
 from apify import Actor
 
 if TYPE_CHECKING:
@@ -53,7 +55,7 @@ async def main() -> None:
     actor = await make_actor(label='inherit-timeout', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_actor_call_inherit_timeout(
@@ -102,4 +104,4 @@ async def main() -> None:
     actor = await make_actor(label='remaining-timeout', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED

tests/integration/actor/test_actor_create_proxy_configuration.py

@@ -2,6 +2,8 @@
 
 from typing import TYPE_CHECKING
 
+from apify_client._models import ActorJobStatus
+
 from apify import Actor
 
 if TYPE_CHECKING:
@@ -30,7 +32,7 @@ async def main() -> None:
     actor = await make_actor(label='proxy-configuration', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_create_proxy_configuration_with_groups_and_country(
@@ -70,4 +72,4 @@ async def main() -> None:
     actor = await make_actor(label='proxy-configuration', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED

tests/integration/actor/test_actor_dataset.py

@@ -2,6 +2,7 @@
 
 from typing import TYPE_CHECKING
 
+from apify_client._models import ActorJobStatus
 from apify_shared.consts import ApifyEnvVars
 
 from .._utils import generate_unique_resource_name
@@ -29,7 +30,7 @@ async def main() -> None:
     actor = await make_actor(label='push-data', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
     list_page = await actor.last_run().dataset().list_items()
     assert list_page.items[0]['id'] == 0
@@ -48,7 +49,7 @@ async def main() -> None:
     actor = await make_actor(label='push-data-over-9mb', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
     async for item in actor.last_run().dataset().iterate_items():
         assert item['str'] == 'x' * 10000
@@ -71,7 +72,7 @@ async def main() -> None:
 
     actor = await make_actor(label='test_dataset_iter_items', main_func=main)
     run_result = await run_actor(actor)
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_same_references_in_default_dataset(
@@ -87,7 +88,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-same-ref-default', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_same_references_in_named_dataset(
@@ -115,7 +116,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-same-ref-named', main_func=main)
     run_result = await run_actor(actor, run_input={'datasetName': dataset_name})
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_force_cloud(
@@ -183,7 +184,7 @@ async def main() -> None:
     actor = await make_actor(label='dataset-defaults', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_dataset_aliases(
@@ -227,4 +228,4 @@ async def main() -> None:
     actor = await make_actor(label='dataset-aliases', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED

tests/integration/actor/test_actor_events.py

@@ -3,6 +3,7 @@
 import asyncio
 from typing import TYPE_CHECKING
 
+from apify_client._models import ActorJobStatus
 from apify_shared.consts import ActorEventTypes
 
 from apify import Actor
@@ -60,7 +61,7 @@ async def log_event(data: Any) -> None:
     actor = await make_actor(label='actor-interval-events', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
     dataset_items_page = await actor.last_run().dataset().list_items()
     persist_state_events = [
@@ -105,4 +106,4 @@ def count_event(data: Any) -> None:
     actor = await make_actor(label='actor-off-event', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED

tests/integration/actor/test_actor_key_value_store.py

@@ -2,6 +2,7 @@
 
 from typing import TYPE_CHECKING
 
+from apify_client._models import ActorJobStatus
 from apify_shared.consts import ApifyEnvVars
 
 from .._utils import generate_unique_resource_name
@@ -28,7 +29,7 @@ async def main() -> None:
     actor = await make_actor(label='kvs-same-ref-default', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_same_references_in_named_kvs(
@@ -56,7 +57,7 @@ async def main() -> None:
     actor = await make_actor(label='kvs-same-ref-named', main_func=main)
     run_result = await run_actor(actor, run_input={'kvsName': kvs_name})
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_force_cloud(
@@ -103,7 +104,7 @@ async def main() -> None:
     actor = await make_actor(label='actor-get-set-value', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_set_value_in_one_run_and_get_value_in_another(
@@ -117,7 +118,7 @@ async def main_set() -> None:
     actor_set = await make_actor(label='actor-set-value', main_func=main_set)
     run_result_set = await run_actor(actor_set)
 
-    assert run_result_set.status == 'SUCCEEDED'
+    assert run_result_set.status == ActorJobStatus.SUCCEEDED
 
     # Externally check if the value is present in key-value store
     test_record = await actor_set.last_run().key_value_store().get_record('test')
@@ -143,7 +144,7 @@ async def main_get() -> None:
 
     run_result_get = await run_actor(actor_get, run_input={'kvs-id': default_kvs_info.id})
 
-    assert run_result_get.status == 'SUCCEEDED'
+    assert run_result_get.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_actor_get_input_from_run(
@@ -194,7 +195,7 @@ async def main():
         },
     )
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_generate_public_url_for_kvs_record(
@@ -229,7 +230,7 @@ async def main() -> None:
     actor = await make_actor(label='kvs-get-public-url', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_kvs_defaults(
@@ -268,7 +269,7 @@ async def main() -> None:
     actor = await make_actor(label='kvs-defaults', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED
 
 
 async def test_kvs_aliases(
@@ -312,4 +313,4 @@ async def main() -> None:
     actor = await make_actor(label='kvs-aliases', main_func=main)
     run_result = await run_actor(actor)
 
-    assert run_result.status == 'SUCCEEDED'
+    assert run_result.status == ActorJobStatus.SUCCEEDED