Callouts: fix recipient verify/random

[exim.git] / test / stderr / 0432

diff --git a/test/stderr/0432 b/test/stderr/0432
index 2abb55cc128e0b1e3c7381dfa1a81add7e3e33f7..6ac5a0428b0af2ab1c10a2dba1abcf6264b257ab 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -90,12 +90,14 @@ dbfn_read: key=x@y
 callout cache: no address record found for x@y
 closed hints database and lockfile
 interface=NULL port=1224
 callout cache: no address record found for x@y
 closed hints database and lockfile
 interface=NULL port=1224

-Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 connected
+Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected

   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
   SMTP<< 250 OK

+not using PIPELINING
+not using DSN

 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
 cmd buf flush ddd bytes
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
 cmd buf flush ddd bytes


@@ -105,6 +107,7 @@ cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> QUIT
 cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> QUIT
 cmd buf flush ddd bytes

+  SMTP<< 220 OK

   SMTP(close)>>
 locking TESTSUITE/spool/db/callout.lockfile
 locked  TESTSUITE/spool/db/callout.lockfile
   SMTP(close)>>
 locking TESTSUITE/spool/db/callout.lockfile
 locked  TESTSUITE/spool/db/callout.lockfile


@@ -255,7 +258,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for b
 >>> callout cache: no address record found for a@b
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected

 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex


@@ -270,6 +273,7 @@ MUNGED: ::1 will be omitted in what follows
 >>>   SMTP<< 250 OK
 >>>   SMTP>> QUIT
 >>> cmd buf flush 6 bytes
 >>>   SMTP<< 250 OK
 >>>   SMTP>> QUIT
 >>> cmd buf flush 6 bytes

+>>>   SMTP<< 220 OK

 >>>   SMTP(close)>>
 >>> wrote callout cache domain record for b:
 >>>   result=1 postmaster=0 random=0
 >>>   SMTP(close)>>
 >>> wrote callout cache domain record for b:
 >>>   result=1 postmaster=0 random=0


@@ -300,14 +304,14 @@ MUNGED: ::1 will be omitted in what follows
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224
 >>> callout cache: no domain record found for q
 >>> callout cache: no address record found for p1@q
 >>> interface=NULL port=1224

->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected

 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes

->>> SMTP timeout

 >>>   SMTP(close)>>
 >>>   SMTP(close)>>

+>>> SMTP timeout

 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"

-LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout
+LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex

 LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
 LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout