From d737bc2048954cc441a0d9a03d7e91fa77f5418a Mon Sep 17 00:00:00 2001 From: Jennifer Richards Date: Mon, 17 Jun 2024 17:00:30 -0300 Subject: [PATCH] fix: fewer ipr bounce alerts --- ietf/ipr/tests.py | 7 +------ ietf/ipr/utils.py | 14 +------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index e6964445dc..ae42f24442 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -789,12 +789,7 @@ def test_ingest_response_email(self, mock_process_response_email): mock_process_response_email.side_effect = None mock_process_response_email.return_value = None # rejected message - with self.assertRaises(EmailIngestionError) as context: - ingest_response_email(message) - self.assertIsNone(context.exception.email_recipients) # default recipients - self.assertIsNotNone(context.exception.email_body) # body set - self.assertIsNotNone(context.exception.email_original_message) # original message attached - self.assertEqual(context.exception.email_attach_traceback, True) + ingest_response_email(message) # should _not_ send an exception email on a clean rejection self.assertTrue(mock_process_response_email.called) self.assertEqual(mock_process_response_email.call_args, mock.call(message)) mock_process_response_email.reset_mock() diff --git a/ietf/ipr/utils.py b/ietf/ipr/utils.py index 06af1535f2..8a35927d12 100644 --- a/ietf/ipr/utils.py +++ b/ietf/ipr/utils.py @@ -92,7 +92,7 @@ def generate_draft_recursive_txt(): def ingest_response_email(message: bytes): from ietf.api.views import EmailIngestionError # avoid circular import try: - result = process_response_email(message) + process_response_email(message) except Exception as err: raise EmailIngestionError( "Datatracker IPR email ingestion error", @@ -104,15 +104,3 @@ def ingest_response_email(message: bytes): email_original_message=message, email_attach_traceback=True, ) from err - - if result is None: - raise EmailIngestionError( - "Datatracker IPR email ingestion rejected", - email_body=dedent("""\ - A message was rejected while ingesting IPR email into the Datatracker. The original message is attached. - - {error_summary} - """), - email_original_message=message, - email_attach_traceback=True, - )