Skip to content

Patch to fix autest issues #6113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ezelkow1 merged 4 commits into from
Nov 1, 2019
Merged

Patch to fix autest issues #6113

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06472cc
Patch from Bryan to fix autest issues
ezelkow1 Oct 31, 2019
158c841
Change select_ports to false to match existing 80x tls tests
ezelkow1 Oct 31, 2019
b5e2788
Add setting of https server ports and waiting for https port ready
ezelkow1 Oct 31, 2019
89d2bf7
Trying autest again, this passed in our testing container
ezelkow1 Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions tests/gold_tests/tls/tls_session_cache.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")


Expand All @@ -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)
)
Expand All @@ -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
Expand Down Expand Up @@ -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