Skip to content
Snippets Groups Projects
Commit 76e7feb5 authored by Yoann Schneider's avatar Yoann Schneider :tennis: Committed by Bastien Abadie
Browse files

Use Worker Run

parent bc6b9b9a
No related branches found
No related tags found
1 merge request!388Use Worker Run
Pipeline #129916 passed
......@@ -281,7 +281,7 @@ class ElementsWorker(
try:
self.request(
"UpdateWorkerActivity",
id=self.worker_version_id,
id=self.worker_run_id,
body={
"element_id": str(element_id),
"process_id": self.process_information["id"],
......
......@@ -196,7 +196,7 @@ def mock_activity_calls(responses):
"""
responses.add(
responses.PUT,
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
status=200,
)
......
......@@ -110,7 +110,7 @@ def test_update_call(responses, mock_elements_worker, mock_worker_run_api):
"""Test an update call with feature enabled triggers an API call"""
responses.add(
responses.PUT,
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
status=200,
json={
"element_id": "1234-deadbeef",
......@@ -130,7 +130,7 @@ def test_update_call(responses, mock_elements_worker, mock_worker_run_api):
] == BASE_API_CALLS + [
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
]
......@@ -190,11 +190,11 @@ def test_run(
("GET", "http://testserver/api/v1/element/1234-deadbeef/"),
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
]
......@@ -243,7 +243,7 @@ def test_start_activity_conflict(
# Mock a "normal" conflict during in activity update, which returns the Exception
responses.add(
responses.PUT,
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
body=ErrorResponse(
title="conflict",
status_code=409,
......@@ -263,7 +263,7 @@ def test_start_activity_conflict(
("GET", "http://testserver/api/v1/element/1234-deadbeef/"),
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
]
assert logger.info.call_args_list[:2] == [
......@@ -281,7 +281,7 @@ def test_start_activity_error(
# Mock a random error occurring during the activity update
responses.add(
responses.PUT,
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
body=Exception("A wild Petilil appears !"),
)
from arkindex_worker.worker import logger
......@@ -297,12 +297,12 @@ def test_start_activity_error(
("GET", "http://testserver/api/v1/element/1234-deadbeef/"),
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
# Activity is updated to the "error" state regardless of the Exception occurring during the call
(
"PUT",
"http://testserver/api/v1/workers/versions/12341234-1234-1234-1234-123412341234/activity/",
"http://testserver/api/v1/workers/versions/56785678-5678-5678-5678-567856785678/activity/",
),
]
assert logger.error.call_args_list == [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment