diff options
| author | Matthias Kurz <m.kurz@irregular.at> | 2018-09-17 00:20:24 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-09-17 00:21:30 +0100 |
| commit | 7ea1237c783e380d7bdb86c90b13d8203c7ecf26 (patch) | |
| tree | 5947b300ccc765f0b6fc6834bb27b96b02aaf99c /test | |
| parent | b291f3674ca1c65a744aedf846cd4ee4c8e00844 (diff) | |
Events: raise msg:fail:internal & msg:complete for -Mrm. Bug 2310
Diffstat (limited to 'test')
| -rw-r--r-- | test/log/5700 | 17 | ||||
| -rw-r--r-- | test/scripts/5700-events/5700 | 20 | ||||
| -rw-r--r-- | test/stdout/5700 | 3 |
3 files changed, 40 insertions, 0 deletions
diff --git a/test/log/5700 b/test/log/5700 index 56f997459..eda35bca7 100644 --- a/test/log/5700 +++ b/test/log/5700 @@ -96,3 +96,20 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 10HmbC-0005vi-00 event msg:complete 1999-03-02 09:44:33 10HmbC-0005vi-00 . finished: 10HmbC-0005vi-00 +1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbE-0005vi-00 . local_part <userx> domain <domain1> reason <message removed by CALLER> +1999-03-02 09:44:33 10HmbE-0005vi-00 event msg:complete +1999-03-02 09:44:33 10HmbE-0005vi-00 . finished: 10HmbE-0005vi-00 +1999-03-02 09:44:33 10HmbE-0005vi-00 removed by CALLER +1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbF-0005vi-00 address <usery@domain1> marked delivered by CALLER +1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbF-0005vi-00 . local_part <userx> domain <domain1> reason <message removed by CALLER> +1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:fail:internal +1999-03-02 09:44:33 10HmbF-0005vi-00 . local_part <userz> domain <domain1> reason <message removed by CALLER> +1999-03-02 09:44:33 10HmbF-0005vi-00 event msg:complete +1999-03-02 09:44:33 10HmbF-0005vi-00 . finished: 10HmbF-0005vi-00 +1999-03-02 09:44:33 10HmbF-0005vi-00 removed by CALLER +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed diff --git a/test/scripts/5700-events/5700 b/test/scripts/5700-events/5700 index 1fe31cbfc..42735dbc7 100644 --- a/test/scripts/5700-events/5700 +++ b/test/scripts/5700-events/5700 @@ -111,3 +111,23 @@ A message we will cancel from the queue **** exim -odi -Mg $msg1 **** +# +# +# +# +exim -odq userx@domain1 +A message we will remove from the queue +**** +exim -Mrm $msg1 +**** +# +# +# +# +exim -odq userx@domain1 usery@domain1 userz@domain1 +A message we will remove from the queue that has delivered recipients already. +**** +exim -Mmd $msg1 usery@domain1 +**** +exim -Mrm $msg1 +**** diff --git a/test/stdout/5700 b/test/stdout/5700 index a8f3b7482..066f6ceec 100644 --- a/test/stdout/5700 +++ b/test/stdout/5700 @@ -1,3 +1,6 @@ +Message 10HmbE-0005vi-00 has been removed +Message 10HmbF-0005vi-00 has been modified +Message 10HmbF-0005vi-00 has been removed ******** SERVER ******** Listening on port 1224 ... |