From 7ea1237c783e380d7bdb86c90b13d8203c7ecf26 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Mon, 17 Sep 2018 00:20:24 +0100
Subject: Events: raise msg:fail:internal & msg:complete for -Mrm.  Bug 2310

---
 test/log/5700                 | 17 +++++++++++++++++
 test/scripts/5700-events/5700 | 20 ++++++++++++++++++++
 test/stdout/5700              |  3 +++
 3 files changed, 40 insertions(+)

(limited to 'test')

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 ... 
-- 
cgit v1.2.3