Testsuite: drop PRDR testcase from general MAIL-FROM-with-options testing

[exim.git] / test / log / 5510

diff --git a/test/log/5510 b/test/log/5510
index 2e65e048f67670b0d98e3018ff6848d4e951fbf1..289868dc97100f1a69ae8a6183e76d7c371e8d36 100644 (file)
--- a/test/log/5510
+++ b/test/log/5510
@@ -1,31 +1,32 @@
-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 => user2.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK got that"
-1999-03-02 09:44:33 10HmaY-0005vi-00 -> user2.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK got that"
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-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 => 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 10HmaZ-0005vi-00 == userz@test.ex R=r0 T=t1 defer (0) H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 450 cannot handle second rcpt right now
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbA-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 10HmbA-0005vi-00 ** userq@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 550 second rcpt does not like content
-1999-03-02 09:44:33 10HmbA-0005vi-00 Frozen (delivery error message)
-1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@test.ex routing defer (-51): retry time not reached
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
-1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
-1999-03-02 09:44:33 10HmbB-0005vi-00 Frozen (delivery error message)
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
-1999-03-02 09:44:33 10HmbC-0005vi-00 ** user6.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
-1999-03-02 09:44:33 10HmbC-0005vi-00 Frozen (delivery error message)
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.1@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.2@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
-1999-03-02 09:44:33 10HmbD-0005vi-00 == user7.3@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmbE-0005vi-00 => user8.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK, got that"
-1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= userx@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 => usery@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good\\n250 OK, overall"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 -> userz@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 second rcpt was good\\n250 OK, overall"
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= userx@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 => user2.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK got that"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 -> user2.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK got that"
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= userx@test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 => usery@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good\\n250 OK, overall"
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == userz@test.ex R=r0 T=t1 defer (0) H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 450 cannot handle second rcpt right now
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= <> U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 => userp@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good\\n250 OK, overall"
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 ** userq@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 550 second rcpt does not like content
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 == userz@test.ex routing defer (-52): retry time not reached
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= <> U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 ** user5.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 ** user5.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= <> U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 ** user6.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 ** user6.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 naah mate
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= <> U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 == user7.1@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 == user7.2@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 == user7.3@test.ex R=r0 T=t1 defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 450 oops, try again later please
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 <= <> U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 => user8.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK, got that"
+1999-03-02 09:44:33 10HmbE-000000005vi-0000 Completed