Testsuite: tidy-up runtest

[users/jgh/exim.git] / test / stdout / 0458

diff --git a/test/stdout/0458 b/test/stdout/0458
index b9b54b4db1b06362f9a505a22b128d30c5216c23..47d52c1ac12e3e075b2740192fa00fd236ab6b6d 100644 (file)
--- a/test/stdout/0458
+++ b/test/stdout/0458
@@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP


@@ -18,7 +20,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503

-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection


@@ -37,6 +43,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503

+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503

 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221


@@ -51,6 +61,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP


@@ -62,7 +74,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
 <<< 503 sender not yet given
 >>> DATA
 ??? 503

-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503
+<<< 503 Valid RCPT command must precede DATA

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection


@@ -81,6 +97,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
 <<< 503 sender not yet given
 >>> DATA
 ??? 503

+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503

 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221


@@ -95,6 +115,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP


@@ -112,7 +134,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503

-<<< 503 valid RCPT command must precede DATA
+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503
+<<< 503 Valid RCPT command must precede DATA

 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection
 >>> QUIT
 ??? 221
 <<< 221 myhost.test.ex closing connection


@@ -137,6 +163,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503
 <<< 550 Administrative prohibition
 >>> DATA
 ??? 503

+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-Administrative prohibition
+??? 503

 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221


@@ -151,6 +181,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-8BITMIME
+??? 250-

 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP
 <<< 250-PIPELINING
 ??? 250
 <<< 250 HELP


@@ -159,6 +191,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 503 sender not yet given
 >>> DATA
 ??? 503
 <<< 503 sender not yet given
 >>> DATA
 ??? 503

+<<< 503-All RCPT commands were rejected with this error:
+??? 503
+<<< 503-503 sender not yet given
+??? 503

 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221
 <<< 503 valid RCPT command must precede DATA
 >>> QUIT
 ??? 221