From 655dcc3a75e927eee759e430a823c696421c3e3d Mon Sep 17 00:00:00 2001
From: Daniel Milroy <daniel.milroy@gmail.com>
Date: Thu, 24 Oct 2024 15:57:47 -0700
Subject: [PATCH] testsuite: add partial release tests with ssd pruning filters

Problem: the current tests for
https://github.com/flux-framework/flux-sched/issues/1284 do not check
to ensure partial cancel behaves as desires with ssd pruning filters.

Add the tests with the ssd pruning filters at all ancestor graph
vertices.
---
 ...rv1-partial-release-brokerless-resources.t | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/t/t1027-rv1-partial-release-brokerless-resources.t b/t/t1027-rv1-partial-release-brokerless-resources.t
index e85a13856..b8d6313ee 100755
--- a/t/t1027-rv1-partial-release-brokerless-resources.t
+++ b/t/t1027-rv1-partial-release-brokerless-resources.t
@@ -26,6 +26,7 @@ EOF
 	flux module load resource monitor-force-up &&
 	flux module load sched-fluxion-resource &&
 	flux module load sched-fluxion-qmanager &&
+	flux module unload job-list &&
 	flux module list &&
 	flux queue start --all --quiet &&
 	flux resource list &&
@@ -101,4 +102,92 @@ test_expect_success 'reload fluxion and resource module' '
 	flux module remove sched-fluxion-resource
 '
 
+test_expect_success 're-run tests with ssd pruning filters' '
+	flux module remove resource &&
+	flux config load <<EOF &&
+[resource]
+noverify = true
+norestrict = true
+path="${SHARNESS_TEST_SRCDIR}/data/resource/jgfs/issue1284.json"
+[sched-fluxion-resource]
+prune-filters = "ALL:core,ALL:ssd"
+EOF
+	flux module load resource monitor-force-up &&
+	flux module load sched-fluxion-resource &&
+	flux module load sched-fluxion-qmanager &&
+	flux module list &&
+	flux queue start --all --quiet &&
+	flux resource list &&
+	flux resource status &&
+	jobid=$(flux job submit --flags=waitable \
+			${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284.json) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'single-node non-ssd jobspecs can be allocated with ssd pruning filters' '
+	jobid=$(flux submit -n1 -N1 true) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'a second ssd jobspec can be allocated with ssd pruning filters' '
+	jobid=$(flux job submit --flags=waitable \
+			${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284.json) &&
+	flux job wait-event -vt15 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'single-node non-ssd jobspecs can still be allocated with ssd pruning filters' '
+	(flux cancel ${jobid} || true) &&
+	jobid=$(flux submit -n1 -N1 true) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'reload fluxion and resource module with ssd pruning filters' '
+	flux cancel --all &&
+	flux module remove sched-fluxion-qmanager &&
+	flux module remove sched-fluxion-resource &&
+	flux module reload resource &&
+	flux module load sched-fluxion-resource &&
+	flux module load sched-fluxion-qmanager &&
+	flux module list &&
+	flux queue start --all --quiet
+'
+
+test_expect_success 'an ssd jobspec with no slot can be allocated with ssd pruning filters' '
+	flux resource list &&
+	flux resource status &&
+	jobid=$(flux job submit --flags=waitable \
+			${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284-noslot.json) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'single-node non-ssd jobspecs can be allocated with ssd pruning filters' '
+	jobid=$(flux submit -n1 -N1 true) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'a second ssd jobspec with no slot can be allocated with ssd pruning filters' '
+	jobid=$(flux job submit --flags=waitable \
+			${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284-noslot.json) &&
+	flux job wait-event -vt15 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'single-node non-ssd jobspecs can still be allocated with ssd pruning filters' '
+	(flux cancel ${jobid} || true) &&
+	jobid=$(flux submit -n1 -N1 true) &&
+	flux job wait-event -vt5 ${jobid} alloc &&
+	flux job wait-event -vt5 ${jobid} clean
+'
+
+test_expect_success 'reload fluxion and resource module with ssd pruning filters' '
+	flux module remove sched-fluxion-qmanager &&
+	flux module remove sched-fluxion-resource
+'
+
 test_done