New format for exim_message_id

[exim.git] / test / stdout / 2102

diff --git a/test/stdout/2102 b/test/stdout/2102
index 2a1ec1870d474222f4364d50b97bc5e1c0e16239..7f8e4f8256b3a5cf6819b0f478ccbe840c246097 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -18,9 +18,19 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAxx

 Succeeded in starting TLS
 Succeeded in starting TLS

->>> mail from:<CALLER@test.ex>
+>>> 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:<a@test.ex>

 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>


@@ -32,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,8 +67,18 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAxx

 Succeeded in starting 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:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK


@@ -71,7 +91,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


@@ -125,9 +145,19 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAxx

 Succeeded in starting TLS
 Succeeded in starting TLS

->>> mail from:<CALLER@test.ex>
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<b@test.ex>

 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>


@@ -139,7 +169,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


@@ -164,9 +194,19 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-ECDSA-AES256-SHAxx

 Succeeded in starting TLS
 Succeeded in starting TLS

->>> mail from:<CALLER@test.ex>
+>>> 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:<c@test.ex>

 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> rcpt to:<CALLER@test.ex>


@@ -179,7 +219,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=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