testsuite: move special ntasks test

Problem: A special case ntask test located in t2800-jobs-cmd.t
really should be in t2260-job-list.t, located amongst a large
mix of ntasks tests.

Solution: Move the test to t2260-job-list.t, adjusting it
and surrounding tests accordingly.

Author: chu11

t/t2260-job-list.t

@@ -711,6 +711,22 @@ test_expect_success HAVE_JQ 'flux job list outputs ntasks correctly (tasks-per-n
         echo $obj | jq -e ".ntasks == 6"
 '
 
+test_expect_success 'flux jobs list outputs ntasks correctly (per-resource.type=node)' '
+        nnodes=$(flux resource list -s up -no {nnodes}) &&
+        ncores=$(flux resource list -s up -no {ncores}) &&
+        extra=$((ncores / nnodes + 2)) &&
+        jobid=$(flux mini submit --wait -N ${nnodes} -n ${ncores} \
+                -o per-resource.type=node \
+                -o per-resource.count=${extra} \
+                hostname | flux job id) &&
+        echo $jobid > taskcount6.id &&
+        wait_jobid_state $jobid inactive &&
+        obj=$(flux job list -s inactive | grep $jobid) &&
+        expected=$((nnodes * extra)) &&
+        echo ${expected} > per_resource_type_node_ntasks.exp &&
+        echo $obj | jq -e ".ntasks == ${expected}"
+'
+
 test_expect_success 'reload the job-list module' '
         flux module reload job-list
 '
@@ -721,6 +737,7 @@ test_expect_success HAVE_JQ 'verify task count preserved across restart' '
         jobid3=`cat taskcount3.id` &&
         jobid4=`cat taskcount4.id` &&
         jobid5=`cat taskcount5.id` &&
+        jobid6=`cat taskcount6.id` &&
         obj=$(flux job list -s inactive | grep ${jobid1}) &&
         echo $obj | jq -e ".ntasks == 1" &&
         obj=$(flux job list -s inactive | grep ${jobid2}) &&
@@ -730,7 +747,10 @@ test_expect_success HAVE_JQ 'verify task count preserved across restart' '
         obj=$(flux job list -s inactive | grep ${jobid4}) &&
         echo $obj | jq -e ".ntasks == 3" &&
         obj=$(flux job list -s inactive | grep ${jobid5}) &&
-        echo $obj | jq -e ".ntasks == 6"
+        echo $obj | jq -e ".ntasks == 6" &&
+        obj=$(flux job list -s inactive | grep ${jobid6}) &&
+        expected=$(cat per_resource_type_node_ntasks.exp) &&
+        echo $obj | jq -e ".ntasks == ${expected}"
 '
 
 #

t/t2800-jobs-cmd.t

@@ -1231,21 +1231,6 @@ test_expect_success HAVE_JQ 'flux jobs lists nnodes for pending jobs correctly'
 	test_cmp nnodesP.exp nnodesP.out
 '
 
-# over subscribe tasks onto nodes through workaround, ensure
-# ntasks is larger than the tasks specified via -n option
-test_expect_success 'flux jobs lists ntasks with per-resource type=node correctly' '
-	nnodes=$(flux resource list -s up -no {nnodes}) &&
-	ncores=$(flux resource list -s up -no {ncores}) &&
-	extra=$((ncores / nnodes + 2)) &&
-	id=$(flux mini submit -N ${nnodes} -n ${ncores} \
-	        -o per-resource.type=node \
-	        -o per-resource.count=${extra} \
-	        /bin/true) &&
-	fj_wait_event ${id} clean &&
-	flux jobs -no "{ntasks}" ${id} > per_resource_ntasks.out &&
-        test $(cat per_resource_ntasks.out) -eq $((nnodes * extra))
-'
-
 #
 # leave job cleanup to rc3
 #