summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEric Andresen <eandres@google.com>2015-10-27 14:10:32 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-10-27 14:15:25 +0000
commitfff1b30049ce36f176fd216d5dadf3f8f1f8474c (patch)
tree49c622eac8038f29596322951d2f1059044ef615 /test
parentf20904fa75635bc5f3ad69a51f6b34bd7f9cd163 (diff)
Manualroute: use same host for all RCPTs of a message, even under hosts_randomize. Bug 830
Patch from author adjusted by JH to retain MX priorities when /MX indirection is used.
Diffstat (limited to 'test')
-rw-r--r--test/confs/061335
-rw-r--r--test/log/06139
-rw-r--r--test/scripts/0000-Basic/061314
3 files changed, 58 insertions, 0 deletions
diff --git a/test/confs/0613 b/test/confs/0613
new file mode 100644
index 000000000..a42a8e9e2
--- /dev/null
+++ b/test/confs/0613
@@ -0,0 +1,35 @@
+# Exim test configuration 0613
+# manualroute, hosts_randomize and multiple recipients
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+mua_wrapper = true
+log_selector = +received_recipients
+
+# ----- Routers -----
+
+begin routers
+
+smarthost:
+ driver = manualroute
+ hosts_randomize = true
+ route_list = * "</ ten-2.test.ex:15600 / ten-3.test.ex:15600"
+ transport = remote_smtp
+ no_more
+
+# ----- Transports -----
+
+begin transports
+
+remote_smtp:
+ driver = smtp
+
+# End
diff --git a/test/log/0613 b/test/log/0613
new file mode 100644
index 000000000..6bbab6433
--- /dev/null
+++ b/test/log/0613
@@ -0,0 +1,9 @@
+1999-03-02 09:44:33 "Network error" here is expected. We must not get an mua_wrapper fault.
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for a b c d
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-2.test.ex [V4NET.0.0.2] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=ten-3.test.ex [V4NET.0.0.3] Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** a@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** b@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@myhost.test.ex R=smarthost T=remote_smtp: Network Error
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/scripts/0000-Basic/0613 b/test/scripts/0000-Basic/0613
new file mode 100644
index 000000000..07616babe
--- /dev/null
+++ b/test/scripts/0000-Basic/0613
@@ -0,0 +1,14 @@
+# manualroute, hosts_randomize and multiple recipients
+#
+#
+exim -z '"Network error" here is expected. We must not get an mua_wrapper fault.'
+****
+#
+1
+exim -bm a b c d
+Subject: test
+
+data
+.
+****
+no_msglog_check