diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index 7efb50d21c2f6d47619b1b6c49fbcdce6ad0ad35..3d569877d693c1ac11dfabc07bd3027ad3c2d3c9 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -55,7 +55,7 @@ expect {
set too_small 1
exp_continue
}
- -re "ID" {
+ -re "ID " {
incr matches
exp_continue
}
@@ -80,7 +80,7 @@ expect {
send "q"
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
send "q"
exp_continue
@@ -100,7 +100,7 @@ if {$too_small != 0} {
exit 0
}
if {$matches != 6} {
- send_user "\nFAILURE: smap slurm partition display in curses mode\n"
+ send_user "\nFAILURE: smap slurm partition display in curses mode ($matches of 6)\n"
set exit_code 1
}
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index 9e77a396a54547d4b09d3ddd0be8d74ae3623a35..08c72ffa624c741ccc684c4dbec4dd7f05ad2d85 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -70,7 +70,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
diff --git a/testsuite/expect/test10.5 b/testsuite/expect/test10.5
index 5f47939a25e7b24838de37850d0613fcb674fcc9..76d04dc0c5dd2f3797e674369999cd5e13054b71 100755
--- a/testsuite/expect/test10.5
+++ b/testsuite/expect/test10.5
@@ -97,7 +97,7 @@ expect {
send "q\n"
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
set stuff [concat $stuff "7b"]
incr matches
send "q\n"
diff --git a/testsuite/expect/test10.6 b/testsuite/expect/test10.6
index 38a0493c7d25dda3d3d9df10b7f4e24235846f2a..7cc149167a1d55d4e05ef4fed4a032d17e10b764 100755
--- a/testsuite/expect/test10.6
+++ b/testsuite/expect/test10.6
@@ -36,7 +36,7 @@ source ./globals
set test_id "10.6"
set exit_code 0
set matches 0
-set non_bg 0
+set non_bg 0
print_header $test_id
@@ -83,7 +83,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index a384e9edcbfd72f2deaa337395c91c20b58a8afa..6cc26eba1077fd545d097382116793f60f93221f 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -91,7 +91,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
set stuff [concat $stuff "10"]
incr matches
exp_continue
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index f96628eb482e3de85ad03a89191caa2e159055d6..75cb7cdcc7d5623c7fb7358fbcea296415bc53af 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -158,7 +158,7 @@ expect {
set host_name $expect_out(1,string)
exp_continue
}
- -re "BP_List=($alpha_numeric_under)" {
+ -re "MidplaneList=($alpha_numeric_under)" {
set host_name $expect_out(1,string)
exp_continue
}
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index 60f6dbcbefe713fa118128f5667526ec63d9f623..66d611196e280af283ca776b26dbabbcc6567803 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -48,7 +48,7 @@ expect {
incr matches
exp_continue
}
- -re "REASON *USER *TIMESTAMP *BP_LIST" {
+ -re "REASON *USER *TIMESTAMP *MIDPLANELIST" {
incr matches
exp_continue
}
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index b569388d783488ee5af1ed2a4034ad49f447ea96..289626012f572ce5ad29408f904b07b1f868992e 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -71,7 +71,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
@@ -164,7 +164,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
@@ -242,7 +242,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index ad52d3c7e1f32a55e83e6ce628c8efbcd7544875..97d029464228dc308a9cf31c4543679d1e5ccae6 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -49,7 +49,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
@@ -96,7 +96,7 @@ expect {
incr matches
exp_continue
}
- -re "BP_LIST" {
+ -re "MIDPLANELIST" {
incr matches
exp_continue
}
diff --git a/testsuite/expect/test8.20 b/testsuite/expect/test8.20
index 28a243ee58dd3240e25fbb08aa24ddeb8e57dbbe..ed7f902dbc29adc91fdc7d8491e5f963749f6bc5 100755
--- a/testsuite/expect/test8.20
+++ b/testsuite/expect/test8.20
@@ -79,7 +79,7 @@ set timeout 5
set job_start1 -1
send "$scontrol show job $job_id\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set job_prefix $expect_out(1,string)
set job_start1 $expect_out(2,string)
set job_start2 $expect_out(3,string)
@@ -147,7 +147,7 @@ for {set step_size 1 } {$step_size <= $job_size} {set step_size [expr $step_size
set step_start1 -1
send "$srun -N$step_size --test-only $scontrol show step $job_id.$step_id\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set step_start1 $expect_out(2,string)
set step_start2 $expect_out(3,string)
@@ -161,7 +161,7 @@ for {set step_size 1 } {$step_size <= $job_size} {set step_size [expr $step_size
set step_fini5 $expect_out(11,string)
exp_continue
}
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set step_start1 $expect_out(2,string)
set step_start2 $expect_out(3,string)
diff --git a/testsuite/expect/test8.21 b/testsuite/expect/test8.21
index e11af44020cb6f048d312973d03d7f60b6134470..0cc01eafda7dd8d759aaba1168a271c14158aff8 100755
--- a/testsuite/expect/test8.21
+++ b/testsuite/expect/test8.21
@@ -81,7 +81,7 @@ set timeout 5
set job_start1 -1
send "$scontrol show job $job_id\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set job_prefix $expect_out(1,string)
set job_start1 $expect_out(2,string)
set job_start2 $expect_out(3,string)
@@ -152,7 +152,7 @@ for {set dim1 $job_start1} {$dim1 <= $job_fini1} {incr dim1} {
set timeout 60
send "./$file_prog $srun $squeue $job_id $actual_job_size 1\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set step_start1 $expect_out(2,string)
set step_start2 $expect_out(3,string)
@@ -183,7 +183,7 @@ expect {
}
exp_continue
}
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set dim1 $expect_out(2,string)
set dim2 $expect_out(3,string)
@@ -253,7 +253,7 @@ for {set dim1 $job_start1} {$dim1 <= $job_fini1} {incr dim1} {
set timeout 60
send "./$file_prog $srun $squeue $job_id $actual_job_size 2\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set step_start1 $expect_out(2,string)
set step_start2 $expect_out(3,string)
@@ -284,7 +284,7 @@ expect {
}
exp_continue
}
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)" {
set step_prefix $expect_out(1,string)
set dim1 $expect_out(2,string)
set dim2 $expect_out(3,string)
diff --git a/testsuite/expect/test8.21.bash b/testsuite/expect/test8.21.bash
index c6494bc5d4d0ef1f24d8384b1851bdf0c98ab495..206759c8ff280357a02f08ab44d67d5c3e478f4b 100755
--- a/testsuite/expect/test8.21.bash
+++ b/testsuite/expect/test8.21.bash
@@ -40,4 +40,4 @@ done
$srun -N1 --test-only sleep 50 &
sleep 5
-$squeue --jobs=$job_id --steps --noheader --format='Step_ID=%i BP_List=%N'
+$squeue --jobs=$job_id --steps --noheader --format='Step_ID=%i MidplaneList=%N'
diff --git a/testsuite/expect/test8.22 b/testsuite/expect/test8.22
index e6dd5b4694a70fffa74039e4b47c12980616b317..0acc1528caec9902c88c765bafe14e333d873199 100755
--- a/testsuite/expect/test8.22
+++ b/testsuite/expect/test8.22
@@ -80,7 +80,7 @@ if {$job_id == 0} {
set job_start1 -1
send "$scontrol show job $job_id\r"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set job_prefix $expect_out(1,string)
set job_start1 $expect_out(2,string)
set job_start2 $expect_out(3,string)
diff --git a/testsuite/expect/test8.23 b/testsuite/expect/test8.23
index c361c00047cd9cc2668dd033d3caa2007e1bc7cf..b7c2b8b68a1d258d58f368b0f66a3e57d9c271d1 100755
--- a/testsuite/expect/test8.23
+++ b/testsuite/expect/test8.23
@@ -84,9 +84,9 @@ if {[wait_for_job $job_id(1) RUNNING] != 0} {
exit 1
}
set job_start(1,1) -1
-spawn $squeue --jobs=$job_id(1) --noheader -o "%i BP_List=%N"
+spawn $squeue --jobs=$job_id(1) --noheader -o "%i MidplaneList=%N"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set job_prefix(1) $expect_out(1,string)
set job_start(1,1) $expect_out(2,string)
set job_start(1,2) $expect_out(3,string)
@@ -174,9 +174,9 @@ for {set inx 2} {$inx <= $job_count} {incr inx} {
sleep 15
for {set inx 2} {$inx <= $job_count} {incr inx} {
set job_start($inx,1) -1
- spawn $squeue --jobs=$job_id($inx) --noheader -o "%i BP_List=%N"
+ spawn $squeue --jobs=$job_id($inx) --noheader -o "%i MidplaneList=%N"
expect {
- -re "BP_List=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
+ -re "MidplaneList=($alpha_numeric).($digit)($digit)($digit)($digit)($digit)x($digit)($digit)($digit)($digit)($digit)" {
set job_prefix($inx) $expect_out(1,string)
set job_start($inx,1) $expect_out(2,string)
set job_start($inx,2) $expect_out(3,string)