spamd: Use macro for default priority. Bug 2694

[users/heiko/exim.git] / test / stderr / 0391

diff --git a/test/stderr/0391 b/test/stderr/0391
index b1151181b24a53c94ee1242a6f319d83e25596cd..8bfb22897b9989554f2b8c448ab5b9c6f2c77f8a 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -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@myhost.test.ex
 sender_fullhost = [1.2.3.4]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@myhost.test.ex
 sender_fullhost = [1.2.3.4]


@@ -25,11 +24,11 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<U@W.x.y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 smtp_setup_msg entered
 SMTP<< mail from:<U@W.x.y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<B@a.b.c>
 using ACL "acl_rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<B@a.b.c>
 using ACL "acl_rcpt"

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

 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying U@W.x.y


@@ -51,7 +50,7 @@ r1 router called for U@x.y
 queued for <unset> transport: local_part = u
 domain = x.y
   errors_to=NULL
 queued for <unset> transport: local_part = u
 domain = x.y
   errors_to=NULL

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

 routed by r1 router
   envelope to: U@x.y
   transport: <none>
 routed by r1 router
   envelope to: U@x.y
   transport: <none>


@@ -60,10 +59,9 @@ sender U@W.x.y verified ok as U@x.y
 accept: condition test succeeded in ACL "acl_rcpt"
 end of ACL "acl_rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "acl_rcpt"
 end of ACL "acl_rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [1.2.3.4] closed by QUIT
 search_tidyup called
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from [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 >>>>>>>>>>>>>>>>