Two-phase queue run perf: parallel processes for phase one

[users/jgh/exim.git] / test / stderr / 0094

diff --git a/test/stderr/0094 b/test/stderr/0094
index 81297b0639d6f295575b7b386468fe85d6c6fe45..26cf9160525e6be7a5fa3219b05b2bbbe5e820e3 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -9,31 +9,30 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> 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 23)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> check hosts = :
 >>> host in ":"? no (end of list)

->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check domains = +local_domains
 >>> cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> check domains = +local_domains
 >>> cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)

->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 25)

 >>> check hosts = +relay_hosts
 >>> sender host name required, to match against *.masq.test.ex
 >>> host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
 >>> host in "+relay_hosts"? no (end of list)
 >>> check hosts = +relay_hosts
 >>> sender host name required, to match against *.masq.test.ex
 >>> host in "*.masq.test.ex"? no (failed to find host name for V4NET.11.12.13)
 >>> host in "+relay_hosts"? no (end of list)

->>> accept: condition test failed
->>> processing "deny"
->>> deny: condition test succeeded
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 26)
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY

 LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
 LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1

->>> IP address lookup yielded ten-1.test.ex
-MUNGED: ::1 will be omitted in what follows
->>> get[host|ipnode]byname[2] looked up these IP addresses:
->>>   name=ten-1.test.ex address=V4NET.0.0.1
+>>> IP address lookup yielded "ten-1.test.ex"

 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)
 >>> checking addresses for ten-1.test.ex
 >>>   V4NET.0.0.1 OK
 >>> host in host_reject_connection? no (option unset)


@@ -43,22 +42,24 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "check_recipient"
 >>> 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 23)

 >>> check hosts = :
 >>> host in ":"? no (end of list)
 >>> check hosts = :
 >>> host in ":"? no (end of list)

->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check domains = +local_domains
 >>> cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)
 >>> check domains = +local_domains
 >>> cam.ac.uk in "test.ex"? no (end of list)
 >>> cam.ac.uk in "+local_domains"? no (end of list)

->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 25)

 >>> check hosts = +relay_hosts
 >>> host in "*.masq.test.ex"? no (end of list)
 >>> host in "+relay_hosts"? no (end of list)
 >>> check hosts = +relay_hosts
 >>> host in "*.masq.test.ex"? no (end of list)
 >>> host in "+relay_hosts"? no (end of list)

->>> accept: condition test failed
->>> processing "deny"
->>> deny: condition test succeeded
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "deny" (TESTSUITE/test-config 26)
+>>>   message: relay not permitted
+>>> deny: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": DENY

 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 Exim version x.yz ....
 changed uid/gid: forcing real = effective


@@ -67,6 +68,8 @@ 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

+seeking password data for user "CALLER": cache not available
+getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.99.99.90]
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 sender_fullhost = [V4NET.99.99.90]


@@ -78,25 +81,21 @@ host in host_lookup? yes (matched "0.0.0.0/0")
 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded
 looking up host name for V4NET.99.99.90
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) using fakens
 DNS lookup of 90.99.99.V4NET.in-addr.arpa (PTR) succeeded

-IP address lookup yielded host1.masq.test.ex
-  alias oneback.test.ex
-using host_fake_gethostbyname for host1.masq.test.ex (IPv4)
+IP address lookup yielded "oneback.test.ex"
+  alias "host1.masq.test.ex"
+DNS lookup of oneback.test.ex (A) using fakens
+DNS lookup of oneback.test.ex (A) succeeded
+oneback.test.ex V4NET.99.99.90 mx=-1 sort=xx 
+checking addresses for oneback.test.ex
+Forward DNS security status: unverified
+  V4NET.99.99.90 OK

 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded
 DNS lookup of host1.masq.test.ex (A) using fakens
 DNS lookup of host1.masq.test.ex (A) succeeded

-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=host1.masq.test.ex address=V4NET.90.90.90
+host1.masq.test.ex V4NET.90.90.90 mx=-1 sort=xx 

 checking addresses for host1.masq.test.ex
 checking addresses for host1.masq.test.ex

+Forward DNS security status: unverified

   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90
   V4NET.90.90.90
 no IP address for host1.masq.test.ex matched V4NET.99.99.90

-using host_fake_gethostbyname for oneback.test.ex (IPv4)
-DNS lookup of oneback.test.ex (A) using fakens
-DNS lookup of oneback.test.ex (A) succeeded
-MUNGED: ::1 will be omitted in what follows
-get[host|ipnode]byname[2] looked up these IP addresses:
-  name=oneback.test.ex address=V4NET.99.99.90
-checking addresses for oneback.test.ex
-  V4NET.99.99.90 OK

 sender_fullhost = oneback.test.ex [V4NET.99.99.90]
 sender_rcvhost = oneback.test.ex ([V4NET.99.99.90])
 set_process_info: pppp handling incoming connection from oneback.test.ex [V4NET.99.99.90]
 sender_fullhost = oneback.test.ex [V4NET.99.99.90]
 sender_rcvhost = oneback.test.ex ([V4NET.99.99.90])
 set_process_info: pppp handling incoming connection from oneback.test.ex [V4NET.99.99.90]


@@ -106,46 +105,52 @@ 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<< mail from:<userx@test.ex>
 smtp_setup_msg entered
 SMTP<< mail from:<userx@test.ex>

-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:<userx@test.ex>
 using ACL "check_recipient"
 SMTP<< rcpt to:<userx@test.ex>
 using ACL "check_recipient"

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

 check hosts = :
 host in ":"? no (end of list)
 check hosts = :
 host in ":"? no (end of list)

-accept: condition test failed
-processing "accept"
+accept: condition test failed in ACL "check_recipient"
+processing "accept" (TESTSUITE/test-config 24)

 check domains = +local_domains
 test.ex in "test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")
 check domains = +local_domains
 test.ex in "test.ex"? yes (matched "test.ex")
 test.ex in "+local_domains"? yes (matched "+local_domains")

-accept: condition test succeeded
-SMTP>> 250 Accepted\r
+accept: condition test succeeded in ACL "check_recipient"
+end of ACL "check_recipient": ACCEPT
+SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0

 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"
 SMTP<< rcpt to:<userx@cam.ac.uk>
 using ACL "check_recipient"

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

 check hosts = :
 host in ":"? no (end of list)
 check hosts = :
 host in ":"? no (end of list)

-accept: condition test failed
-processing "accept"
+accept: condition test failed in ACL "check_recipient"
+processing "accept" (TESTSUITE/test-config 24)

 check domains = +local_domains
 cam.ac.uk in "test.ex"? no (end of list)
 cam.ac.uk in "+local_domains"? no (end of list)
 check domains = +local_domains
 cam.ac.uk in "test.ex"? no (end of list)
 cam.ac.uk in "+local_domains"? no (end of list)

-accept: condition test failed
-processing "accept"
+accept: condition test failed in ACL "check_recipient"
+processing "accept" (TESTSUITE/test-config 25)

 check hosts = +relay_hosts
 host in "*.masq.test.ex"? no (end of list)
 host in "+relay_hosts"? no (end of list)
 check hosts = +relay_hosts
 host in "*.masq.test.ex"? no (end of list)
 host in "+relay_hosts"? no (end of list)

-accept: condition test failed
-processing "deny"
-deny: condition test succeeded
-SMTP>> 550 relay not permitted\r
+accept: condition test failed in ACL "check_recipient"
+processing "deny" (TESTSUITE/test-config 26)
+  message: relay not permitted
+deny: condition test succeeded in ACL "check_recipient"
+end of ACL "check_recipient": DENY
+SMTP>> 550 relay not permitted

 LOG: MAIN REJECT
   H=oneback.test.ex [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 SMTP<< quit
 LOG: MAIN REJECT
   H=oneback.test.ex [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted
 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 oneback.test.ex [V4NET.99.99.90] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
 search_tidyup called

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