Avoid clearing first_delivery flag on the initial half of a 2-phase queue run

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

diff --git a/test/stderr/0070 b/test/stderr/0070
index c50f93612c83c21a79b2a6dd170ca21521baa9fd..b4e00211768b34866205c9e910dfd0b1b511a32a 100644 (file)
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -27,7 +27,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"


@@ -56,7 +56,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"
 >>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"


@@ -83,11 +83,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
 >>> matched host address
 >>> using ACL "rcpt"
 >>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
 >>> matched host address
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY


@@ -201,7 +201,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"


@@ -227,13 +227,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"

->>> processing "deny"
+>>> processing "deny" (TESTSUITE/test-config 25)

 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY


@@ -258,8 +258,9 @@ MUNGED: ::1 will be omitted in what follows
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> rhubarb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")

+>>> host in chunking_advertise_hosts? no (end of list)

 >>> using ACL "rcpt"
 >>> using ACL "rcpt"

->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 22)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"