From e97957bc478f60d32649b329659d4b72748745c1 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Thu, 9 Mar 2006 15:10:16 +0000 Subject: Add new errors mail_4xx, data_4xx, lost_connection, tls_required. --- test/stdout/0497 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- test/stdout/0498 | 2 +- test/stdout/1008 | 10 ++--- test/stdout/5100 | 2 +- 4 files changed, 140 insertions(+), 9 deletions(-) (limited to 'test/stdout') diff --git a/test/stdout/0497 b/test/stdout/0497 index 1b0cdbcea..6755d429e 100644 --- a/test/stdout/0497 +++ b/test/stdout/0497 @@ -1,8 +1,9 @@ ++++++++++++++++++++++++++++ + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 452 temporary error +first failed = time last try = time2 next try = time2 + 0 * +++++++++++++++++++++++++++ R:userx@x.y -44 13377 SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * - T:127.0.0.1:127.0.0.1:1224 dd 65 Connection refused -first failed = time last try = time2 next try = time2 + 900 ******** SERVER ******** Listening on port 1224 ... @@ -12,9 +13,139 @@ EHLO myhost.test.ex 250-server id 250 OK MAIL FROM: +452 temporary error +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250 OK +MAIL FROM: +250 OK +RCPT TO: +452 temporary error +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250 OK +MAIL FROM: +250 OK +RCPT TO: +250 OK +DATA +452 temporary error +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250 OK +MAIL FROM: +250 OK +RCPT TO: +250 OK +DATA +352 GO AHEAD +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbD-0005vi-00 + for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. +452 temporary error +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250-PIPELINING +250 OK +MAIL FROM: +452 temporary error +RCPT TO: +Comparison failed - bailing out +Expected: QUIT +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250-PIPELINING +250 OK +MAIL FROM: +250 OK +RCPT TO: +452 temporary error +DATA +Comparison failed - bailing out +Expected: QUIT +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250-PIPELINING +250 OK +MAIL FROM: +250 OK +RCPT TO: +250 OK +DATA +452 temporary error +QUIT +250 OK +End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250-PIPELINING +250 OK +MAIL FROM: 250 OK RCPT TO: +250 OK +DATA +352 GO AHEAD +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmbL-0005vi-00 + for userx@x.y; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +. 452 temporary error QUIT 250 OK End of script +Listening on port 1224 ... +Connection request from [127.0.0.1] +220 Server ready +EHLO myhost.test.ex +250-server id +250-PIPELINING +250 OK +MAIL FROM: +250 OK +RCPT TO: +End of script diff --git a/test/stdout/0498 b/test/stdout/0498 index d3811ad0f..f1448ba45 100644 --- a/test/stdout/0498 +++ b/test/stdout/0498 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 DELAY + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 DELAY first failed = time last try = time2 next try = time2 + 10 ******** SERVER ******** diff --git a/test/stdout/1008 b/test/stdout/1008 index 76982ea22..e2c79135d 100644 --- a/test/stdout/1008 +++ b/test/stdout/1008 @@ -1,18 +1,18 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 Temporary error + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 - T:::1:::1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error + T:::1:::1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error first failed = time last try = time2 next try = time2 + 7200 -Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 Temporary error +Transport: 127.0.0.1 [127.0.0.1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:: host 127.0.0.1 [127.0.0.1]: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 -Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error +Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 exinext exit code = 0 -Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error 0: SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error +Transport: ::1 [::1]:1111 10HmaX-0005vi-00 error -45: SMTP error from remote mail server after MAIL FROM:: host ::1 [::1]: 450 Temporary error first failed: 07-Mar-2000 12:21:52 last tried: 07-Mar-2000 12:21:52 next try at: 07-Mar-2000 12:21:52 diff --git a/test/stdout/5100 b/test/stdout/5100 index b7255ca2e..cf3412153 100644 --- a/test/stdout/5100 +++ b/test/stdout/5100 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:jack@myhost.test.ex -1 0 LMTP error after end of data: 450 Number 2 is now delayed + T:jack@myhost.test.ex -46 12800 LMTP error after end of data: 450 Number 2 is now delayed first failed = time last try = time2 next try = time2 + 0 T:tom@myhost.test.ex -44 12800 LMTP error after RCPT TO:: 450 This one is delayed on RCPT first failed = time last try = time2 next try = time2 + 60 -- cgit v1.2.3