update changes related to field change in integration tests

Author: jatinriverlane

tests/integration/test_extensions_executor.py

@@ -52,7 +52,7 @@ async def test_extension_echo(
             "var7": "string2",
         },
     )
-    task_info = await _update_task_info(str(result.task_id), wait=True)
+    task_info = await _update_task_info(str(result.uuid), wait=True)
     assert task_info.status == "SUCCESS"
     assert task_info.result_code == 0
     assert (

tests/integration/test_graphql_tasks.py

@@ -40,7 +40,7 @@
     resultCode
     stdErr
     stdOut
-    taskId
+    uuid
     taskStatus
     createdBy
   }
@@ -54,7 +54,7 @@
       actionName
       endedAt
       taskStatus
-      taskId
+      uuid
       stdOut
       stdErr
       resultCode
@@ -85,7 +85,7 @@
   tasks(limit: 100, offset: 0, filters: {actionName: $actionName}) {
     tasksData {
       taskStatus
-      taskId
+      uuid
       stdOut
       stdErr
       resultCode
@@ -119,7 +119,7 @@
   tasks(limit: 100, offset: 0, filters: {extensionName: $extensionName}) {
     tasksData {
       taskStatus
-      taskId
+      uuid
       stdOut
       stdErr
       resultCode
@@ -151,7 +151,7 @@
   tasks(limit: 100, offset: 0, filters: {username: $username}) {
     tasksData {
       taskStatus
-      taskId
+      uuid
       stdOut
       stdErr
       resultCode
@@ -184,7 +184,7 @@
   tasks(limit: 100, offset: 0, filters: {experiment: {type: $type, value: $value}}) {
     tasksData {
       taskStatus
-      taskId
+      uuid
       stdOut
       stdErr
       resultCode
@@ -261,7 +261,7 @@
     resultCode
     stdErr
     stdOut
-    taskId
+    uuid
     taskStatus
     createdBy
   }
@@ -277,7 +277,7 @@
     resultCode
     stdErr
     stdOut
-    taskId
+    uuid
     taskStatus
     createdBy
     parameters {
@@ -342,7 +342,7 @@ async def test_execute_extension(
     )
     assert resp.errors is None
     res = resp.data["executeExtension"]
-    assert UUID(res["taskId"])
+    assert UUID(res["uuid"])
     assert res["taskStatus"] in ("SUCCESS", "STARTED", "PENDING")
 
 
@@ -366,8 +366,7 @@ async def test_cancel_task(
     schema = Schema(query=Query, mutation=Mutation)
     context = ServerContext(
         db_session=db_session,
-        user_info=UserInfo(
-            uuid=db_user.uuid, username=db_user.username, scopes=set(UserScope)),
+        user_info=UserInfo(uuid=db_user.uuid, username=db_user.username, scopes=set(UserScope)),
     )
     resp = await schema.execute(
         query=execute_extension_mutation,
@@ -387,7 +386,7 @@ async def test_cancel_task(
         },
         context_value=context,
     )
-    taskId = UUID(resp.data["executeExtension"]["taskId"])
+    taskId = UUID(resp.data["executeExtension"]["uuid"])
     assert isinstance(taskId, UUID)
     resp = await schema.execute(
         query=cancel_task_mutation,
@@ -396,7 +395,7 @@ async def test_cancel_task(
     )
 
     res = resp.data["cancelTask"]
-    assert UUID(res["taskId"])
+    assert UUID(res["uuid"])
 
     # TODO: if we don't wait, most probably this status
     # will be "PENDING", so after a cycle of waiting this will update
@@ -449,13 +448,13 @@ async def test_query_all_tasks(
             },
             context_value=context,
         )
-        taskId = UUID(resp.data["executeExtension"]["taskId"])
+        taskId = UUID(resp.data["executeExtension"]["uuid"])
         task_ids.append(taskId)
 
     resp = await schema.execute(all_tasks_query, context_value=context)
 
     assert resp.errors is None
-    resp_task_ids = [UUID(task["taskId"]) for task in resp.data["tasks"]["tasksData"]]
+    resp_task_ids = [UUID(task["uuid"]) for task in resp.data["tasks"]["tasksData"]]
     assert set(resp_task_ids) == set(task_ids)
 
 
@@ -504,7 +503,7 @@ async def test_query_all_tasks_filter_by_action_name(
             },
             context_value=context,
         )
-        taskId = UUID(resp.data["executeExtension"]["taskId"])
+        taskId = UUID(resp.data["executeExtension"]["uuid"])
         task_ids.append(taskId)
 
     resp = await schema.execute(
@@ -514,7 +513,7 @@ async def test_query_all_tasks_filter_by_action_name(
     )
 
     assert resp.errors is None
-    resp_task_ids = [UUID(task["taskId"]) for task in resp.data["tasks"]["tasksData"]]
+    resp_task_ids = [UUID(task["uuid"]) for task in resp.data["tasks"]["tasksData"]]
     assert set(resp_task_ids) == set(task_ids)
     users = [task["createdBy"] for task in resp.data["tasks"]["tasksData"]]
     assert set(users) == {db_user.username}
@@ -565,7 +564,7 @@ async def test_query_all_tasks_filter_by_extension_name(
             },
             context_value=context,
         )
-        taskId = UUID(resp.data["executeExtension"]["taskId"])
+        taskId = UUID(resp.data["executeExtension"]["uuid"])
         task_ids.append(taskId)
 
     resp = await schema.execute(
@@ -575,7 +574,7 @@ async def test_query_all_tasks_filter_by_extension_name(
     )
 
     assert resp.errors is None
-    resp_task_ids = [UUID(task["taskId"]) for task in resp.data["tasks"]["tasksData"]]
+    resp_task_ids = [UUID(task["uuid"]) for task in resp.data["tasks"]["tasksData"]]
     assert set(resp_task_ids) == set(task_ids)
 
 
@@ -608,13 +607,17 @@ async def test_query_all_tasks_filter_by_username(
     for idx in range(10):
         context = ServerContext(
             db_session=db_session,
-            user_info=UserInfo(uuid=db_user0.uuid, username=db_user0.username, scopes=set(UserScope)),
+            user_info=UserInfo(
+                uuid=db_user0.uuid, username=db_user0.username, scopes=set(UserScope)
+            ),
         )
         if idx > 7:
-          context = ServerContext(
-              db_session=db_session,
-              user_info=UserInfo(uuid=db_user1.uuid, username=db_user1.username, scopes=set(UserScope)),
-          )
+            context = ServerContext(
+                db_session=db_session,
+                user_info=UserInfo(
+                    uuid=db_user1.uuid, username=db_user1.username, scopes=set(UserScope)
+                ),
+            )
         resp = await schema.execute(
             query=execute_extension_mutation,
             variable_values={
@@ -633,9 +636,9 @@ async def test_query_all_tasks_filter_by_username(
             },
             context_value=context,
         )
-        taskId = UUID(resp.data["executeExtension"]["taskId"])
+        taskId = UUID(resp.data["executeExtension"]["uuid"])
         if idx <= 7:
-          task_ids.append(taskId)
+            task_ids.append(taskId)
 
     resp = await schema.execute(
         all_tasks_query_filter_by_username,
@@ -644,5 +647,5 @@ async def test_query_all_tasks_filter_by_username(
     )
 
     assert resp.errors is None
-    resp_task_ids = [UUID(task["taskId"]) for task in resp.data["tasks"]["tasksData"]]
+    resp_task_ids = [UUID(task["uuid"]) for task in resp.data["tasks"]["tasksData"]]
     assert set(resp_task_ids) == set(task_ids)

tests/integration/test_job_scopes.py

@@ -6,16 +6,17 @@
 
 import pytest
 import pytest_asyncio
-
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
-from aqueductcore.backend.errors import AQDPermission, AQDDBTaskNonExisting
 from aqueductcore.backend.context import UserInfo, UserScope
+from aqueductcore.backend.errors import AQDDBTaskNonExisting, AQDPermission
 from aqueductcore.backend.models import orm
 from aqueductcore.backend.models.experiment import ExperimentCreate
 from aqueductcore.backend.models.task import TaskCreate
 from aqueductcore.backend.services.task_executor import (
-    get_all_tasks, get_task_by_uuid, revoke_task,
+    get_all_tasks,
+    get_task_by_uuid,
+    revoke_task,
 )
 from aqueductcore.backend.services.utils import (
     experiment_model_to_orm,
@@ -171,7 +172,7 @@ async def test_user_can_see_a_task(
             ),
             db_session=my_db_session,
         )
-        assert task.task_id == str(task_id)
+        assert task.uuid == str(task_id)
     else:
         with pytest.raises(AQDPermission):
             await get_task_by_uuid(
@@ -219,7 +220,7 @@ async def test_user_can_cancel_tasks(
                     scopes=scope,
                 ),
                 db_session=my_db_session,
-                task_id=tasks_data[task_number].task_id,
+                task_id=tasks_data[task_number].uuid,
                 terminate=False,
             )
     else:
@@ -230,7 +231,7 @@ async def test_user_can_cancel_tasks(
                 scopes=scope,
             ),
             db_session=my_db_session,
-            task_id=tasks_data[task_number].task_id,
+            task_id=tasks_data[task_number].uuid,
             terminate=False,
         )
-        assert task.task_id == tasks_data[task_number].task_id
+        assert task.uuid == tasks_data[task_number].uuid