From 2a4e84600db4f0d7dd35e89d902ceeb8f754d02a Mon Sep 17 00:00:00 2001 From: "Anna (Anya) Parker" <50943381+anna-parker@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:47:12 +0200 Subject: [PATCH] Fix tests --- ena-submission/scripts/ena_submission_helper.py | 6 +++--- ena-submission/scripts/test_ena_submission.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ena-submission/scripts/ena_submission_helper.py b/ena-submission/scripts/ena_submission_helper.py index 319289299..2deeca6ef 100644 --- a/ena-submission/scripts/ena_submission_helper.py +++ b/ena-submission/scripts/ena_submission_helper.py @@ -92,8 +92,8 @@ def get_project_xml(project_set): response.raise_for_status() except requests.exceptions.RequestException as e: error_message = ( - f"Request failed with status:{response.status_code}, {e}. " - f"Response: {response.content}" + f"Request failed with status:{response.status_code}. Message: {e}. " + f"Response: {response.text}." ) logger.warning(error_message) errors.append(error_message) @@ -108,7 +108,7 @@ def get_project_xml(project_set): if not valid: raise requests.exceptions.RequestException except Exception as e: - error_message = f"Response is in unexpected format: {e} " f"Response: {response.content}" + error_message = f"Response is in unexpected format: {e}. " f"Response: {response.text}." errors.append(error_message) return CreationResults(results=None, errors=errors, warnings=warnings) project_results = { diff --git a/ena-submission/scripts/test_ena_submission.py b/ena-submission/scripts/test_ena_submission.py index 02ae5a995..17edd7839 100644 --- a/ena-submission/scripts/test_ena_submission.py +++ b/ena-submission/scripts/test_ena_submission.py @@ -83,7 +83,7 @@ def test_create_project_xml_failure(self, mock_post): mock_post.return_value = mock_requests_post(200, test_xml_failure_response) project_set = default_project_type() response = create_ena_project(test_config, project_set) - error_message_part = "Response is in unexpected format." + error_message_part = "Response is in unexpected format" self.assertIn(error_message_part, response.errors[0]) @mock.patch("requests.post") @@ -93,7 +93,7 @@ def test_create_project_server_failure(self, mock_post): mock_post.return_value.raise_for_status.side_effect = exceptions.RequestException() project_set = default_project_type() response = create_ena_project(test_config, project_set) - error_message_part = "Request failed with status:500." + error_message_part = "Request failed with status:500" self.assertIn(error_message_part, response.errors[0]) error_message_part = "Response: Internal Server Error" self.assertIn(error_message_part, response.errors[0])