testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 0557

diff --git a/test/confs/0557 b/test/confs/0557
index 3b134db345aadab9859ecfdf33f4f2aa827f3374..41a614f104b634df8ef1bbb3374b1dc67b7c94c5 100644 (file)
--- a/test/confs/0557
+++ b/test/confs/0557
@@ -1,18 +1,13 @@
 # Exim test configuration 0557
 
 # Exim test configuration 0557
 

-X=
-Y=
+FAKE=
+OPT=

 HOSTS=
 HAI=
 
 HOSTS=
 HAI=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -24,8 +19,8 @@ begin routers
 r1:
   driver = manualroute
   route_list = * HOSTS
 r1:
   driver = manualroute
   route_list = * HOSTS

-X host_find_failed = ignore
-Y host_all_ignored = HAI
+FAKE host_find_failed = ignore
+OPT  host_all_ignored = HAI

   no_more
   self = send
   transport = t1
   no_more
   self = send
   transport = t1


@@ -41,6 +36,7 @@ begin transports
 
 t1:
   driver = smtp
 
 t1:
   driver = smtp

+  hosts_try_fastopen = :

 
 t2:
   driver = appendfile
 
 t2:
   driver = appendfile