Skip to content

h2origin autest: honor the 30s squid.log wait budget #13450

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

Open
mandarwagh9 wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −10
Open

h2origin autest: honor the 30s squid.log wait budget #13450

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions tests/gold_tests/h2/h2origin.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
'proxy.config.http.server_session_sharing.pool': 'thread',
'proxy.config.http.server_session_sharing.match': 'ip,sni,cert',
'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE',
# Flush log buffers promptly so that the squid.log entry for the last
# transaction appears while the test is still waiting for it.
'proxy.config.log.max_secs_per_buffer': 1,
})

ts.Disk.remap_config.AddLines(
Expand Down Expand Up @@ -85,18 +88,9 @@
tr.Processes.Default.StartBefore(server_expect)
tr.Processes.Default.ReturnCode = 0

tr = Test.AddTestRun("Wait for the squid.log to be written")
timeout = 30
watcher = tr.Processes.Process("watcher")
watcher.Command = f"sleep {timeout}"
watcher.Ready = When.FileContains(ts.Disk.squid_log.Name, r'14 http/1.1 http/2')
watcher.TimeOut = timeout
tr = Test.AddAwaitFileContainsTestRun("Wait for the squid.log to be written", ts.Disk.squid_log.Name, r'14 http/1.1 http/2')
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.TimeOut = timeout
tr.Processes.Default.StartBefore(watcher)
tr.Processes.Default.Command = 'echo await_squid_log'
tr.Processes.Default.ReturnCode = 0

# UUIDs 1-4 should be http/1.1 clients and H2 origin
# UUIDs 5-9 should be http/2 clients and H2 origins
Expand Down