t: add Flux instance tests for rv1_shorthand

Problem: there are no tests for the rv1_shorthand format being used
by a Flux instance, only by the resource-query utility.

Add tests.

Author: jameshcorbett

t/t1029-resource-force-load-format.t

@@ -7,6 +7,8 @@ test_description='Test the rv1exec_force load format'
 echo \
 '#!/bin/sh
 
+set -e
+
 flux module remove -f sched-simple &&
 flux module remove -f sched-fluxion-qmanager &&
 flux module remove -f sched-fluxion-resource &&
@@ -17,11 +19,26 @@ flux module load sched-fluxion-resource load-format="${1}" &&
 flux module load sched-fluxion-qmanager
 ' > load_nonsense_scheduling_key.sh
 
-chmod +x load_nonsense_scheduling_key.sh
+echo \
+'#!/bin/sh
+
+set -e
+
+flux module remove -f sched-simple &&
+flux module remove -f sched-fluxion-qmanager &&
+flux module remove -f sched-fluxion-resource &&
+flux module reload resource &&
+flux module load sched-fluxion-resource &&
+flux module load sched-fluxion-qmanager &&
+flux module list
+$@
+' > load_fluxion.sh
+
+chmod +x load_nonsense_scheduling_key.sh load_fluxion.sh
 
 test_under_flux 2
 
-test_expect_success 'load resource with load-format-rv1exec_force' '
+test_expect_success 'load resource with load-format=rv1exec_force' '
     flux module remove -f sched-simple &&
     reload_resource load-format=rv1exec_force &&
     reload_qmanager
@@ -43,6 +60,38 @@ test_expect_success 'without rv1exec_force, job fails' '
     flux job attach $(flux job last) 2>&1 | grep "module exiting abnormally"
 '
 
+test_expect_success 'load resource with match-format=rv1_shorthand' '
+    reload_resource load-format=rv1exec_force match-format=rv1_shorthand &&
+    reload_qmanager
+'
+
+test_expect_success 'jobs run with shorthand jgf' '
+    jobid=$(flux submit -n1 true) &&
+    flux job wait-event -vt 5 ${jobid} alloc &&
+    flux job info ${jobid} R | jq -e ".scheduling.graph.metadata.complete == true" &&
+    flux job attach ${jobid} &&
+    jobid=$(flux submit -N1 true) &&
+    flux job wait-event -vt 5 ${jobid} alloc &&
+    flux job info ${jobid} R | jq -e ".scheduling.graph.metadata.complete == false" &&
+    flux job attach ${jobid}
+'
+
+test_expect_success 'flux instances started with shorthand jgf can run jobs' '
+    flux alloc -t5s -N1 ./load_fluxion.sh flux run -n1 -c1 echo hello &&
+    flux job attach $(flux job last) &&
+    flux job info $(flux job last) R | jq -e ".scheduling.graph.metadata.complete == false" &&
+    flux job info $(flux job last) R | jq .scheduling.graph | test_must_fail grep core
+'
+
+test_expect_success 'scheduler can be reloaded with jgf_shorthand jobs' '
+    jobid=$(flux submit -t15s -N1 flux start ./load_fluxion.sh sleep 10) &&
+    reload_resource load-format=rv1exec_force match-format=rv1_shorthand &&
+    reload_qmanager &&
+    flux cancel ${jobid} &&
+    flux job info ${jobid} R | jq -e ".scheduling.graph.metadata.complete == false" &&
+    flux job info ${jobid} R | jq .scheduling.graph | test_must_fail grep core
+'
+
 test_expect_success 'remove manually loaded modules' '
     remove_qmanager && remove_resource
 '