Gitweb:
https://git.exim.org/exim.git/commitdiff/c092711614b9b12df56869a95bc9609f913e7be3
Commit: c092711614b9b12df56869a95bc9609f913e7be3
Parent: 4e9287801772d5aae181a9db0ef1dd1b514b2129
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Sep 29 18:52:20 2018 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sat Sep 29 18:52:20 2018 +0100
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(+)
diff --git a/test/confs/5705 b/test/confs/5705
new file mode 100644
index 0000000..9e9bbad
--- /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 0000000..e927531
--- /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 0000000..f46f3f0
--- /dev/null
+++ b/test/log/5705
@@ -0,0 +1,12 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? 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@???> 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 0000000..0bd93c3
--- /dev/null
+++ b/test/log/5706
@@ -0,0 +1,12 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@??? 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@???> 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 0000000..9142cc5
--- /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 0000000..09410b5
--- /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.
+****