Merge pull request #5291 from chu11/issue5290_testsuite_timeout

testsuite: fix occasional broker kill error

Author: mergify[bot]

t/t0014-runlevel.t

@@ -32,7 +32,7 @@ test_expect_success 'rc1 bad path handled same as failure' '
 '
 
 test_expect_success 'default initial program is $SHELL' '
-	run_timeout --env=SHELL=/bin/sh 15 \
+	run_timeout --env=SHELL=/bin/sh 60 \
 		flux $SHARNESS_TEST_SRCDIR/scripts/runpty.py -i none \
 		flux start -o,-Slog-stderr-level=6 \
 		-o,-Sbroker.rc1_path=,-Sbroker.rc3_path= \

t/t3203-instance-recovery.t

@@ -9,9 +9,12 @@ test -n "$FLUX_TESTS_LOGFILE" && set -- "$@" --logfile
 
 runpty="flux ${SHARNESS_TEST_SRCDIR}/scripts/runpty.py"
 
+# N.B. Increase test-exit-timeout from default of 20s, on slower / busy
+# systems timeout can trigger and kill broker.
 test_expect_success 'start a persistent instance of size 4' '
 	mkdir -p test1 &&
-	flux start --test-size=4 -o,-Sstatedir=$(pwd)/test1 /bin/true
+	flux start --test-size=4 --test-exit-timeout=300s \
+		-o,-Sstatedir=$(pwd)/test1 /bin/true
 '
 test_expect_success 'expected broker attributes are set in recovery mode' '
 	cat >recov_attrs.exp <<-EOT &&