More client PRDR tests

diff --git a/test/log/5510 b/test/log/5510
index 5793091e94e179e5206d0ba41b500e2dedb0f04d..19bddf1921078b02377cbbc1b492c3880e0f6841 100644 (file)
--- 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 d6a55cc73b6133ca1e58f2790ba90eb82308b74f..cf5574a94984eff6dd69845291f208574cdbd41f 100644 (file)
--- 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:<userx@test.ex> 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:<userx@test.ex> 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:<userx@test.ex> 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:<userx@test.ex> 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 3d592222acd8558e45f315aa92af159ef511f62a..add2e212413742a26b7861a3bc4566a20bb72e15 100644 (file)
--- a/test/stdout/5510
+++ b/test/stdout/5510
@@ -11,12 +11,13 @@ MAIL FROM:<userx@test.ex> PRDR
 250 OK
 RCPT TO:<usery@test.ex>
 250 OK
+RCPT TO:<userz@test.ex>
+250 OK
 DATA
 300 gimme yer body
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test.ex>)
-       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: <E10HmaX-0005vi-00@myhost.test.ex>
 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:<userx@test.ex> PRDR
+250 OK
+RCPT TO:<usery@test.ex>
+250 OK
+RCPT TO:<userz@test.ex>
+250 OK
+DATA
+300 gimme yer body
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       (envelope-from <userx@test.ex>)
+       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+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:<userx@test.ex> PRDR
+250 OK
+RCPT TO:<userp@test.ex>
+250 OK
+RCPT TO:<userq@test.ex>
+250 OK
+DATA
+300 gimme yer body
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+       (envelope-from <userx@test.ex>)
+       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+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