Merge pull request #909 from grondo/testsuite-fixes

testsuite: fix a couple brittle tests
flux-framework · Feb 24, 2022 · 20337b0 · 20337b0
2 parents fe067a4 + dd08d2e
commit 20337b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/t/t1006-qmanager-multiqueue.t b/t/t1006-qmanager-multiqueue.t
@@ -26,7 +26,7 @@ get_queue() {
 
 test_expect_success 'qmanager: loading qmanager with multiple queues' '
     load_resource prune-filters=ALL:core \
-subsystems=containment policy=low &&
+	subsystems=containment policy=low load-allowlist=node,core,gpu &&
     load_qmanager "queues=all batch debug"
 '
 

diff --git a/t/t1011-dynstate-change.t b/t/t1011-dynstate-change.t
@@ -33,7 +33,7 @@ test_expect_success 'load test resources' '
 '
 
 test_expect_success 'dyn-state: loading fluxion modules works' '
-    load_resource load-allowlist=cluster,node,core,gpu &&
+    load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 &&
     load_qmanager
 '
 
@@ -118,7 +118,7 @@ test_expect_success 'dyn-state: removing fluxion modules' '
 '
 
 test_expect_success 'dyn-state: loading fluxion modules works' '
-    load_resource load-allowlist=cluster,node,core,gpu &&
+    load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 &&
     load_qmanager queue-policy=easy
 '
 
@@ -141,7 +141,7 @@ test_expect_success 'dyn-state: removing fluxion modules' '
 '
 
 test_expect_success 'dyn-state: loading fluxion modules works' '
-    load_resource load-allowlist=cluster,node,core,gpu &&
+    load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 &&
     load_qmanager queues="batch debug" \
 queue-policy-per-queue="batch:easy debug:fcfs"
 '
@@ -171,7 +171,7 @@ test_expect_success 'dyn-state: removing fluxion modules' '
 '
 
 test_expect_success 'dyn-state: loading fluxion modules works' '
-    load_resource load-allowlist=cluster,node,core,gpu &&
+    load_resource load-allowlist=cluster,node,core,gpu match-format=rv1 &&
     load_qmanager
 '