diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-14 23:01:03 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-12-15 13:28:47 +0000 |
| commit | 78598e6a6a8cda8d1b50685188682749929df614 (patch) | |
| tree | b3c45b92b9be969ce712d39cdb2e543d7320198c /test | |
| parent | de41aff0511cad420dd1936b23dce61e04ce6ab4 (diff) | |
Events: add msg:defer Bug 2477
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-fixed/event-logger-acl | 4 | ||||
| -rwxr-xr-x | test/runtest | 2 | ||||
| -rw-r--r-- | test/scripts/5700-events/5700 | 22 |
3 files changed, 27 insertions, 1 deletions
diff --git a/test/aux-fixed/event-logger-acl b/test/aux-fixed/event-logger-acl index 980d47f11..15321724e 100644 --- a/test/aux-fixed/event-logger-acl +++ b/test/aux-fixed/event-logger-acl @@ -54,6 +54,10 @@ ev_msg: accept condition = ${if eq {$event_name}{msg:delivery}} acl = ev_msg_log delivery "confirmation <$event_data>" + accept condition = ${if eq {$event_name}{msg:defer}} + acl = ev_msg_log "message deferral" \ + "errno <$event_defer_errno> errstr <$event_data>" + accept condition = ${if eq {$event_name}{msg:host:defer}} acl = ev_msg_log "host deferral" \ "errno <$event_defer_errno> errstr <$event_data>" diff --git a/test/runtest b/test/runtest index d678abda6..14601c671 100755 --- a/test/runtest +++ b/test/runtest @@ -1830,7 +1830,7 @@ $munges = }, 'timeout_errno' => # actual errno differs Solaris vs. Linux - { 'mainlog' => 's/(host deferral .* errno) <\d+> /$1 <EEE> /' }, + { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' }, 'peer_terminated_conn' => # actual error differs FreedBSD vs. Linux { 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' }, diff --git a/test/scripts/5700-events/5700 b/test/scripts/5700-events/5700 index 89b0c5cd5..c6b6e76ff 100644 --- a/test/scripts/5700-events/5700 +++ b/test/scripts/5700-events/5700 @@ -102,6 +102,28 @@ QUIT **** exim -qqf **** +exim -odq userx@domain1 +A message which will get deferred after data +**** +server PORT_S +220 ESMTP +EHLO +250-OK +250 HELP +MAIL +250 OK +RCPT +250 OK +DATA +354 +. +450 post-data problem +QUIT +220 OK +**** +exim -qqf +**** +# # # # |