Skip to content
Snippets Groups Projects
Commit 090ea280 authored by Morris Jette's avatar Morris Jette
Browse files

Minor test changes for configured Epilog delay

parent 4467bc64
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ if {[test_cray]} { ...@@ -46,6 +46,7 @@ if {[test_cray]} {
# #
# Spawn a srun jobs with ever larger node counts # Spawn a srun jobs with ever larger node counts
# #
set alloc_fail 0
set timeout 60 set timeout 60
for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} { for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} {
set srun_pid [spawn $srun --test-only -N$node_cnt -t1 $bin_printenv SLURMD_NODENAME] set srun_pid [spawn $srun --test-only -N$node_cnt -t1 $bin_printenv SLURMD_NODENAME]
...@@ -55,6 +56,7 @@ for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} { ...@@ -55,6 +56,7 @@ for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} {
exp_continue exp_continue
} }
-re "allocation failure" { -re "allocation failure" {
set alloc_fail 1
set node_cnt 0 set node_cnt 0
exp_continue exp_continue
} }
...@@ -77,6 +79,8 @@ for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} { ...@@ -77,6 +79,8 @@ for {set node_cnt 1} {$node_cnt > 0} {set node_cnt [expr $node_cnt * 2]} {
if {$jobs_run == 0} { if {$jobs_run == 0} {
send_user "\nFAILURE: No jobs run\n" send_user "\nFAILURE: No jobs run\n"
set exit_code 1 set exit_code 1
} elseif {$alloc_fail == 1} {
send_user "\nError expected. No worries.\n"
} }
if {$exit_code == 0} { if {$exit_code == 0} {
......
...@@ -221,7 +221,7 @@ if {[wait_for_job $job_id "RUNNING"] != 0} { ...@@ -221,7 +221,7 @@ if {[wait_for_job $job_id "RUNNING"] != 0} {
} }
# Wait for data to get logged # Wait for data to get logged
exec $bin_sleep 5 exec $bin_sleep 10
if {[_get_mem $sstat] != 0} { if {[_get_mem $sstat] != 0} {
set exit_code 1 set exit_code 1
......
...@@ -186,7 +186,7 @@ if {$job_id == 0} { ...@@ -186,7 +186,7 @@ if {$job_id == 0} {
} }
if { $using_slurmdbd } { if { $using_slurmdbd } {
sleep 5 sleep 10
} }
......
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