Remove srun references

testsuite/expect/test18.5

@@ -58,18 +58,19 @@ exec echo "exit 0"         >>$file_in
 exec $bin_chmod 700 $file_in
 
 #
-# Spawn a shell via srun that uses stdin/out/err and confirm their contents
+# Spawn a shell via slaunch that uses stdin/out/err and confirm their contents
 #
 set timeout $max_job_delay
-spawn $salloc -N1 -t1 $slaunch --local-input=$file_in --local-output=$file_out --local-error=$file_err $bin_bash
+set io_options "--local-input=$file_in --local-output=$file_out --local-error=$file_err"
+set salloc_pid [spawn $salloc -N1 -t1 $slaunch $io_options $bin_bash]
 expect {
 	-re "Unable to contact" {
 		send_user "\nFAILURE: slurm appears to be down\n"
 		exit 1
 	}
 	timeout {
-		send_user "\nFAILURE: srun not responding\n"
-		kill_srun
+		send_user "\nFAILURE: salloc/slaunch not responding\n"
+		exec $bin_kill -TERM "-$salloc_pid"
 		set exit_code 1
 		exp_continue
 	}