diff --git a/manager/api/tests/test_jira.py b/manager/api/tests/test_jira.py index f5e000fc..fa0025a4 100644 --- a/manager/api/tests/test_jira.py +++ b/manager/api/tests/test_jira.py @@ -366,6 +366,22 @@ def test_add_comment(self): assert jira_response.status_code == 200 assert jira_response.data["ack"] == "Jira comment created" + def test_add_comment_fail(self): + mock_jira_patcher = patch("requests.post") + mock_jira_client = mock_jira_patcher.start() + response = requests.Response() + response.status_code = 201 + mock_jira_client.return_value = response + + mock_time_lost_patcher = patch("manager.utils.update_time_lost") + mock_time_lost_client = mock_time_lost_patcher.start() + time_response = requests.Response() + time_response.status_code = 400 + mock_time_lost_client.return_value = time_response + + resp = jira_comment(self.jira_request_narrative_full_jira_comment.data) + assert resp.status_code == 400 + @patch.dict(os.environ, {"JIRA_API_HOSTNAME": "jira.lsstcorp.org"}) def test_handle_narrative_jira_payload(self): """Test call to function handle_jira_payload with all needed parameters @@ -378,6 +394,12 @@ def test_handle_narrative_jira_payload(self): response.json = lambda: {"key": "LOVE-XX"} mock_jira_client.return_value = response + mock_time_lost_patcher = patch("manager.utils.update_time_lost") + mock_time_lost_client = mock_time_lost_patcher.start() + time_response = requests.Response() + time_response.status_code = 200 + mock_time_lost_client.return_value = time_response + jira_response = handle_jira_payload(self.jira_request_narrative_full_jira_new) assert jira_response.status_code == 200 assert jira_response.data["ack"] == "Jira ticket created" diff --git a/manager/manager/utils.py b/manager/manager/utils.py index 92ae55f7..2c883b76 100644 --- a/manager/manager/utils.py +++ b/manager/manager/utils.py @@ -601,7 +601,6 @@ def jira_comment(request_data): } url = f"https://{os.environ.get('JIRA_API_HOSTNAME')}/rest/api/latest/issue/{jira_id}/comment" response = requests.post(url, json=jira_payload, headers=headers) - if "time_lost" in request_data: timelost_response = update_time_lost( jira_id=jira_id, add_time_lost=request_data.get("time_lost", 0.0)