[master] 809a46c complete e8.vtc

Nils Goroll nils.goroll at uplex.de
Wed Nov 15 13:56:04 UTC 2017


commit 809a46c1b8184e4fbedfca1200fbca3be99b74d1
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Nov 15 14:53:44 2017 +0100

    complete e8.vtc
    
    ... now that I've found the layer 8 bug
    
    Thank you to @bsdphk
    
    Ref #2484

diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 1477341..71b700a 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -82,18 +82,18 @@ logexpect l1 -v v1 -g vxid {
 	expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
 	expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
 	expect 0 = BackendReuse
+} -start
 
-## XXX something is fishy about any of: logexpect, vsl, slink's brain:
-## despite syncvsl and the fact that the loggin is output by
-## varnishtest, these fail (time out) - feedback appreciated
-#
-#	expect * * BereqURL	{^/body$}
-#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
-#	expect 0 = BackendReuse
-#
-#	expect * * BereqURL	{^/body2$}
-#	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
-#	expect 0 = BackendReuse
+logexpect l2 -v v1 -g vxid {
+	expect * * BereqURL	{^/body$}
+	expect * = ESI_xmlerror {^ERR after 30 VEP ended inside a tag$}
+	expect 0 = BackendReuse
+} -start
+
+logexpect l3 -v v1 -g vxid {
+	expect * * BereqURL	{^/body2$}
+	expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
+	expect 0 = BackendReuse
 } -start
 
 varnish v1 -cliok "param.set debug +esi_chop"
@@ -109,4 +109,6 @@ client c1 {
 
 client c1 -run
 logexpect l1 -wait
+logexpect l2 -wait
+logexpect l3 -wait
 varnish v1 -expect esi_errors == 17


More information about the varnish-commit mailing list