From 19d0aaba26065f323ab779887f5b97393db0d9d0 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 19 Sep 2006 17:42:14 +0000
Subject: [PATCH] Replace some kill_srun calls with slow_kill pid
---
testsuite/expect/test1.1 | 4 ++--
testsuite/expect/test1.2 | 4 ++--
testsuite/expect/test1.3 | 4 ++--
testsuite/expect/test1.4 | 4 ++--
testsuite/expect/test1.5 | 4 ++--
testsuite/expect/test1.6 | 4 ++--
testsuite/expect/test15.4 | 5 ++---
testsuite/expect/test15.5 | 10 ++++------
testsuite/expect/test15.7 | 7 +++----
9 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 4787920a2ed..c4dc9727633 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -70,7 +70,7 @@ if {$got_login_grps == 0} {
# Submit a slurm job that will execute 'id'
#
set timeout $max_job_delay
-spawn $srun -N1 -t1 $bin_id
+set srun_pid [spawn $srun -N1 -t1 $bin_id]
expect {
-re "(uid=.*\n)" {
set job_grp_info $expect_out(1,string)
@@ -79,7 +79,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index 43302bb3bbe..d6b90a0a487 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -43,7 +43,7 @@ print_header $test_id
# Submit a slurm job that will execute 'id' on 1 node and over task_cnt tasks
#
set timeout $max_job_delay
-spawn $srun -N1 -n$task_cnt --overcommit -l -t1 $bin_id
+set srun_pid [spawn $srun -N1 -n$task_cnt --overcommit -l -t1 $bin_id]
expect {
-re "uid=" {
incr tasks
@@ -51,7 +51,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index 9e037a53494..23838281a66 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -40,7 +40,7 @@ print_header $test_id
#
# Report the srun version number
#
-spawn $srun -V
+set srun_pid [spawn $srun -V]
expect {
-re "(slurm ($number)\.($number)\.($number).*\n)" {
incr version
@@ -48,7 +48,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index b8297109807..177f1edb896 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -40,7 +40,7 @@ print_header $test_id
#
# Report the srun usage format
#
-spawn $srun --usage
+set srun_pid [spawn $srun --usage]
expect {
-re "Usage: .* executable .*" {
incr matches
@@ -48,7 +48,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index 4d03930aba2..179da4a4245 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -40,7 +40,7 @@ print_header $test_id
#
# Report the srun help message
#
-spawn $srun --help
+set srun_pid [spawn $srun --help]
expect {
-re "Usage:" {
incr matches
@@ -56,7 +56,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 86ba387255c..2863c290832 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -45,7 +45,7 @@ print_header $test_id
# Change working directory on execute line and then print where jobs runs
#
set timeout $max_job_delay
-spawn $srun --chdir=$tmp_dir -t1 $bin_pwd
+set srun_pid [spawn $srun --chdir=$tmp_dir -t1 $bin_pwd]
expect {
-re "$tmp_dir$end_of_line" {
set matches 1
@@ -57,7 +57,7 @@ expect {
}
timeout {
send_user "\nFAILURE: srun not responding\n"
- kill_srun
+ slow_kill $srun_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4
index 19e81d6f613..af727668bc7 100755
--- a/testsuite/expect/test15.4
+++ b/testsuite/expect/test15.4
@@ -84,11 +84,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
- if {$job_id == 0} {
- slow_kill $salloc_pid
- } else {
+ if {$job_id != 0} {
cancel_job $job_id
}
+ slow_kill $salloc_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index 8a39701a466..3f90be30672 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -116,11 +116,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
- if {$job_id == 0} {
- slow_kill $salloc_pid
- } else {
+ if {$job_id != 0} {
cancel_job $job_id
}
+ slow_kill $salloc_pid
set exit_code 1
exp_continue
}
@@ -143,11 +142,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
- if {$job_id == 0} {
- slow_kill $salloc_pid
- } else {
+ if {$job_id != 0} {
cancel_job $job_id
}
+ slow_kill $salloc_pid
set exit_code 1
exp_continue
}
diff --git a/testsuite/expect/test15.7 b/testsuite/expect/test15.7
index 16d7069ea7f..328383ff484 100755
--- a/testsuite/expect/test15.7
+++ b/testsuite/expect/test15.7
@@ -60,11 +60,10 @@ expect {
}
timeout {
send_user "\nFAILURE: salloc not responding\n"
- if {$job_id == 0} {
- slow_kill $salloc_pid
- } else {
+ if {$job_id != 0} {
cancel_job $job_id
- ]
+ }
+ slow_kill $salloc_pid
set exit_code 1
exp_continue
}
--
GitLab