From 77018ff91fc5ac2035c52b4b8a24928e81b29f23 Mon Sep 17 00:00:00 2001 From: agostina Date: Wed, 4 Oct 2023 09:51:28 +0200 Subject: [PATCH] LITE-28693: Cleaning error message after setting it for retry --- connect_ext_ppr/models/task.py | 1 + tests/api/test_deployment_requests.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/connect_ext_ppr/models/task.py b/connect_ext_ppr/models/task.py index e1d40cd..37f8a81 100644 --- a/connect_ext_ppr/models/task.py +++ b/connect_ext_ppr/models/task.py @@ -45,5 +45,6 @@ def abort(self, by): @transition('status', target=STATUSES.pending, sources=[STATUSES.error]) def retry(self): + self.error_message = '' self.started_at = None self.finished_at = None diff --git a/tests/api/test_deployment_requests.py b/tests/api/test_deployment_requests.py index b47f14e..fe94f2a 100644 --- a/tests/api/test_deployment_requests.py +++ b/tests/api/test_deployment_requests.py @@ -1296,6 +1296,7 @@ def test_abort_deployment_request_not_allow( def test_retry_deployment_request_ok( + dbsession, mocker, deployment_factory, deployment_request_factory, @@ -1326,7 +1327,7 @@ def test_retry_deployment_request_ok( started_at=started_at, finished_at=finished_at, ) - task_factory( + t1 = task_factory( deployment_request=dr1, status='error', error_message='An Error!.', @@ -1334,7 +1335,7 @@ def test_retry_deployment_request_ok( started_at=started_at, finished_at=finished_at, ) - task_factory( + t2 = task_factory( deployment_request=dr1, task_index='002', status='error', @@ -1379,6 +1380,11 @@ def test_retry_deployment_request_ok( assert list(events.keys()) == ['created'] assert list(events['created'].keys()) == ['at', 'by'] + dbsession.refresh(t1) + dbsession.refresh(t2) + assert t1.error_message == '' + assert t2.error_message == '' + def test_retry_deployment_request_not_allow( deployment_factory, @@ -1417,8 +1423,6 @@ def test_retry_deployment_request_not_allow( def test_retry_deployment_request_w_newer_requests_fails( - dbsession, - mocker, deployment_factory, deployment_request_factory, installation,