Commit bec768df authored by Poul-Henning Kamp's avatar Poul-Henning Kamp Committed by Martin Blix Grydeland

Hopefully fix u00006 on various platforms.

Dont limit ourselves to a set number of VSL records to include
the "0 CLI" we want, various platforms emit a number of Debug
messages relating to sockopt

Use the `process p%d -expect-text` mechanism to wait only as
long as necessary for the "0 CLI"
parent ab2f26c2
......@@ -7,9 +7,11 @@ server s1 -repeat 2 {
varnish v1 -vcl+backend {} -start
# We use this to make sure we know there is a "0 CLI" in the binary log.
process p1 {
exec varnishlog -n ${v1_name} -g raw -k 3 -w ${tmpdir}/vlog -A
exec varnishlog -n ${v1_name} -g raw -u -A
} -start
shell {
exec varnishlog -n ${v1_name} -D -P ${tmpdir}/vlog.pid \
-w ${tmpdir}/vlog.bin -R 10/s \
......@@ -119,8 +121,11 @@ shell -err -expect "-R: Syntax error: Invalid duration" \
shell -err -expect "-R: Syntax error" \
"varnishlog -R 1000000000/1000000000000000000000000000000s"
process p1 -wait
shell {grep -q "0 CLI" ${tmpdir}/vlog}
# Wait until the binary also (must) contain a "0 CLI"
process p1 -expect-text 0 0 "0 CLI"
process p1 -screen_dump
process p1 -stop
shell -match "0 CLI[ ]+- Wr 200 [0-9]+ PONG" \
{varnishlog -n ${v1_name} -d -g raw -X "Wr 200 [0-9]+ [^P]"}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment