Testsuite: testcases for bug 2538

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 9386dce11e41944ab8d3ede7f23210302a2868e1..d62ca39f33243c9bee23d55225e2ae4d9fff4db2 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -5,7 +5,6 @@ configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 admin user
 changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp

-DSN: r1 propagating DSN

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 sender_fullhost = [1.2.3.4]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@the.local.host.name
 sender_fullhost = [1.2.3.4]


@@ -35,7 +34,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<c@d>
 using ACL "rcpt"
 SMTP>> 250 OK
 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


@@ -68,14 +67,14 @@ routed by r1 router
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
 require: condition test succeeded in ACL "rcpt"
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
 require: condition test succeeded in ACL "rcpt"

-processing "accept"
+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"
 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"

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

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


@@ -83,7 +82,7 @@ LOG: MAIN
 check verify = sender
 using cached sender verify result
 require: condition test succeeded in ACL "rcpt"
 check verify = sender
 using cached sender verify result
 require: condition test succeeded in ACL "rcpt"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 18)

 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted


@@ -93,4 +92,4 @@ 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 (main) terminating with rc=0 >>>>>>>>>>>>>>>>