t: add plugin_factor RPC to fake payloads

flux-framework · Jun 3, 2022 · 16bd453 · 16bd453
1 parent b55c62a
commit 16bd453
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 4 deletions.
diff --git a/t/t1001-mf-priority-basic.t b/t/t1001-mf-priority-basic.t
@@ -77,6 +77,13 @@ test_expect_success 'create fake_payload.py' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 '
 

diff --git a/t/t1002-mf-priority-small-no-tie.t b/t/t1002-mf-priority-small-no-tie.t
@@ -41,7 +41,7 @@ test_expect_success 'send the user information to the plugin' '
 	flux python ${SEND_PAYLOAD} fake_small_no_tie.json
 '
 
-test_expect_success 'add a default queue and send it to the plugin' '
+test_expect_success 'add a default queue and plugin weights and send it to the plugin' '
 	cat <<-EOF >fake_payload.py
 	import flux
 	import json
@@ -58,6 +58,13 @@ test_expect_success 'add a default queue and send it to the plugin' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 	flux python fake_payload.py
 '

diff --git a/t/t1003-mf-priority-small-tie.t b/t/t1003-mf-priority-small-tie.t
@@ -42,7 +42,7 @@ test_expect_success 'send the user information to the plugin' '
 	flux python ${SEND_PAYLOAD} fake_small_tie.json
 '
 
-test_expect_success 'add a default queue and send it to the plugin' '
+test_expect_success 'add a default queue and plugin weights and send it to the plugin' '
 	cat <<-EOF >fake_payload.py
 	import flux
 	import json
@@ -59,6 +59,13 @@ test_expect_success 'add a default queue and send it to the plugin' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 	flux python fake_payload.py
 '

diff --git a/t/t1004-mf-priority-small-tie-all.t b/t/t1004-mf-priority-small-tie-all.t
@@ -43,7 +43,7 @@ test_expect_success 'send the user information to the plugin' '
 	flux python ${SEND_PAYLOAD} fake_small_tie_all.json
 '
 
-test_expect_success 'add a default queue and send it to the plugin' '
+test_expect_success 'add a default queue and plugin weights and send it to the plugin' '
 	cat <<-EOF >fake_payload.py
 	import flux
 	import json
@@ -60,6 +60,13 @@ test_expect_success 'add a default queue and send it to the plugin' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 	flux python fake_payload.py
 '

diff --git a/t/t1005-max-jobs-limits.t b/t/t1005-max-jobs-limits.t
@@ -52,7 +52,7 @@ test_expect_success 'update plugin with sample test data' '
 	flux python ${SEND_PAYLOAD} fake_user.json
 '
 
-test_expect_success 'add a default queue and send it to the plugin' '
+test_expect_success 'add a default queue and plugin weights and send it to the plugin' '
 	cat <<-EOF >fake_payload.py
 	import flux
 	import json
@@ -69,6 +69,13 @@ test_expect_success 'add a default queue and send it to the plugin' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 	flux python fake_payload.py
 '

diff --git a/t/t1012-mf-priority-load.t b/t/t1012-mf-priority-load.t
@@ -49,6 +49,13 @@ test_expect_success 'create fake_payload.py' '
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_factor_data = {
+		"data" : [
+				{"factor": "fairshare", "weight": 100000},
+				{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_factor_data)).get()
 	flux.Flux().rpc("job-manager.mf_priority.reprioritize")
 	EOF
 '

diff --git a/t/t1014-mf-priority-dne.t b/t/t1014-mf-priority-dne.t
@@ -62,6 +62,13 @@ test_expect_success 'send the user/bank information to the plugin without reprio
 		]
 	}
 	flux.Flux().rpc("job-manager.mf_priority.rec_q_update", json.dumps(bulk_queue_data)).get()
+	bulk_fac_data = {
+		"data" : [
+			{"factor": "fairshare", "weight": 100000},
+			{"factor": "queue", "weight": 10000}
+		]
+	}
+	flux.Flux().rpc("job-manager.mf_priority.rec_fac_update", json.dumps(bulk_fac_data)).get()
 	EOF
 	flux python fake_payload.py
 '