diff --git a/testsuite/expect/inc12.3.2 b/testsuite/expect/inc12.3.2 index e8c1fe24135eb4d82a886d8a2c9b87e1f2b995c7..ac5ffde50eca10445589d54a4c8d2b00397644cb 100755 --- a/testsuite/expect/inc12.3.2 +++ b/testsuite/expect/inc12.3.2 @@ -27,7 +27,7 @@ source ./globals source ./globals_accounting -proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 job_1_node_2 job_2_node_1 job_2_node_2} { +proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 job_1_node_2 job_2_node_0 job_2_node_1} { global alpha_numeric_under sacct global exit_code @@ -37,7 +37,6 @@ proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 j set job_2_match 0 spawn $sacct -A '$test_acct' -N$job_1_node_0 expect { - -re "$job_id_1" { incr job_1_match exp_continue @@ -69,7 +68,6 @@ proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 j set job_2_match 0 spawn $sacct -A '$test_acct' -N$job_1_node_2 expect { - -re "$job_id_1" { incr job_1_match exp_continue @@ -92,12 +90,11 @@ proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 j } - send_user "\nSearch for jobs on node: $job_2_node_1\n" + send_user "\nSearch for jobs on node: $job_2_node_0\n" set job_1_match 0 set job_2_match 0 - spawn $sacct -A '$test_acct' -N$job_2_node_1 + spawn $sacct -A '$test_acct' -N$job_2_node_0 expect { - -re "$job_id_1" { incr job_1_match exp_continue @@ -115,17 +112,16 @@ proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 j } } if {$job_2_match != 1} { - send_user "\nFAILURE:sacct was unable to find the job $job_id_2 on node $job_2_node_1 ($job_2_match != 1)\n" + send_user "\nFAILURE:sacct was unable to find the job $job_id_2 on node $job_2_node_0 ($job_2_match != 1)\n" set exit_code 1 } - send_user "\nSearch for jobs on node: $job_2_node_2\n" + send_user "\nSearch for jobs on node: $job_2_node_1\n" set job_1_match 0 set job_2_match 0 - spawn $sacct -A '$test_acct' -N$job_2_node_2 + spawn $sacct -A '$test_acct' -N$job_2_node_1 expect { - -re "$job_id_1" { incr job_1_match exp_continue @@ -142,9 +138,8 @@ proc inc12_3_2 {job_id_1 job_id_2 job_name_1 job_name_2 test_acct job_1_node_0 j wait } } - if {$job_2_match != 1} { - send_user "\nFAILURE: sacct was unable to find the job $job_id_2 on node $job_2_node_2 ($job_2_match != 1)\n" + send_user "\nFAILURE: sacct was unable to find the job $job_id_2 on node $job_2_node_1 ($job_2_match != 1)\n" set exit_code 1 } }