From ddbba8c1f61faae8726dfc352cf318a473c0d2b7 Mon Sep 17 00:00:00 2001 From: Masakazu Kitajo Date: Fri, 19 Feb 2021 10:22:53 +0900 Subject: [PATCH] Fix tls_session_reuse test Output formats slightly differ depending on OpenSSL versions. --- tests/gold_tests/tls/tls_session_reuse.test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/gold_tests/tls/tls_session_reuse.test.py b/tests/gold_tests/tls/tls_session_reuse.test.py index b31769e8ade..2f2ad288f2f 100644 --- a/tests/gold_tests/tls/tls_session_reuse.test.py +++ b/tests/gold_tests/tls/tls_session_reuse.test.py @@ -111,7 +111,8 @@ tr.ReturnCode = 0 tr.Processes.Default.StartBefore(server) tr.Processes.Default.StartBefore(ts1) -tr.Processes.Default.Streams.All = Testers.ContainsExpression('Reused, TLSv1.2', '') +tr.Processes.Default.Streams.All = Testers.ContainsExpression('Reused, TLSv', '') +tr.Processes.Default.Streams.All += Testers.ContainsExpression('Protocol : TLSv1.2', '') tr.StillRunningAfter = server tr = Test.AddTestRun("TLSv1.2 Session Ticket") @@ -121,7 +122,8 @@ .format(ts2.Variables.ssl_port, os.path.join(Test.RunDirectory, 'sess.dat')) tr.ReturnCode = 0 tr.Processes.Default.StartBefore(ts2) -tr.Processes.Default.Streams.All = Testers.ContainsExpression('Reused, TLSv1.2', '') +tr.Processes.Default.Streams.All = Testers.ContainsExpression('Reused, TLSv', '') +tr.Processes.Default.Streams.All += Testers.ContainsExpression('Protocol : TLSv1.2', '') tr.StillRunningAfter = server tr = Test.AddTestRun("Disabled Session Cache")