Skip to content

Commit

Permalink
fix: fewer ipr bounce alerts (#7553)
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-richards committed Jun 17, 2024
1 parent 345c265 commit 2a90447
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
7 changes: 1 addition & 6 deletions ietf/ipr/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
14 changes: 1 addition & 13 deletions ietf/ipr/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
)

0 comments on commit 2a90447

Please sign in to comment.