From c38e0ed256845cb2e4effdd80550d98b32a614d6 Mon Sep 17 00:00:00 2001
From: Jim Garlick <garlick.jim@gmail.com>
Date: Sat, 28 Jan 2023 06:52:57 -0800
Subject: [PATCH] testsuite: drop recovery-none test

Problem: t1008-recovery-none.t expects the job manager to abort the
scheduler if a job fails to re-allocate resources during the hello
handshake, but this behavior will change soon.

Drop this test.  The behavior it is looking for will either be
addressed by a true fix to #991 or the workaround proposed in
flux-framework/flux-core#4894.
---
 t/Makefile.am           |  1 -
 t/t1008-recovery-none.t | 57 -----------------------------------------
 2 files changed, 58 deletions(-)
 delete mode 100755 t/t1008-recovery-none.t

diff --git a/t/Makefile.am b/t/Makefile.am
index 9dab263c5..190bc90b4 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -29,7 +29,6 @@ TESTS = \
     t1005-qmanager-conf.t \
     t1006-qmanager-multiqueue.t \
     t1007-recovery-full.t \
-    t1008-recovery-none.t \
     t1009-recovery-multiqueue.t \
     t1010-sync-modules.t \
     t1011-dynstate-change.t \
diff --git a/t/t1008-recovery-none.t b/t/t1008-recovery-none.t
deleted file mode 100755
index e29140667..000000000
--- a/t/t1008-recovery-none.t
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-test_description='Test the state recovery of qmanager and resource modules:
-
-No recovery case: 1. the format of running jobs is rv1_nosched, and both
-resource and qmanager restart.  (i.e., qmanager without
-resource-recovery-on-load=false)
-'
-
-. `dirname $0`/sharness.sh
-
-hwloc_basepath=`readlink -e ${SHARNESS_TEST_SRCDIR}/data/hwloc-data`
-# 1 brokers, each (exclusively) have: 1 node, 2 sockets, 16 cores (8 per socket)
-excl_1N1B="${hwloc_basepath}/001N/exclusive/01-brokers"
-
-export FLUX_SCHED_MODULE=none
-test_under_flux 1
-
-test_expect_success 'recovery: generate a test jobspec' '
-    flux mini run --dry-run -N 1 -n 4 -t 1h sleep 3600 > basic.json
-'
-
-test_expect_success 'load test resources' '
-    load_test_resources ${excl_1N1B}
-'
-
-test_expect_success 'recovery: loading flux-sched modules works (rv1_nosched)' '
-    load_resource match-format=rv1_nosched &&
-    load_qmanager
-'
-
-test_expect_success 'recovery: submit a job (rv1_nosched)' '
-    jobid1=$(flux job submit basic.json) &&
-    flux job wait-event -t 10 ${jobid1} start
-'
-
-test_expect_success 'recovery: qmanager w/o an option must fail (rv1_nosched)' '
-    remove_qmanager &&
-    reload_resource match-format=rv1_nosched &&
-    load_qmanager &&
-    test_must_fail flux module stats sched-fluxion-qmanager
-'
-
-test_expect_success 'removing resource and qmanager modules' '
-    test_must_fail remove_qmanager &&
-    remove_resource
-'
-
-# At this point qmanager cannot be reloaded because it will fail recovery,
-# so load the simple scheduler so we can purge the queue
-test_expect_success 'cleanup active jobs with sched-simple' '
-    flux module load sched-simple &&
-    cleanup_active_jobs &&
-    flux module remove sched-simple
-'
-
-test_done