X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=test%2Fstderr%2F0092;h=690034aafbd96f1e27ccefdcafb06fad1284f95d;hp=197256b81a9fb3642348ccef701da899a6f30814;hb=8102279385f5f70c959aa219feca37031c0a1828;hpb=803628d5b0b175dfa78f0b19b35213ace01207b1

diff --git a/test/stderr/0092 b/test/stderr/0092
index 197256b81..690034aaf 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -16,16 +16,16 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> userx@test.ex in "verify@test.ex"? no (end of list)
 >>> deny: condition test failed in ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 31)
 >>> check domains = +local_domains
 >>> test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
@@ -35,12 +35,11 @@ LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<u
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
-DSN: fail_remote_domains propagating DSN
-DSN: forward propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [V4NET.0.0.1]
@@ -50,50 +49,52 @@ LOG: smtp_connection MAIN
   SMTP connection from [V4NET.0.0.1]
 host in host_lookup? no (option unset)
 set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
-considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-  expanding: V4NET.0.0.1
-     result: V4NET.0.0.1
-considering: $sender_host_address} {2} {30}}s
-  expanding: $sender_host_address
-     result: V4NET.0.0.1
-  condition: eq {V4NET.0.0.1} {$sender_host_address}
-     result: true
-considering: 2} {30}}s
-  expanding: 2
-     result: 2
-   scanning: 30}}s
-  expanding: 30
-     result: 30
-   skipping: result is not used
-  expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
-     result: 2s
+ ╭considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+  ╭considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+  ├──expanding: V4NET.0.0.1
+  ╰─────result: V4NET.0.0.1
+  ╭considering: $sender_host_address} {2} {30}}s
+  ├──expanding: $sender_host_address
+  ╰─────result: V4NET.0.0.1
+ ├──condition: eq {V4NET.0.0.1} {$sender_host_address}
+ ├─────result: true
+  ╭considering: 2} {30}}s
+  ├──expanding: 2
+  ╰─────result: 2
+  ╭───scanning: 30}}s
+  ├──expanding: 30
+  ├─────result: 30
+  ╰───skipping: result is not used
+ ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
+ ╰─────result: 2s
 host in host_reject_connection? no (option unset)
 host in sender_unqualified_hosts? no (option unset)
 host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-  expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-     result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:userx@test.ex
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:userx@test.ex
 using ACL "check_recipient"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 27)
 check hosts = :
 host in ":"? no (end of list)
 accept: condition test failed in ACL "check_recipient"
-processing "deny"
+processing "deny" (TESTSUITE/test-config 28)
   message: unrouteable address
 check recipients = verify@test.ex
 address match test: subject=userx@test.ex pattern=verify@test.ex
 userx@test.ex in "verify@test.ex"? no (end of list)
 deny: condition test failed in ACL "check_recipient"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 31)
 check domains = +local_domains
 test.ex in "test.ex : *.test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")
@@ -108,7 +109,7 @@ LOG: lost_incoming_connection MAIN
   SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 exim: timed out while reading - message abandoned
 exim: timed out while reading - message abandoned
 >>> host in hosts_connection_nolog? no (option unset)
@@ -120,11 +121,11 @@ exim: timed out while reading - message abandoned
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 28)
 >>>   message: unrouteable address
 >>> check recipients = verify@test.ex
 >>> test.ex in "test.ex"? yes (matched "test.ex")
@@ -160,3 +161,4 @@ The SMTP transaction started in line 0.
 The error was detected in line 3.
 0 previous messages were successfully processed.
 The rest of the batch was abandoned.
+exim: timed out while reading - message abandoned