testsuite: add t2316-resource-rediscover.t

Problem: There are no tests of the resource.rediscover configuration
key.

Add t2316-resource-rediscover.t for testing this option.

Author: grondo

t/Makefile.am

@@ -179,6 +179,7 @@ TESTSCRIPTS = \
 	t2313-resource-acquire.t \
 	t2314-resource-monitor.t \
 	t2315-resource-system.t \
+	t2315-resource-rediscover.t \
 	t2350-resource-list.t \
 	t2351-resource-status-input.t \
 	t2352-resource-cmd-config.t \

t/t2316-resource-rediscover.t

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+test_description='Test resource module forced rediscovery'
+
+# Append --logfile option if FLUX_TESTS_LOGFILE is set in environment:
+test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile
+. `dirname $0`/sharness.sh
+
+if which hwloc-bind > /dev/null; then
+	NCORES=$(hwloc-bind --get | hwloc-calc --number-of core | tail -n 1)
+	test $NCORES = 1 || test_set_prereq MULTICORE
+fi
+
+if ! test_have_prereq MULTICORE; then
+   skip_all='skipping rediscovery testing without MULTICORE'
+   test_done
+fi
+
+test_under_flux 2
+
+test_expect_success 'resource: resource.rediscover forces hwloc discovery' '
+	NCORES=$(flux alloc -n1 -o cpu-affinity=off \
+	         flux resource list -no {ncores}) &&
+	test $NCORES -eq 1 &&
+	NCORES2=$(flux alloc -n1 -o cpu-affinity=off \
+	          --conf=resource.rediscover=true \
+	          flux resource list -no {ncores}) &&
+	test_debug "echo got ncores=$NCORES2 with resource.rediscover" &&
+	test $NCORES2 -gt $NCORES
+'
+test_expect_success 'resource: resource.rediscover works with multiple nodes' '
+	NCORES=$(flux alloc -N2 -n2 -o cpu-affinity=off \
+	         flux resource list -no {ncores}) &&
+	test $NCORES -eq 2 &&
+	NCORES3=$(flux alloc -N2 -n2 -o cpu-affinity=off \
+	          --conf=resource.rediscover=true \
+	          flux resource list -no {ncores}) &&
+	test_debug "echo got ncores=$NCORES3 with rediscover on 2 nodes" &&
+	test $NCORES3 -gt $NCORES &&
+	test $NCORES3 -eq $(($NCORES2*2))
+'
+test_done