From c092711614b9b12df56869a95bc9609f913e7be3 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 29 Sep 2018 18:52:20 +0100
Subject: [PATCH] Events: tests.  Bug 2322

---
 test/confs/5705               | 32 ++++++++++++++++++++++++++++++++
 test/confs/5706               | 32 ++++++++++++++++++++++++++++++++
 test/log/5705                 | 12 ++++++++++++
 test/log/5706                 | 12 ++++++++++++
 test/scripts/5700-events/5705 |  5 +++++
 test/scripts/5700-events/5706 |  5 +++++
 6 files changed, 98 insertions(+)
 create mode 100644 test/confs/5705
 create mode 100644 test/confs/5706
 create mode 100644 test/log/5705
 create mode 100644 test/log/5706
 create mode 100644 test/scripts/5700-events/5705
 create mode 100644 test/scripts/5700-events/5706

diff --git a/test/confs/5705 b/test/confs/5705
new file mode 100644
index 000000000..9e9bbadb9
--- /dev/null
+++ b/test/confs/5705
@@ -0,0 +1,32 @@
+# Exim test configuration 5705
+
+.include DIR/aux-var/std_conf_prefix
+
+# ----- Main settings -----
+
+event_action = ${acl {logger}}
+
+# ----- ACL -----
+
+begin acl
+
+.include DIR/aux-fixed/event-logger-acl
+
+# ----- Routers -----
+
+begin routers
+
+filter_fail:
+  driver = redirect
+  local_parts = userx
+  allow_filter
+  allow_fail
+  user = EXIMUSER
+  data = :fail: this filter failed
+
+dump_bounces:
+  driver = redirect
+  senders = :
+  data = :blackhole:
+
+# End
diff --git a/test/confs/5706 b/test/confs/5706
new file mode 100644
index 000000000..e9275314e
--- /dev/null
+++ b/test/confs/5706
@@ -0,0 +1,32 @@
+# Exim test configuration 5706
+
+.include DIR/aux-var/std_conf_prefix
+
+# ----- Main settings -----
+
+event_action = ${acl {logger}}
+
+# ----- ACL -----
+
+begin acl
+
+.include DIR/aux-fixed/event-logger-acl
+
+# ----- Routers -----
+
+begin routers
+
+filter_file_fail:
+  driver = redirect
+  local_parts = userx
+  allow_filter
+  allow_fail
+  file = DIR/aux-fixed/TESTNUM.filter
+  user = EXIMUSER
+
+dump_bounces:
+  driver = redirect
+  senders = :
+  data = :blackhole:
+
+# End
diff --git a/test/log/5705 b/test/log/5705
new file mode 100644
index 000000000..f46f3f0ad
--- /dev/null
+++ b/test/log/5705
@@ -0,0 +1,12 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:fail:internal
+1999-03-02 09:44:33 10HmaX-0005vi-00 . local_part <userx> domain <domain1> reason <this filter failed>
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 R=filter_fail: this filter failed
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@the.local.host.name> R=dump_bounces
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmaY-0005vi-00 . finished: 10HmaY-0005vi-00
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmaX-0005vi-00 . finished: 10HmaX-0005vi-00
diff --git a/test/log/5706 b/test/log/5706
new file mode 100644
index 000000000..0bd93c3a9
--- /dev/null
+++ b/test/log/5706
@@ -0,0 +1,12 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:fail:internal
+1999-03-02 09:44:33 10HmaX-0005vi-00 . local_part <userx> domain <domain1> reason <failed in filter file>
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** userx@domain1 R=filter_file_fail: failed in filter file
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@the.local.host.name> R=dump_bounces
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmaY-0005vi-00 . finished: 10HmaY-0005vi-00
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 event msg:complete
+1999-03-02 09:44:33 10HmaX-0005vi-00 . finished: 10HmaX-0005vi-00
diff --git a/test/scripts/5700-events/5705 b/test/scripts/5700-events/5705
new file mode 100644
index 000000000..9142cc501
--- /dev/null
+++ b/test/scripts/5700-events/5705
@@ -0,0 +1,5 @@
+# Filter which triggers fail command results in event.
+#
+exim -odi userx@domain1
+Processed by a filter which triggers fail command.
+****
diff --git a/test/scripts/5700-events/5706 b/test/scripts/5700-events/5706
new file mode 100644
index 000000000..09410b5bd
--- /dev/null
+++ b/test/scripts/5700-events/5706
@@ -0,0 +1,5 @@
+# Filter file which triggers fail command results in event.
+#
+exim -odi userx@domain1
+Processed by a filter file which triggers fail command.
+****
-- 
2.25.1