Testsuite: split bounce longline testcase int with/out DSN-info variants

[exim.git] / test / stdout / 2014

diff --git a/test/stdout/2014 b/test/stdout/2014
index 4eddd724cf0d249e011a14c3be601c0ec626f596..edd498aa84154bca7381e908e7e5faa5d51ebebe 100644 (file)
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -19,7 +19,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

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

 Failed to start TLS
 >>> nop
 ????554
 Failed to start TLS
 >>> nop
 ????554


@@ -156,7 +156,7 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

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

 Failed to start TLS
 >>> nop
 ????554
 Failed to start TLS
 >>> nop
 ????554


@@ -217,15 +217,15 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 250-STARTTLS
 ??? 250
 <<< 250 HELP
 <<< 250-STARTTLS
 ??? 250
 <<< 250 HELP

->>> starttls
+>>> STARTTLS

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

-A TLS fatal alert has been received.
-Failed to start TLS
->>> helo test
-??? 554
+>>> NOP
+??? 554 Security failure

 <<< 554 Security failure
 <<< 554 Security failure

+>>> QUIT
+>>> 220

 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected
 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected