Skip to content
Snippets Groups Projects
Commit bf28ff20 authored by Moe Jette's avatar Moe Jette
Browse files

modify test to work with select/cons_res

parent a3c4239b
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,7 @@ exit 0 ...@@ -51,7 +51,7 @@ exit 0
# #
# Create an allocation # Create an allocation
# #
set srun_pid [spawn $srun --allocate -N2 --verbose -t2] set salloc_pid [spawn $salloc -N2 -n4 --verbose -t2 $bin_bash]
expect { expect {
-re "More ($alpha) requested than permitted" { -re "More ($alpha) requested than permitted" {
send_user "\nWARNING: can't test srun task distribution\n" send_user "\nWARNING: can't test srun task distribution\n"
...@@ -61,8 +61,8 @@ expect { ...@@ -61,8 +61,8 @@ expect {
send "$srun -l -c1 $file_bash | sort -n\n" send "$srun -l -c1 $file_bash | sort -n\n"
} }
timeout { timeout {
send_user "\nFAILURE: srun not responding\n" send_user "\nFAILURE: salloc not responding\n"
slow_kill $srun_pid slow_kill $salloc_pid
exit 1 exit 1
} }
} }
...@@ -92,9 +92,9 @@ expect { ...@@ -92,9 +92,9 @@ expect {
exp_continue exp_continue
} }
timeout { timeout {
send_user "\nFAILURE: srun (from --allocate) not responding " send_user "\nFAILURE: salloc not responding "
send_user "or failure to recognize prompt\n" send_user "or failure to recognize prompt\n"
slow_kill $srun_pid slow_kill $salloc_pid
exit 1 exit 1
} }
-re $prompt -re $prompt
...@@ -269,9 +269,9 @@ expect { ...@@ -269,9 +269,9 @@ expect {
set exit_code 1 set exit_code 1
} }
timeout { timeout {
send_user "\nFAILURE: srun (from --allocate) not responding " send_user "\nFAILURE: salloc not responding "
send_user "or failure to recognize prompt\n" send_user "or failure to recognize prompt\n"
slow_kill $srun_pid slow_kill $salloc_pid
set exit_code 1 set exit_code 1
} }
eof { eof {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment