From 68b3f43f2ff8955555502f953cf6513fe26f30ba Mon Sep 17 00:00:00 2001
From: Tom Scogland <scogland1@llnl.gov>
Date: Mon, 19 Aug 2024 11:51:13 -0700
Subject: [PATCH] sharness: remove uses of skip_all_unless_have

problem: the helper was removed from flux-sharness.sh

solution: stop using it, just like upstream
---
 t/t1001-qmanager-basic.t        | 2 --
 t/t1002-qmanager-reload.t       | 2 --
 t/t1003-qmanager-policy.t       | 2 --
 t/t1004-qmanager-optimize.t     | 2 --
 t/t1005-qmanager-conf.t         | 2 --
 t/t1011-dynstate-change.t       | 2 --
 t/t1012-find-status.t           | 2 --
 t/t1013-qmanager-priority.t     | 2 --
 t/t1014-annotation.t            | 2 --
 t/t1015-find-format.t           | 2 --
 t/t1017-rv1-bootstrap.t         | 2 --
 t/t1018-rv1-bootstrap2.t        | 2 --
 t/t1021-qmanager-nodex.t        | 2 --
 t/t1022-property-constraints.t  | 2 --
 t/t3025-resource-find.t         | 2 --
 t/t3027-resource-RV.t           | 2 --
 t/t3034-resource-pconstraints.t | 2 --
 t/t4010-match-conf.t            | 2 --
 t/t5100-issues-test-driver.t    | 2 --
 t/t6002-graph-hwloc.t           | 2 --
 t/t8001-util-ion-R.t            | 2 --
 21 files changed, 42 deletions(-)

diff --git a/t/t1001-qmanager-basic.t b/t/t1001-qmanager-basic.t
index 2b02ee0cb..c989fa9b1 100755
--- a/t/t1001-qmanager-basic.t
+++ b/t/t1001-qmanager-basic.t
@@ -8,8 +8,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 1
 
diff --git a/t/t1002-qmanager-reload.t b/t/t1002-qmanager-reload.t
index fad75e7dc..9dcf80407 100755
--- a/t/t1002-qmanager-reload.t
+++ b/t/t1002-qmanager-reload.t
@@ -8,8 +8,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 1
 
diff --git a/t/t1003-qmanager-policy.t b/t/t1003-qmanager-policy.t
index 79ed53dda..52d0055a3 100755
--- a/t/t1003-qmanager-policy.t
+++ b/t/t1003-qmanager-policy.t
@@ -8,8 +8,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 1
 
diff --git a/t/t1004-qmanager-optimize.t b/t/t1004-qmanager-optimize.t
index 140985bea..8b56b6eca 100755
--- a/t/t1004-qmanager-optimize.t
+++ b/t/t1004-qmanager-optimize.t
@@ -8,8 +8,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 1
 
diff --git a/t/t1005-qmanager-conf.t b/t/t1005-qmanager-conf.t
index 551509939..ecc54818a 100755
--- a/t/t1005-qmanager-conf.t
+++ b/t/t1005-qmanager-conf.t
@@ -12,8 +12,6 @@ if test -z "${FLUX_SCHED_TEST_INSTALLED}" || test -z "${FLUX_SCHED_CO_INST}"
      export FLUX_RC_EXTRA="${SHARNESS_TEST_SRCDIR}/../etc"
 fi
 
-skip_all_unless_have jq
-
 # Run broker with specified config file and qmanager options.
 # Usage: start_qmanager config-path [module options] >outfile
 start_qmanager () {
diff --git a/t/t1011-dynstate-change.t b/t/t1011-dynstate-change.t
index 58efdb292..86055416e 100755
--- a/t/t1011-dynstate-change.t
+++ b/t/t1011-dynstate-change.t
@@ -11,8 +11,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 node, 2 sockets, 44 cores (22 per socket), 4 gpus (2 per socket)
 excl_4N4B="${hwloc_basepath}/004N/exclusive/04-brokers-sierra2"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 4 full -o,--config-path=$(pwd)/config
 
diff --git a/t/t1012-find-status.t b/t/t1012-find-status.t
index 278969d7c..08ef9ecd1 100755
--- a/t/t1012-find-status.t
+++ b/t/t1012-find-status.t
@@ -9,8 +9,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 node, 2 sockets, 44 cores (22 per socket), 4 gpus (2 per socket)
 excl_4N4B="${hwloc_basepath}/004N/exclusive/04-brokers-sierra2"
 
-skip_all_unless_have jq
-
 remove_times() {
     cat ${1} | jq 'del (.execution.starttime) | del (.execution.expiration)'
 }
diff --git a/t/t1013-qmanager-priority.t b/t/t1013-qmanager-priority.t
index a80eacebf..05adbc9e0 100755
--- a/t/t1013-qmanager-priority.t
+++ b/t/t1013-qmanager-priority.t
@@ -11,8 +11,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 node, 2 sockets, 44 cores (22 per socket), 4 gpus (2 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers-sierra2"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 10 system
 
diff --git a/t/t1014-annotation.t b/t/t1014-annotation.t
index 05416b003..580809615 100755
--- a/t/t1014-annotation.t
+++ b/t/t1014-annotation.t
@@ -24,8 +24,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 1
 
diff --git a/t/t1015-find-format.t b/t/t1015-find-format.t
index 5b9f572c2..5a74bde12 100755
--- a/t/t1015-find-format.t
+++ b/t/t1015-find-format.t
@@ -9,8 +9,6 @@ expected_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/resource/expected/fi
 excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers/"
 query="../../resource/utilities/resource-query"
 
-skip_all_unless_have jq
-
 normalize_json() {
     jq 'del (.execution.starttime) | del (.execution.expiration)' |
         grep -v '"rank":'
diff --git a/t/t1017-rv1-bootstrap.t b/t/t1017-rv1-bootstrap.t
index dcf6879ee..dfc72a4ce 100755
--- a/t/t1017-rv1-bootstrap.t
+++ b/t/t1017-rv1-bootstrap.t
@@ -9,8 +9,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 excl_4N4B="${hwloc_basepath}/004N/exclusive/04-brokers-sierra2"
 export WAITFILE="${SHARNESS_TEST_SRCDIR}/scripts/waitfile.lua"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 
 test_under_flux 4
diff --git a/t/t1018-rv1-bootstrap2.t b/t/t1018-rv1-bootstrap2.t
index 63dfa98fe..a95c48513 100755
--- a/t/t1018-rv1-bootstrap2.t
+++ b/t/t1018-rv1-bootstrap2.t
@@ -4,8 +4,6 @@ test_description='Test Bootstrapping from Configured RV1 Object'
 
 . `dirname $0`/sharness.sh
 
-skip_all_unless_have jq
-
 export WAITFILE="${SHARNESS_TEST_SRCDIR}/scripts/waitfile.lua"
 export FLUX_SCHED_MODULE=none
 
diff --git a/t/t1021-qmanager-nodex.t b/t/t1021-qmanager-nodex.t
index 285e1397a..70508a9c4 100755
--- a/t/t1021-qmanager-nodex.t
+++ b/t/t1021-qmanager-nodex.t
@@ -8,8 +8,6 @@ hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
 # 4 brokers: 1 node, 2 sockets, 44 cores 4 gpus
 excl_4N4B="${hwloc_basepath}/004N/exclusive/04-brokers-sierra2"
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 
 test_under_flux 4
diff --git a/t/t1022-property-constraints.t b/t/t1022-property-constraints.t
index df129d858..f18860e3e 100755
--- a/t/t1022-property-constraints.t
+++ b/t/t1022-property-constraints.t
@@ -4,8 +4,6 @@ test_description='Test constraints complementing t3034-resource-pconstraints.t'
 
 . `dirname $0`/sharness.sh
 
-skip_all_unless_have jq
-
 if flux python -m flux.constraint.parser >/dev/null 2>&1; then
    test_set_prereq RFC35_SYNTAX
 fi
diff --git a/t/t3025-resource-find.t b/t/t3025-resource-find.t
index d1650b37c..69f6dd309 100755
--- a/t/t3025-resource-find.t
+++ b/t/t3025-resource-find.t
@@ -14,8 +14,6 @@ grugs="${SHARNESS_TEST_SRCDIR}/data/resource/grugs/tiny.graphml"
 jgf="${SHARNESS_TEST_SRCDIR}/data/resource/jgfs/tiny.json"
 query="../../resource/utilities/resource-query"
 
-skip_all_unless_have jq
-
 remove_times() {
     cat ${1} | jq 'del (.execution.starttime) | del (.execution.expiration)'
 }
diff --git a/t/t3027-resource-RV.t b/t/t3027-resource-RV.t
index 50e5a3407..435ec32f6 100755
--- a/t/t3027-resource-RV.t
+++ b/t/t3027-resource-RV.t
@@ -4,8 +4,6 @@ test_description='Test emitted resource-set correctness as schema changes'
 
 . $(dirname $0)/sharness.sh
 
-skip_all_unless_have jq
-
 full_job="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/RV/full.yaml"
 duration3600="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/RV/duration3600.yaml"
 exp_dir="${SHARNESS_TEST_SRCDIR}/data/resource/expected/RV"
diff --git a/t/t3034-resource-pconstraints.t b/t/t3034-resource-pconstraints.t
index 8bc9e4d29..278ee9fbb 100755
--- a/t/t3034-resource-pconstraints.t
+++ b/t/t3034-resource-pconstraints.t
@@ -6,8 +6,6 @@ test_description='Test property constraints-based matching'
 
 query="../../resource/utilities/resource-query"
 
-skip_all_unless_have jq
-
 test_expect_success 'pconstraints: configuring a heterogeneous machine works' '
 	flux R encode -r 0 -c 0-1 -g 0-1 -p "arm-v9@core:0" -H foo2 > out &&
 	flux R encode -r 1 -c 0 -H foo3 -p "arm-v8@core:1" >> out &&
diff --git a/t/t4010-match-conf.t b/t/t4010-match-conf.t
index 1354b52d7..f25268489 100755
--- a/t/t4010-match-conf.t
+++ b/t/t4010-match-conf.t
@@ -14,8 +14,6 @@ if test -z "${FLUX_SCHED_TEST_INSTALLED}" || test -z "${FLUX_SCHED_CO_INST}"
      export FLUX_RC_EXTRA="${SHARNESS_TEST_SRCDIR}/../etc"
 fi
 
-skip_all_unless_have jq
-
 # Run broker with specified config file and sched-fluxion-resource options.
 # Usage: start_resource config-path outfile [module options]
 start_resource () {
diff --git a/t/t5100-issues-test-driver.t b/t/t5100-issues-test-driver.t
index b2eb84a3e..aaf0fad4e 100755
--- a/t/t5100-issues-test-driver.t
+++ b/t/t5100-issues-test-driver.t
@@ -8,8 +8,6 @@ if test_have_prereq ASAN; then
     skip_all='skipping issues tests under AddressSanitizer'
     test_done
 fi
-skip_all_unless_have jq
-
 SIZE=2
 test_under_flux ${SIZE}
 echo "# $0: flux session size will be ${SIZE}"
diff --git a/t/t6002-graph-hwloc.t b/t/t6002-graph-hwloc.t
index b5d27736d..bc99700d2 100755
--- a/t/t6002-graph-hwloc.t
+++ b/t/t6002-graph-hwloc.t
@@ -16,8 +16,6 @@ verify() {
     return $?
 }
 
-skip_all_unless_have jq
-
 export FLUX_SCHED_MODULE=none
 test_under_flux 4
 
diff --git a/t/t8001-util-ion-R.t b/t/t8001-util-ion-R.t
index 8c7cc88ba..e0933dd77 100755
--- a/t/t8001-util-ion-R.t
+++ b/t/t8001-util-ion-R.t
@@ -4,8 +4,6 @@ test_description='Test flux ion-R Utility'
 
 . $(dirname $0)/sharness.sh
 
-skip_all_unless_have jq
-
 print_schema (){
     jq -r '.graph.nodes[].metadata | "\(.paths.containment) \(.rank)"' $1 > $2
 }