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

[exim.git] / test / stdout / 5650

diff --git a/test/stdout/5650 b/test/stdout/5650
index 7b5628c6aaccafb259c9daa109a9bc47bd73146f..199c5e4d4c01dd3feadda495666cb4768ae8b0ea 100644 (file)
--- a/test/stdout/5650
+++ b/test/stdout/5650
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -20,6 +22,11 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

+OCSP status response: good signature
+Succeeded in starting TLS (with OCSP)
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -41,6 +48,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -49,10 +58,9 @@ Key file = aux-fixed/cert2
 ??? 250
 <<< 250 HELP
 >>> starttls
 ??? 250
 <<< 250 HELP
 >>> starttls

-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Bad certificate
+??? 454
+<<< 454 TLS currently unavailable
+Abandoning TLS start attempt

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2


@@ -65,6 +73,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -73,10 +83,9 @@ Key file = aux-fixed/cert2
 ??? 250
 <<< 250 HELP
 >>> starttls
 ??? 250
 <<< 250 HELP
 >>> starttls

-??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Bad certificate
+??? 454
+<<< 454 TLS currently unavailable
+Abandoning TLS start attempt

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2


@@ -89,6 +98,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -107,6 +118,8 @@ Succeeded in starting TLS
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING