altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

fix: fewer ipr bounce alerts (#7553)

Browse source
This commit is contained in:
Jennifer Richards 2024-06-17 18:57:56 -03:00 committed by GitHub
parent 345c2659b0
commit 2a90447a45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/ipr/tests.py
View file

@ -789,12 +789,7 @@ Subject: test
mock_process_response_email.side_effect = None mock_process_response_email.side_effect = None
mock_process_response_email.return_value = None # rejected message mock_process_response_email.return_value = None # rejected message
with self.assertRaises(EmailIngestionError) as context: ingest_response_email(message) # should _not_ send an exception email on a clean rejection
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)
self.assertTrue(mock_process_response_email.called) self.assertTrue(mock_process_response_email.called)
self.assertEqual(mock_process_response_email.call_args, mock.call(message)) self.assertEqual(mock_process_response_email.call_args, mock.call(message))
mock_process_response_email.reset_mock() mock_process_response_email.reset_mock()

14
ietf/ipr/utils.py
View file

@ -92,7 +92,7 @@ def generate_draft_recursive_txt():
def ingest_response_email(message: bytes): def ingest_response_email(message: bytes):
from ietf.api.views import EmailIngestionError # avoid circular import from ietf.api.views import EmailIngestionError # avoid circular import
try: try:
result = process_response_email(message) process_response_email(message)
except Exception as err: except Exception as err:
raise EmailIngestionError( raise EmailIngestionError(
"Datatracker IPR email ingestion error", "Datatracker IPR email ingestion error",
@ -104,15 +104,3 @@ def ingest_response_email(message: bytes):
email_original_message=message, email_original_message=message,
email_attach_traceback=True, email_attach_traceback=True,
) from err ) 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,
)