From 81629e5e4242ea35c3e3a8596cf9b853decf3cf3 Mon Sep 17 00:00:00 2001 From: Jim Garlick Date: Tue, 18 Jul 2023 06:53:59 -0700 Subject: [PATCH] testsuite: drop resource exclusion test Problem: flux-core is deprecating the capability to change resource.exclude on the fly, but t1013-exclusion.t relies on this capability. Since the scheduler is not informed of excluded resources, this test duplicates flux-core coverage and does not add anything scheduler-specific. Remove test. --- t/Makefile.am | 1 - t/t1013-exclusion.t | 91 --------------------------------------------- 2 files changed, 92 deletions(-) delete mode 100755 t/t1013-exclusion.t diff --git a/t/Makefile.am b/t/Makefile.am index 93f9992f3..5262d064f 100644 --- a/t/Makefile.am +++ b/t/Makefile.am @@ -33,7 +33,6 @@ TESTS = \ t1010-sync-modules.t \ t1011-dynstate-change.t \ t1012-find-status.t \ - t1013-exclusion.t \ t1013-qmanager-priority.t \ t1014-annotation.t \ t1015-find-format.t \ diff --git a/t/t1013-exclusion.t b/t/t1013-exclusion.t deleted file mode 100755 index 85184618f..000000000 --- a/t/t1013-exclusion.t +++ /dev/null @@ -1,91 +0,0 @@ -test_description='Test Fluxion with Excluded Rank Resources' - -. `dirname $0`/sharness.sh - -hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data` -# 4 brokers, each (exclusively) have: -# 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_CONF_DIR=$(pwd) - -export FLUX_SCHED_MODULE=none -test_under_flux 4 - -test_expect_success 'exclusion: generate jobspecs' ' - flux run --dry-run -N 4 -n 4 -c 44 -g 4 -t 1h sleep 3600 > basic.json && - flux run --dry-run -N 1 -n 1 -c 44 -g 4 -t 1h sleep 3600 > 1N.json -' - -test_expect_success 'exclusion: load config with resource exclusions' ' - cat >resource.toml <<-EOF && - [resource] - exclude = "0-3" -EOF - flux config reload -' - -test_expect_success 'load test resources' ' - load_test_resources ${excl_4N4B} -' - -test_expect_success 'exclusion: loading fluxion modules works' ' - load_resource policy=high && - load_qmanager -' - -test_expect_success 'exclusion: all jobs are rejected on satisfiability' ' - flux dmesg > dmesg.out && - jobid1=$(flux job submit basic.json) && - jobid2=$(flux job submit 1N.json) && - test_must_fail flux job wait-event -t 1 ${jobid1} start && - test_must_fail flux job wait-event -t 1 ${jobid2} start && - flux job eventlog ${jobid1} | grep unsatisfiable && - flux job eventlog ${jobid2} | grep unsatisfiable -' -test_expect_success 'exclusion: removing fluxion modules' ' - remove_qmanager && - remove_resource -' -test_expect_success 'exclusion: reloading resource with a config file' ' - cat >resource.toml <<-EOF && - [resource] - exclude = "2-3" -EOF - flux config reload -' - -test_expect_success 'exclusion: loading fluxion modules works' ' - load_resource && - load_qmanager -' - -test_expect_success 'exclusion: only 1-node jobs are satisfiable' ' - jobid1=$(flux job submit basic.json) && - jobid2=$(flux job submit 1N.json) && - jobid3=$(flux job submit 1N.json) && - test_must_fail flux job wait-event -t 1 ${jobid1} start && - flux job wait-event -t 10 ${jobid2} start && - flux job wait-event -t 10 ${jobid3} start && - flux job eventlog ${jobid1} | grep unsatisfiable -' - -test_expect_success 'exclusion: cancel the running job' ' - flux job cancel ${jobid2} && - flux job cancel ${jobid3} && - flux job wait-event -t 10 ${jobid3} release -' - -test_expect_success 'cleanup active jobs' ' - cleanup_active_jobs -' - -test_expect_success 'exclusion: removing fluxion modules' ' - remove_qmanager && - remove_resource -' - -test_done -