[master] 6a9192574 Defuse test depending on python+json for now

Nils Goroll nils.goroll at uplex.de
Thu Apr 2 06:43:09 UTC 2020


commit 6a9192574b35eaa6f8c1f4a454997e625f137f72
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Apr 2 08:42:20 2020 +0200

    Defuse test depending on python+json for now

diff --git a/bin/varnishtest/tests/u00015.vtc b/bin/varnishtest/tests/u00015.vtc
index ec415e19f..0a53593d3 100644
--- a/bin/varnishtest/tests/u00015.vtc
+++ b/bin/varnishtest/tests/u00015.vtc
@@ -15,5 +15,8 @@ client c1 -repeat 5 {
 delay 1
 
 shell { varnishstat -n ${v1_name}  -j }
-shell -expect "1" { varnishstat -n ${v1_name} -j | python3 -c 'import sys, json; print(json.load(sys.stdin)["version"])' }
-shell -expect "5" { varnishstat -n ${v1_name} -j | python3 -c 'import sys, json; print(json.load(sys.stdin)["counters"]["MAIN.client_req"]["value"])' }
+## XXX:
+## - use @PYTHON@ discovered via autogen/automake
+## - make this test depend on json being available
+#shell -expect "1" { varnishstat -n ${v1_name} -j | python3 -c 'import sys, json; print(json.load(sys.stdin)["version"])' }
+#shell -expect "5" { varnishstat -n ${v1_name} -j | python3 -c 'import sys, json; print(json.load(sys.stdin)["counters"]["MAIN.client_req"]["value"])' }


More information about the varnish-commit mailing list