diff --git a/t/t1020-mf-priority-issue262.t b/t/t1020-mf-priority-issue262.t index a7f40c7e3..1402eda32 100755 --- a/t/t1020-mf-priority-issue262.t +++ b/t/t1020-mf-priority-issue262.t @@ -15,102 +15,102 @@ test_under_flux 1 job flux setattr log-stderr-level 1 test_expect_success 'create flux-accounting DB' ' - flux account -p $(pwd)/FluxAccountingTest.db create-db + flux account -p $(pwd)/FluxAccountingTest.db create-db ' test_expect_success 'start flux-accounting service' ' - flux account-service -p ${DB_PATH} -t + flux account-service -p ${DB_PATH} -t ' test_expect_success 'load multi-factor priority plugin' ' - flux jobtap load -r .priority-default ${MULTI_FACTOR_PRIORITY} + flux jobtap load -r .priority-default ${MULTI_FACTOR_PRIORITY} ' test_expect_success 'check that mf_priority plugin is loaded' ' - flux jobtap list | grep mf_priority + flux jobtap list | grep mf_priority ' test_expect_success 'add some banks to the DB' ' - flux account add-bank root 1 && - flux account add-bank --parent-bank=root account1 1 && - flux account add-bank --parent-bank=root account2 1 && - flux account add-bank --parent-bank=root account3 1 + flux account add-bank root 1 && + flux account add-bank --parent-bank=root account1 1 && + flux account add-bank --parent-bank=root account2 1 && + flux account add-bank --parent-bank=root account3 1 ' test_expect_success 'add a user with two different banks to the DB' ' - flux account add-user --username=user1001 --userid=1001 --bank=account1 --max-running-jobs=5 --max-active-jobs=10 && - flux account add-user --username=user1001 --userid=1001 --bank=account2 + flux account add-user --username=user1001 --userid=1001 --bank=account1 --max-running-jobs=5 --max-active-jobs=10 && + flux account add-user --username=user1001 --userid=1001 --bank=account2 ' test_expect_success 'send flux-accounting DB information to the plugin' ' - flux account-priority-update -p $(pwd)/FluxAccountingTest.db + flux account-priority-update -p $(pwd)/FluxAccountingTest.db ' test_expect_success 'submit a sleep 180 job and ensure it is running' ' - jobid1=$(flux python ${SUBMIT_AS} 1001 sleep 180) && - flux job wait-event -vt 60 $jobid1 alloc && - flux job info $jobid1 eventlog > eventlog.out && - grep "alloc" eventlog.out + jobid1=$(flux python ${SUBMIT_AS} 1001 sleep 180) && + flux job wait-event -vt 60 $jobid1 alloc && + flux job info $jobid1 eventlog > eventlog.out && + grep "alloc" eventlog.out ' test_expect_success 'stop scheduler from allocating resources to jobs' ' - flux queue stop + flux queue stop ' test_expect_success 'submit 2 more sleep 180 jobs; ensure both are in SCHED state' ' - jobid2=$(flux python ${SUBMIT_AS} 1001 sleep 180) && - jobid3=$(flux python ${SUBMIT_AS} 1001 sleep 180) && - flux job wait-event -vt 60 $jobid2 priority && - flux job info $jobid2 eventlog > eventlog.out && - grep "priority" eventlog.out && - flux job wait-event -vt 60 $jobid3 priority && - flux job info $jobid3 eventlog > eventlog.out && - grep "priority" eventlog.out + jobid2=$(flux python ${SUBMIT_AS} 1001 sleep 180) && + jobid3=$(flux python ${SUBMIT_AS} 1001 sleep 180) && + flux job wait-event -vt 60 $jobid2 priority && + flux job info $jobid2 eventlog > eventlog.out && + grep "priority" eventlog.out && + flux job wait-event -vt 60 $jobid3 priority && + flux job info $jobid3 eventlog > eventlog.out && + grep "priority" eventlog.out ' test_expect_success 'ensure current running and active jobs are correct: 1 running, 3 active' ' - flux jobtap query mf_priority.so > query_1.json && - test_debug "jq -S . query_1.json && + test_debug "jq -S . query_2.json && - test_debug "jq -S . query_2.json && + test_debug "jq -S . query_3.json && - test_debug "jq -S . query_3.json && + test_debug "jq -S . query_4.json && - test_debug "jq -S . query_4.json && + test_debug "jq -S . query_5.json && - test_debug "jq -S . query_5.json && + test_debug "jq -S .