tidying

[exim.git] / test / stdout / 2002

diff --git a/test/stdout/2002 b/test/stdout/2002
index 7462793a3bb7dcea2df51c026fd1b1f60574c919..e8707e377777ace50c2aa0f2b8519c9e6a8668d5 100644 (file)
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

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


@@ -31,7 +42,7 @@ Succeeded in starting TLS
 >>> This is a test encrypted message.
 >>> .
 ??? 250
 >>> This is a test encrypted message.
 >>> .
 ??? 250

-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaX-000000005vi-0000

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


@@ -57,6 +68,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK


@@ -69,7 +83,7 @@ Succeeded in starting TLS
 >>> This is a test encrypted message.
 >>> .
 ??? 250
 >>> This is a test encrypted message.
 >>> .
 ??? 250

-<<< 250 OK id=10HmaY-0005vi-00
+<<< 250 OK id=10HmaY-000000005vi-0000

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


@@ -80,22 +94,25 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 >>> ehlo rhu.barb
 ??? 250-
 <<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
 >>> ehlo rhu.barb
 ??? 250-
 <<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]

-??? 250-
+??? 250-SIZE

 <<< 250-SIZE 52428800
 <<< 250-SIZE 52428800

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

 <<< 250-8BITMIME
 <<< 250-8BITMIME

-??? 250-
+??? 250-PIPELINING

 <<< 250-PIPELINING
 <<< 250-PIPELINING

-??? 250-
+??? 250-STARTTLS

 <<< 250-STARTTLS
 <<< 250-STARTTLS

-??? 250
+??? 250 HELP

 <<< 250 HELP
 >>> starttls
 <<< 250 HELP
 >>> starttls

-??? 220
+??? 220 TLS go ahead

 <<< 220 TLS go ahead
 Attempting to start TLS
 <<< 220 TLS go ahead
 Attempting to start TLS

-A TLS fatal alert has been received.
+gnutls_handshake: A TLS fatal alert has been received.

 Failed to start TLS
 Failed to start TLS

+>>> nop
+???*
+Expected EOF read

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem


@@ -120,6 +137,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

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


@@ -132,7 +152,7 @@ Succeeded in starting TLS
 >>> This is a test encrypted message from a verified host.
 >>> .
 ??? 250
 >>> This is a test encrypted message from a verified host.
 >>> .
 ??? 250

-<<< 250 OK id=10HmaZ-0005vi-00
+<<< 250 OK id=10HmaZ-000000005vi-0000

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


@@ -158,6 +178,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

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


@@ -171,7 +194,7 @@ Succeeded in starting TLS
 >>> It should be sent under the RSA server cert and with an RSA cipher.
 >>> .
 ??? 250
 >>> It should be sent under the RSA server cert and with an RSA cipher.
 >>> .
 ??? 250

-<<< 250 OK id=10HmbA-0005vi-00
+<<< 250 OK id=10HmbA-000000005vi-0000

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


@@ -197,6 +220,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

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


@@ -210,7 +236,7 @@ Succeeded in starting TLS
 >>> It should be sent under the EC server cert and with an ECDSA cipher.
 >>> .
 ??? 250
 >>> It should be sent under the EC server cert and with an ECDSA cipher.
 >>> .
 ??? 250

-<<< 250 OK id=10HmbB-0005vi-00
+<<< 250 OK id=10HmbB-000000005vi-0000

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