From: Philip Hazel Date: Tue, 6 Feb 2007 16:54:34 +0000 (+0000) Subject: Update some tests for latest changes. X-Git-Tag: exim-4_67~44 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/3a0615784b9974a727afc9d503e9647f52fc630c Update some tests for latest changes. --- diff --git a/test/stderr/0357 b/test/stderr/0357 index cae10d04f..0bd08647e 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -52,6 +52,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -67,6 +68,7 @@ no host retry record no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 reading retry information for R:userx@test.ex: from subprocess + existing delete item dropped added retry item reading retry information for R:test.ex from subprocess existing delete item dropped @@ -74,6 +76,8 @@ reading retry information for R:test.ex from subprocess reading retry information for R:userx@test.ex from subprocess existing delete item dropped added delete item +reading retry information for R:userx@test.ex: from subprocess + delete item not added: non-delete item exists LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error Processing retry items @@ -102,6 +106,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -117,6 +122,7 @@ no host retry record no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 reading retry information for R:userx@test.ex: from subprocess + existing delete item dropped added retry item reading retry information for R:test.ex from subprocess existing delete item dropped @@ -124,6 +130,8 @@ reading retry information for R:test.ex from subprocess reading retry information for R:userx@test.ex from subprocess existing delete item dropped added delete item +reading retry information for R:userx@test.ex: from subprocess + delete item not added: non-delete item exists LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error Processing retry items diff --git a/test/stderr/0358 b/test/stderr/0358 index c48a96e4b..b2d9a13a1 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -71,8 +71,10 @@ no domain retry record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@test.ex no domain retry record +added retry item for R:usery@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:usery@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -90,6 +92,7 @@ no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex:: errno=-44 more_errno=dd,A flags=0 reading retry information for R:userx@test.ex: from subprocess + existing delete item dropped added retry item reading retry information for R:test.ex from subprocess existing delete item dropped @@ -97,7 +100,10 @@ reading retry information for R:test.ex from subprocess reading retry information for R:userx@test.ex from subprocess existing delete item dropped added delete item +reading retry information for R:userx@test.ex: from subprocess + delete item not added: non-delete item exists reading retry information for R:usery@test.ex: from subprocess + existing delete item dropped added retry item reading retry information for R:test.ex from subprocess existing delete item dropped @@ -105,6 +111,8 @@ reading retry information for R:test.ex from subprocess reading retry information for R:usery@test.ex from subprocess existing delete item dropped added delete item +reading retry information for R:usery@test.ex: from subprocess + delete item not added: non-delete item exists LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error LOG: MAIN diff --git a/test/stderr/0388 b/test/stderr/0388 index e4b6b413c..f7855826f 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -84,6 +84,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex SMTP<< 250 OK +127.0.0.1 in hosts_avoid_pipelining? no (option unset) 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: SMTP<< 250 OK