Testsuite: tidying

[exim.git] / test / confs / 0614

diff --git a/test/confs/0614 b/test/confs/0614
index 2b236174779845745d674f68a1d791a70369dec8..eec6d3259bc5478a45032bcbea21963a5bdb4b3f 100644 (file)
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,20 +1,57 @@
 # Exim test configuration 0614
-# hosts_connection_nolog versus sender_host lists caching
+# Add several messages going to the same location
+# And change smtp output based on senders domain
 
-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
-tls_advertise_hosts =
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *
+
+SERVER =
+
+.include DIR/aux-var/std_conf_prefix
+
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery
 
 # ----- Main settings -----
 
-log_selector = +smtp_connection
-hostlist nolog = 127.0.0.1
-hosts_connection_nolog = +nolog
+acl_smtp_rcpt = accept
+
 queue_only
+queue_run_in_order
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  transport = send_to_server
+
+server:
+  driver = accept
+  transport = send_to_server
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  connection_max_messages = 0
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+  hosts_try_fastopen = :
+  # assumes that HOSTIPV4 can send to 127.0.0.1
+  interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s
 
 # End
+