Minor test fixes to work under all cases.

testsuite/expect/test1.91

@@ -207,6 +207,10 @@ expect {
 		slow_kill $salloc_pid
 		exit 1
 	}
+	-re "$srun" {
+		# just so we don't grab the srun call
+		exp_continue;
+	}
 	-re $prompt
 }
 
@@ -232,6 +236,10 @@ expect {
 		send_user "or failure to recognize prompt\n"
 		set exit_code 1
 	}
+	-re "$srun" {
+		# just so we don't grab the srun call
+		exp_continue;
+	}
 	-re $prompt
 }
 if {$task_mask != $expected_mask} {
@@ -274,6 +282,10 @@ while {$this_cnt <= $num_sockets} {
 			send_user "or failure to recognize prompt\n"
 			set exit_code 1
 		}
+		-re "$srun" {
+			# just so we don't grab the srun call
+			exp_continue;
+		}
 		-re $prompt
 	}
 
@@ -324,6 +336,10 @@ while {$this_cnt <= $num_cores} {
 			send_user "or failure to recognize prompt\n"
 			set exit_code 1
 		}
+		-re "$srun" {
+			# just so we don't grab the srun call
+			exp_continue;
+		}
 		-re $prompt
 	}
 
@@ -374,6 +390,10 @@ while {$this_cnt <= $num_threads} {
 			send_user "or failure to recognize prompt\n"
 			set exit_code 1
 		}
+		-re "$srun" {
+			# just so we don't grab the srun call
+			exp_continue;
+		}
 		-re $prompt
 	}
 
@@ -423,6 +443,10 @@ while {$this_cnt <= $task_cnt} {
 			send_user "or failure to recognize prompt\n"
 			set exit_code 1
 		}
+		-re "$srun" {
+			# just so we don't grab the srun call
+			exp_continue;
+		}
 		-re $prompt
 	}
 

testsuite/expect/test2.18

@@ -158,7 +158,7 @@ proc test_part { acct part acct_con } {
 
 
 	set sub_job 0
-	spawn $srun -A $acct -p $part hostname
+	spawn $srun -I -A $acct -p $part hostname
 	expect {
 		-re "$host_name" {
 			set sub_job 1

testsuite/expect/test2.19

@@ -188,7 +188,7 @@ proc test_part {acct qos part qos_con } {
 	global srun host_name part_name exit_code
 
 	set sub_job 0
-	spawn $srun -A $acct --qos $qos -p $part hostname
+	spawn $srun -I -A $acct --qos $qos -p $part hostname
 	expect {
 		-re "$host_name" {
 			set sub_job 1