[trafficserver] 02/02: Adjust tls_client_versions to be more resilient for different curl versions

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 49f1819b179509b888db24015148fdc50f0c92a5
Author: dyrock <ze...@gmail.com>
AuthorDate: Tue Feb 12 21:01:39 2019 +0000

    Adjust tls_client_versions to be more resilient for different curl versions
    
    (cherry picked from commit 19e9776877e005191b3349b0fe1ea1380f850388)
---
 tests/gold_tests/tls/tls_client_versions.test.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/gold_tests/tls/tls_client_versions.test.py b/tests/gold_tests/tls/tls_client_versions.test.py
index dc83455..c6b77f8 100644
--- a/tests/gold_tests/tls/tls_client_versions.test.py
+++ b/tests/gold_tests/tls/tls_client_versions.test.py
@@ -81,9 +81,6 @@ tr.Processes.Default.StartBefore(Test.Processes.ts, ready=When.PortOpen(ts.Varia
 tr.Processes.Default.Command = "curl -v --tls-max 1.2 --tlsv1.2 --resolve 'foo.com:{0}:127.0.0.1' -k  https://foo.com:{0}".format(ts.Variables.ssl_port)
 tr.ReturnCode = 35
 tr.StillRunningAfter = ts
-tr.Processes.Default.TimeOut = 5
-tr.TimeOut = 5
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("ssl_choose_client_version:unsupported protocol", "Should not allow TLSv1_2")
 
 # Target foo.com for TLSv1.  Should succeed
 tr = Test.AddTestRun("foo.com TLSv1")
@@ -98,9 +95,6 @@ tr = Test.AddTestRun("bar.com TLSv1")
 tr.Processes.Default.Command = "curl -v --tls-max 1.0 --tlsv1 --resolve 'bar.com:{0}:127.0.0.1' -k  https://bar.com:{0}".format(ts.Variables.ssl_port)
 tr.ReturnCode = 35
 tr.StillRunningAfter = ts
-tr.Processes.Default.TimeOut = 5
-tr.Processes.Default.Streams.All += Testers.ContainsExpression("alert protocol version", "Should not allow TLSv1_0")
-tr.TimeOut = 5
 
 # Target bar.com for TLSv1_2.  Should succeed
 tr = Test.AddTestRun("bar.com TLSv1_2")