Testsuite: handle RC tagging convention

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 3a6e0b511182297325f4b4698492714369c8284e..648c7ae1c73bbf0b5f5b83559a3f0e9c53d7ba65 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -20,19 +20,21 @@ 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)
 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)

-SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
 [1.2.3.4] in helo_lookup_domains? no (end of list)
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
 set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]
 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
 [1.2.3.4] in helo_lookup_domains? no (end of list)
 sender_fullhost = ([1.2.3.4]) [1.2.3.4]
 sender_rcvhost = [1.2.3.4]
 set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]

-SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]\r
+SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]

 SMTP<< mail from:<a@b>
 SMTP<< mail from:<a@b>

-SMTP>> 250 OK\r
+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:<c@d>
 using ACL "rcpt"
 SMTP<< rcpt to:<c@d>
 using ACL "rcpt"

-processing "require"
+processing "require" (TESTSUITE/test-config 16)

 check logwrite = sender address is <$sender_address>
                = sender address is <a@b>
 LOG: MAIN
 check logwrite = sender address is <$sender_address>
                = sender address is <a@b>
 LOG: MAIN


@@ -40,7 +42,7 @@ LOG: MAIN
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b

-address match: subject=a@b pattern=a@b
+address match test: subject=a@b pattern=a@b

 b in "b"? yes (matched "b")
 a@b in "a@b"? yes (matched "a@b")
 LOG: address_rewrite MAIN
 b in "b"? yes (matched "b")
 a@b in "a@b"? yes (matched "a@b")
 LOG: address_rewrite MAIN


@@ -64,26 +66,30 @@ routed by r1 router
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b

-require: condition test succeeded
-processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+require: condition test succeeded in ACL "rcpt"
+processing "accept" (TESTSUITE/test-config 18)
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"

-processing "require"
+processing "require" (TESTSUITE/test-config 16)

 check logwrite = sender address is <$sender_address>
                = sender address is <rewritten-a@rewritten-b>
 LOG: MAIN
   sender address is <rewritten-a@rewritten-b>
 check verify = sender
 using cached sender verify result
 check logwrite = sender address is <$sender_address>
                = sender address is <rewritten-a@rewritten-b>
 LOG: MAIN
   sender address is <rewritten-a@rewritten-b>
 check verify = sender
 using cached sender verify result

-require: condition test succeeded
-processing "accept"
-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+require: condition test succeeded in ACL "rcpt"
+processing "accept" (TESTSUITE/test-config 18)
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP<< quit

-SMTP>> 221 the.local.host.name closing connection\r
+SMTP>> 221 the.local.host.name closing connection

 LOG: smtp_connection MAIN
   SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>