[6.0] e6ef7ee2d Fix r02702's -cliexpect

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Thu Aug 16 09:36:08 UTC 2018


commit e6ef7ee2da6d59235807157c6b7150718bf57477
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Aug 16 11:32:56 2018 +0200

    Fix r02702's -cliexpect
    
    The output changes in Varnish 6.1 and that check slipped through the
    cracks.

diff --git a/bin/varnishtest/tests/r02702.vtc b/bin/varnishtest/tests/r02702.vtc
index c9a938a90..c3b796555 100644
--- a/bin/varnishtest/tests/r02702.vtc
+++ b/bin/varnishtest/tests/r02702.vtc
@@ -29,7 +29,7 @@ varnish v1 -vcl {
 
 delay 1
 
-varnish v1 -cliexpect "vcl1.s1[ ]+probe[ ]+1/1[ ]+good" backend.list
+varnish v1 -cliexpect "vcl1.s1[ ]+probe[ ]+Healthy[ ]+1/1" backend.list
 
 # For PROXYv2, we apply a trick similar to o0000[24].vtc, since
 # Varnish accepts (and ignores) PROXY LOCAL.
@@ -63,7 +63,7 @@ server s1 -wait
 
 delay 1
 
-varnish v3 -cliexpect "vcl1.bp[ ]+probe[ ]+1/1[ ]+good" backend.list
+varnish v3 -cliexpect "vcl1.bp[ ]+probe[ ]+Healthy[ ]+1/1" backend.list
 
 # Verify in the v2 log that PROXY LOCAL was sent.
 


More information about the varnish-commit mailing list