From 28e2f8840ec18ffe6599552c2e1217cd2bce7838 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 8 Jan 2013 22:44:14 +0000 Subject: [PATCH] More client PRDR tests --- test/log/5510 | 12 +++++ test/scripts/5500-PRDR/5510 | 97 ++++++++++++++++++++++++++++++++++++- test/stdout/5510 | 66 ++++++++++++++++++++++++- 3 files changed, 172 insertions(+), 3 deletions(-) diff --git a/test/log/5510 b/test/log/5510 index 5793091e9..19bddf192 100644 --- a/test/log/5510 +++ b/test/log/5510 @@ -1,3 +1,15 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 => usery@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good" +1999-03-02 09:44:33 10HmaX-0005vi-00 -> userz@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 second rcpt was good" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => usery@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good" +1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@test.ex R=r0 T=t1 defer (0): PRDR error after DATA: 450 cannot handle second rcpt right now +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaZ-0005vi-00 => userp@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good" +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** userq@test.ex R=r0 T=t1: PRDR error after DATA: 550 second rcpt does not like content +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 Remote host 127.0.0.1 [127.0.0.1] closed connection in response to initial connection +1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@test.ex R=r0 T=t1 defer (-18): Remote host 127.0.0.1 [127.0.0.1] closed connection in response to initial connection +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/scripts/5500-PRDR/5510 b/test/scripts/5500-PRDR/5510 index d6a55cc73..cf5574a94 100644 --- a/test/scripts/5500-PRDR/5510 +++ b/test/scripts/5500-PRDR/5510 @@ -1,6 +1,7 @@ # PRDR client need_ipv4 # +# 1: Two recipients, accepted server PORT_S 220 Server ready EHLO @@ -11,15 +12,109 @@ MAIL FROM: PRDR 250 OK RCPT TO 250 OK +RCPT TO +250 OK +DATA +300 gimme yer body +. +353 prdr responses coming up +250 first rcpt was good +250 second rcpt was good +250 OK, overall +QUIT +250 OK +**** +exim -odi -f userx usery userz +Some message text. +**** +# +# +# 2: Two recipients, one accepted one tmp-rejected +server PORT_S +220 Server ready +EHLO +250- +250-PRDR +250 OK +MAIL FROM: PRDR +250 OK +RCPT TO +250 OK +RCPT TO +250 OK DATA 300 gimme yer body . 353 prdr responses coming up 250 first rcpt was good +450 cannot handle second rcpt right now 250 OK, overall QUIT 250 OK **** -exim -d -odi -f userx usery +exim -odi -f userx usery userz Some message text. **** +# +# +# 3: Two recipients, one accepted one rejected +# Oddly the client never gives us QUIT, just drops the conn. +# Perhaps due to the outstanding bounce for userx ? It is +# fine if the preceding tests are commented out. +# +server PORT_S +220 Server ready +EHLO +250- +250-PRDR +250 OK +MAIL FROM: PRDR +250 OK +RCPT TO +250 OK +RCPT TO +250 OK +DATA +300 gimme yer body +. +353 prdr responses coming up +250 first rcpt was good +550 second rcpt does not like content +250 OK, overall +QUIT +250 OK +**** +exim -odi -f userx userp userq +Some message text. +**** +# +# +## 4: Two recipients, rejected by final. +## +#server PORT_S +#220 Server ready +#EHLO +#250- +#250-PRDR +#250 OK +#MAIL FROM: PRDR +#250 OK +#RCPT TO +#250 OK +#RCPT TO +#250 OK +#DATA +#300 gimme yer body +#. +#353 prdr responses coming up +#250 first rcpt was good +#250 second rcpt was good +#550 Nope, overall rejection +#QUIT +#250 OK +#**** +#exim -d -odi -f userx user4.1 user4.2 +#text +#**** +## +## diff --git a/test/stdout/5510 b/test/stdout/5510 index 3d592222a..add2e2124 100644 --- a/test/stdout/5510 +++ b/test/stdout/5510 @@ -11,12 +11,13 @@ MAIL FROM: PRDR 250 OK RCPT TO: 250 OK +RCPT TO: +250 OK DATA 300 gimme yer body Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 - for usery@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 Message-Id: From: userx@test.ex Date: Tue, 2 Mar 1999 09:44:33 +0000 @@ -25,7 +26,68 @@ Some message text. . 353 prdr responses coming up 250 first rcpt was good +250 second rcpt was good 250 OK, overall 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- +250-PRDR +250 OK +MAIL FROM: PRDR +250 OK +RCPT TO: +250 OK +RCPT TO: +250 OK +DATA +300 gimme yer body +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: userx@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Some message text. +. +353 prdr responses coming up +250 first rcpt was good +450 cannot handle second rcpt right now +250 OK, overall +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- +250-PRDR +250 OK +MAIL FROM: PRDR +250 OK +RCPT TO: +250 OK +RCPT TO: +250 OK +DATA +300 gimme yer body +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: +From: userx@test.ex +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +Some message text. +. +353 prdr responses coming up +250 first rcpt was good +550 second rcpt does not like content +250 OK, overall +Unexpected EOF read from client -- 2.25.1