Testsuite: munge for error message sizes in retry records

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index c890a1f905eab2e623610d641e48500a33fdd431..dbcd3b5bde067ced95dcb3cb8641595e6e41b5e7 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -1,10 +1,11 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
+  uid=EXIM_UID gid=EXIM_GID pid=p1234

 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]


@@ -23,16 +24,21 @@ 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
 smtp_setup_msg entered
 SMTP<< helo [1.2.3.4]
 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?
+ list element: @
+ list element: @[]

 [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]
 SMTP<< mail from:<a@b>
 [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]
 SMTP<< mail from:<a@b>

+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>> 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


@@ -40,9 +46,13 @@ LOG: MAIN
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b

-address match: subject=a@b pattern=a@b
-b in "b"? yes (matched "b")
-a@b in "a@b"? yes (matched "a@b")
+a@b in "a@b"?
+ list element: a@b
+ address match test: subject=a@b pattern=a@b
+ b in "b"?
+  list element: b
+  b in "b"? yes (matched "b")
+ a@b in "a@b"? yes (matched "a@b")

 LOG: address_rewrite MAIN
   "a@b" from env-from rewritten as "rewritten-a@rewritten-b" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 LOG: address_rewrite MAIN
   "a@b" from env-from rewritten as "rewritten-a@rewritten-b" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -58,19 +68,20 @@ set transport t1
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL
 queued for t1 transport: local_part = rewritten-a
 domain = rewritten-b
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
 require: condition test succeeded in ACL "rcpt"
 routed by r1 router
   envelope to: rewritten-a@rewritten-b
   transport: t1
 ----------- 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"
 accept: condition test succeeded in ACL "rcpt"

+end of ACL "rcpt": ACCEPT

 SMTP>> 250 Accepted
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 SMTP>> 250 Accepted
 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


@@ -78,12 +89,13 @@ 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"
 accept: condition test succeeded in ACL "rcpt"

+end of ACL "rcpt": ACCEPT

 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
 SMTP>> 250 Accepted
 SMTP<< quit
 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
+  SMTP connection from ([1.2.3.4]) [1.2.3.4] D=qqs closed by QUIT

 search_tidyup called
 search_tidyup called

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