Skip to content

Commit

Permalink
Merge pull request #120 from cloudblue/bug/LITE-28693-clean-error-mes…
Browse files Browse the repository at this point in the history
…sage-on-retry

LITE-28693: Cleaning error message after setting it for retry
  • Loading branch information
akodelia authored Oct 4, 2023
2 parents eae8e18 + 77018ff commit 4509ae4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions connect_ext_ppr/models/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 8 additions & 4 deletions tests/api/test_deployment_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -1296,6 +1296,7 @@ def test_abort_deployment_request_not_allow(


def test_retry_deployment_request_ok(
dbsession,
mocker,
deployment_factory,
deployment_request_factory,
Expand Down Expand Up @@ -1326,15 +1327,15 @@ 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!.',
type=Task.TYPES.product_setup,
started_at=started_at,
finished_at=finished_at,
)
task_factory(
t2 = task_factory(
deployment_request=dr1,
task_index='002',
status='error',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 4509ae4

Please sign in to comment.