Modify tests for BP_LIST change to MIDPLANELIST

Update tests as appropriate for change in output of many commands.
BP_LIST or BP_List change to MIDPLANELIST or MidplaneList.

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
 }
 

testsuite/expect/test10.4

@@ -70,7 +70,7 @@ expect {
 		incr matches
 		exp_continue
 	}
-	-re "BP_LIST" {
+	-re "MIDPLANELIST" {
 		incr matches
 		exp_continue
 	}

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"

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
 	}

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

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
 	}

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
 	}

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
 	}

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
 	}

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)

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)

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'

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)

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)