Add transition from 'Bounced' to 'Delivered' (pypi#10378)

Author: di

tests/unit/email/ses/test_models.py

@@ -214,6 +214,17 @@ def test_complain_without_email_obj_and_with(self, db_session):
 
         assert em.missing
 
+    def test_delivery_after_hard_bounce(self, db_session):
+        email = EmailFactory.create(transient_bounces=3)
+        em = EmailMessageFactory.create(to=email.email)
+
+        status = EmailStatus.load(em)
+        status.bounce()
+        status.deliver()
+
+        assert email.transient_bounces == 0
+        assert not email.verified
+
     @pytest.mark.parametrize(
         "start_status",
         ["Accepted", "Delivered", "Bounced", "Soft Bounced", "Complained"],

warehouse/email/ses/models.py

@@ -177,6 +177,15 @@ def _reset_transient_bounce(self):
         collector=lambda iterable: list(iterable)[-1],
     )
 
+    # This happens sometimes. The email will stay unverfied, but this allows us
+    # to record the event
+    bounced.upon(
+        deliver,
+        enter=delivered,
+        outputs=[_reset_transient_bounce],
+        collector=lambda iterable: list(iterable)[-1],
+    )
+
     # Serialization / Deserialization
 
     @_machine.serializer()