From 17a1d65d952174aeb6e09942ba5d0c5b622a8d71 Mon Sep 17 00:00:00 2001
From: jacobtkeio <jacobtkeio@gmail.com>
Date: Sat, 28 Sep 2024 16:01:11 -0700
Subject: [PATCH] Fix broken && chains in t4014

Problem: fedora40 CI fails on t4014 due to """
  error: bug in the test script: broken &&-chain:
      load_feasibility
      flux dmesg -c | grep -q "File exists"
"""

Add && between successive statements in t4014.
---
 t/t4014-match-feasibility.t | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/t/t4014-match-feasibility.t b/t/t4014-match-feasibility.t
index d3b15a949..55eaa501b 100755
--- a/t/t4014-match-feasibility.t
+++ b/t/t4014-match-feasibility.t
@@ -21,28 +21,28 @@ test_debug '
 '
 
 test_expect_success 'loading feasibility module over sched-simple fails' '
-    load_feasibility
-    flux dmesg -c | grep -q "File exists"
+    load_feasibility 2>&1 | grep -q "File exists"
 '
 
 test_expect_success 'removing sched-simple works' '
-    flux module remove sched-simple
+    flux module remove sched-simple &&
+    flux dmesg -c | grep -q "rmmod sched-simple"
 '
 
 test_expect_success 'loading feasibility module before resource fails' '
-    load_feasibility
+    load_feasibility &&
     flux dmesg -c | grep -q "Function not implemented"
 '
 
 test_expect_success 'loading resource module with a tiny machine config works' '
     load_resource load-file=${grug} load-format=grug \
-prune-filters=ALL:core subsystems=containment policy=high
+prune-filters=ALL:core subsystems=containment policy=high &&
     test -z "$(flux dmesg -c | grep -q err)"
 '
 
 test_expect_success 'loading feasibility module with a tiny machine config works' '
     load_feasibility load-file=${grug} load-format=grug \
-prune-filters=ALL:core subsystems=containment policy=high
+prune-filters=ALL:core subsystems=containment policy=high &&
     test -z "$(flux dmesg -c | grep -q err)"
 '
 
@@ -72,7 +72,7 @@ test_expect_success 'jobspec is still satisfiable even when no available resourc
 '
 
 test_expect_success 'removing load-file feasibility module works' '
-    remove_feasibility
+    remove_feasibility &&
     test -z "$(flux dmesg -c | grep -q err)"
 '
 
@@ -89,12 +89,12 @@ test_expect_success 'removing resource module works' '
 '
 
 test_expect_success 'loading non-load-file resource module works' '
-    load_resource
+    load_resource &&
     test -z "$(flux dmesg -c | grep -q err)"
 '
 
 test_expect_success 'loading feasibility from non-load-file resource module works' '
-    load_feasibility
+    load_feasibility &&
     test -z "$(flux dmesg -c | grep -q err)"
 '