Testsuite: regularize client_anytls OCSP trace output

[exim.git] / test / stdout / 5650

diff --git a/test/stdout/5650 b/test/stdout/5650
index e0bbf45071b41ca3d92873f537bb4f784f7ecc1a..77ea71e7dae112007e700dabc12c846da8ea23ad 100644 (file)
--- a/test/stdout/5650
+++ b/test/stdout/5650
@@ -20,6 +20,9 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -49,10 +52,32 @@ Key file = aux-fixed/cert2
 ??? 250
 <<< 250 HELP
 >>> starttls
+??? 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
+Key file = aux-fixed/cert2
 ??? 220
-<<< 220 TLS go ahead
-Attempting to start TLS
-Bad certificate
+<<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+>>> ehlo rhu.barb
+??? 250-
+<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 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
@@ -76,5 +101,17 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-Bad certificate
+Succeeded in starting TLS
+>>> ehlo rhu.barb.tls
+??? 250-
+<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> quit
 End of script