[master] f8817b8b6 Fix failing tests in witness mode

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 30 14:54:06 UTC 2019


commit f8817b8b6cfc504912436ffc74b1b7d1e851d35a
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Sep 30 07:53:29 2019 +0200

    Fix failing tests in witness mode
    
    The simple fact that Witness records might show up in the log might
    break logexpect commands. There's no reason why we'd want to expect
    Witness records since their purpose is to be checked after the test
    finishes.

diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 957436d5d..7369a8642 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -281,7 +281,7 @@ logexp_dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			data = VSL_CDATA(t->c->rec.ptr);
 			len = VSL_LEN(t->c->rec.ptr) - 1;
 
-			if (tag == SLT__Batch)
+			if (tag == SLT__Batch || tag == SLT_Witness)
 				continue;
 
 			ok = 1;


More information about the varnish-commit mailing list