From 2303cec11442f03cbee1b8c512d08e7cb676e4ee Mon Sep 17 00:00:00 2001 From: Valentin Rigal <rigal@teklia.com> Date: Tue, 18 May 2021 10:18:33 +0000 Subject: [PATCH] Send process_id when updating worker activity --- arkindex_worker/worker/__init__.py | 1 + tests/test_elements_worker/test_worker.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arkindex_worker/worker/__init__.py b/arkindex_worker/worker/__init__.py index 88bb5eb5..040b5b2c 100644 --- a/arkindex_worker/worker/__init__.py +++ b/arkindex_worker/worker/__init__.py @@ -189,6 +189,7 @@ class ElementsWorker( id=self.worker_version_id, body={ "element_id": str(element_id), + "process_id": self.process_information["id"], "state": state.value, }, ) diff --git a/tests/test_elements_worker/test_worker.py b/tests/test_elements_worker/test_worker.py index 8c4b6cef..998e3df3 100644 --- a/tests/test_elements_worker/test_worker.py +++ b/tests/test_elements_worker/test_worker.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# . -*- coding: utf-8 -*- import json import sys @@ -108,6 +108,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api): status=200, json={ "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": "processed", }, ) @@ -117,6 +118,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api): # Check the response received by worker assert out == { "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": "processed", } @@ -133,6 +135,7 @@ def test_update_call(responses, mock_elements_worker, mock_process_api): # Check the request sent by worker assert json.loads(responses.calls[-1].request.body) == { "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": "processed", } @@ -184,6 +187,7 @@ def test_run( status=200, json={ "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": "started", }, ) @@ -193,6 +197,7 @@ def test_run( status=200, json={ "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": final_state, }, ) @@ -232,10 +237,12 @@ def test_run( # Check the requests sent by worker assert json.loads(responses.calls[-2].request.body) == { "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": "started", } assert json.loads(responses.calls[-1].request.body) == { "element_id": "1234-deadbeef", + "process_id": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeffff", "state": final_state, } -- GitLab