[master] 658060e43 Attempt at stabilizing r2339
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Mon Dec 16 12:09:06 UTC 2019
commit 658060e431ec4ef92c3de48c168bb613a794d814
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Mon Dec 16 13:06:07 2019 +0100
Attempt at stabilizing r2339
Spotted via vtest: l1 timed out despite varnishd logging what was
expected next. This is tightening l1's expectation in the hope that
r2339 will no longer flake.
I wasn't able to reproduce this even on my vtest box where it failed.
diff --git a/bin/varnishtest/tests/r02339.vtc b/bin/varnishtest/tests/r02339.vtc
index a3cc99f92..178e24a39 100644
--- a/bin/varnishtest/tests/r02339.vtc
+++ b/bin/varnishtest/tests/r02339.vtc
@@ -63,39 +63,39 @@ logexpect l2 -v v1 -g raw {
logexpect l1 -v v1 {
expect * 1003 VCL_call HIT
- expect * = VCL_call DELIVER
+ expect 0 = VCL_return deliver
expect * 1004 VCL_call MISS
- expect * = VCL_call DELIVER
+ expect 0 = VCL_return fetch
expect * 1007 VCL_call RECV
- expect * = VCL_Error purge
- expect * = VCL_return fail
+ expect 0 = VCL_Error purge
+ expect 0 = VCL_return fail
expect * 1009 VCL_call HASH
- expect * = VCL_Error purge
- expect * = VCL_return fail
+ expect 0 = VCL_Error purge
+ expect 0 = VCL_return fail
expect * 1011 VCL_call PURGE
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1013 VCL_call PASS
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1015 VCL_call DELIVER
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1018 VCL_call SYNTH
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1021 VCL_call BACKEND_FETCH
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1024 VCL_call BACKEND_ERROR
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
expect * 1027 VCL_call BACKEND_RESPONSE
- expect * = VCL_Error purge
+ expect 0 = VCL_Error purge
} -start
client c1 {
More information about the varnish-commit
mailing list