diff --git a/tests/gold_tests/tls/tls_session_cache.test.py b/tests/gold_tests/tls/tls_session_cache.test.py index 08d9fd2d9e3..c2a0d23863e 100644 --- a/tests/gold_tests/tls/tls_session_cache.test.py +++ b/tests/gold_tests/tls/tls_session_cache.test.py @@ -23,7 +23,7 @@ ''' # Define default ATS -ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True) +ts = Test.MakeATSProcess("ts", select_ports=False) server = Test.MakeOriginServer("server") @@ -36,6 +36,8 @@ ts.addSSLfile("ssl/server.pem") ts.addSSLfile("ssl/server.key") +ts.Variables.ssl_port = 4443 + ts.Disk.remap_config.AddLine( 'map / http://127.0.0.1:{0}'.format(server.Variables.Port) ) @@ -57,6 +59,7 @@ 'proxy.config.ssl.session_cache.timeout': 0, 'proxy.config.ssl.session_cache.auto_clear': 1, 'proxy.config.ssl.server.session_ticket.enable': 0, + 'proxy.config.http.server_ports': '{0} {1}:proto=http2;http:ssl'.format(ts.Variables.port, ts.Variables.ssl_port), }) # Check that Session-ID is the same on every connection @@ -86,8 +89,8 @@ def checkSession(ev) : tr.Command = 'echo -e "GET / HTTP/1.0\r\n" | openssl s_client -tls1_2 -connect 127.0.0.1:{0} -reconnect'.format(ts.Variables.ssl_port) tr.ReturnCode = 0 # time delay as proxy.config.http.wait_for_cache could be broken -tr.Processes.Default.StartBefore(server) -tr.Processes.Default.StartBefore(Test.Processes.ts) +tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port)) +tr.Processes.Default.StartBefore(Test.Processes.ts, ready=When.PortOpen(ts.Variables.ssl_port)) openssl_output = tr.Processes.Default.Streams.stdout.AbsPath tr.Processes.Default.Streams.All.Content = Testers.Lambda(checkSession) tr.StillRunningAfter = server