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 09f1b808f3119400e2f667eb0baf94440bae1a82 Author: Evan Zelkowitz <[email protected]> AuthorDate: Thu Apr 9 20:42:11 2020 +0000 Fix timeout autests on 8.1.x * Set select ports to false * Set ssl port * Add ssl/http2 port selection in config --- tests/gold_tests/timeout/active_timeout.test.py | 4 +++- tests/gold_tests/timeout/inactive_timeout.test.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/gold_tests/timeout/active_timeout.test.py b/tests/gold_tests/timeout/active_timeout.test.py index 9e7591d..5966006 100644 --- a/tests/gold_tests/timeout/active_timeout.test.py +++ b/tests/gold_tests/timeout/active_timeout.test.py @@ -23,7 +23,7 @@ Test.SkipUnless( Condition.HasCurlFeature('http2') ) -ts = Test.MakeATSProcess("ts", select_ports=True) +ts = Test.MakeATSProcess("ts", select_ports=False) server = Test.MakeOriginServer("server", delay=8) request_header = {"headers": "GET /file HTTP/1.1\r\nHost: *\r\n\r\n", "timestamp": "5678", "body": ""} @@ -33,10 +33,12 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.addSSLfile("../tls/ssl/server.pem") ts.addSSLfile("../tls/ssl/server.key") +ts.Variables.ssl_port = 4443 ts.Disk.records_config.update({ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), + 'proxy.config.http.server_ports': '{0} {1}:proto=http2;http:ssl'.format(ts.Variables.port, ts.Variables.ssl_port), 'proxy.config.url_remap.remap_required': 1, 'proxy.config.http.transaction_active_timeout_out': 2, }) diff --git a/tests/gold_tests/timeout/inactive_timeout.test.py b/tests/gold_tests/timeout/inactive_timeout.test.py index 772cc32..4b013a1 100644 --- a/tests/gold_tests/timeout/inactive_timeout.test.py +++ b/tests/gold_tests/timeout/inactive_timeout.test.py @@ -23,7 +23,7 @@ Test.SkipUnless( Condition.HasCurlFeature('http2') ) -ts = Test.MakeATSProcess("ts", select_ports=True) +ts = Test.MakeATSProcess("ts", select_ports=False) server = Test.MakeOriginServer("server", delay=8) request_header = {"headers": "GET /file HTTP/1.1\r\nHost: *\r\n\r\n", "timestamp": "5678", "body": ""} @@ -33,10 +33,12 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.addSSLfile("../tls/ssl/server.pem") ts.addSSLfile("../tls/ssl/server.key") +ts.Variables.ssl_port = 4443 ts.Disk.records_config.update({ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), + 'proxy.config.http.server_ports': '{0} {1}:proto=http2;http:ssl'.format(ts.Variables.port, ts.Variables.ssl_port), 'proxy.config.url_remap.remap_required': 1, 'proxy.config.http.transaction_no_activity_timeout_out': 2, })
