diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index d176dcaf477a883be4b2bd34012afc2dff42e222..bc6f30ad8603764ee5c8edb24b6438e7778d7974 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -598,7 +598,7 @@ proc wait_for_job { job_id desired_state } {
"PREEMPTED" -
"COMPLETED" {
if {[string compare $desired_state "DONE"] == 0} {
- send_user "Job $job_id is DONE\n"
+ send_user "Job $job_id is DONE ($state)\n"
sleep 2
return 0
}
diff --git a/testsuite/expect/inc21.21.1 b/testsuite/expect/inc21.21.1
index 0f3a8f03ed2cea570ec5df4f004c5cae0ab2982a..58d863a77303fb5cd383d31df53c40edead6f8be 100644
--- a/testsuite/expect/inc21.21.1
+++ b/testsuite/expect/inc21.21.1
@@ -29,16 +29,18 @@
proc inc21_21_1 { maxnode } {
global number bin_id ta srun exit_code
+ set job_id 0
send_user "\nTest MaxNode (Within: inc21.21.1)\n"
#
-# Spawn a job testing maxnode
+# Spawn a job testing maxnode
#
set matches 0
spawn $srun -v -N$maxnode --account=$ta $bin_id
expect {
-re "launching ($number)" {
+ set job_id $expect_out(1,string)
incr matches
exp_continue
}
@@ -51,11 +53,14 @@ proc inc21_21_1 { maxnode } {
}
}
+ if {$job_id != 0 && [wait_for_job $job_id "DONE"] != 0} {
+ send_user "\nFAILURE: job $job_id did not complete (Within: inc21.21.1)\n"
+ set exit_code 1
+ }
+
if { $matches != 1 } {
send_user "\nFAILURE: job dion't launch with correct limit (Within: inc21.21.1)\n"
set exit_code 1
return $exit_code
}
-
-
}
diff --git a/testsuite/expect/inc21.21.2 b/testsuite/expect/inc21.21.2
index 4a7adde6ba26fe893383acbbfc857f0c7dfeb291..6dd2a9747be22a4e0c11f9820cee74538be1cc0c 100644
--- a/testsuite/expect/inc21.21.2
+++ b/testsuite/expect/inc21.21.2
@@ -29,11 +29,12 @@
proc inc21_21_2 {maxnode} {
global number bin_id ta srun exit_code
+ set job_id 0
send_user "\nTest MaxNodes overage (Within: inc21.21.2)\n"
#
-# Spawn a job testing maxnode+1
+# Spawn a job testing maxnode+1
#
spawn $srun -N[expr $maxnode + 1] --account=$ta -I $bin_id
expect {
@@ -42,6 +43,7 @@ proc inc21_21_2 {maxnode} {
exp_continue
}
-re "launching ($number)" {
+ set job_id $expect_out(1,string)
send_user "\nFAILURE: job should not have run. (Within: inc21.21.2)\n"
set exit_code 1
exp_continue
@@ -55,9 +57,12 @@ proc inc21_21_2 {maxnode} {
}
}
+ if {$job_id != 0 && [wait_for_job $job_id "DONE"] != 0} {
+ send_user "\nFAILURE: job $job_id did not complete (Within: inc21.21.2)\n"
+ set exit_code 1
+ }
+
if { $exit_code } {
return $exit_code
}
-
-
}
diff --git a/testsuite/expect/inc21.21.3 b/testsuite/expect/inc21.21.3
index c36099178cf0db87b3157a5ec1351de155275fde..e28c732b02e77518405c3ecb3f8ab1e7771973bb 100644
--- a/testsuite/expect/inc21.21.3
+++ b/testsuite/expect/inc21.21.3
@@ -27,9 +27,10 @@
# Test for maxwall
#
-proc inc21_21_3 {maxwall } {
+proc inc21_21_3 { maxwall } {
global number bin_id ta srun exit_code
+ set job_id 0
send_user "\nTest MaxWall (Within: inc21.21.3)\n"
@@ -40,6 +41,7 @@ proc inc21_21_3 {maxwall } {
spawn $srun -v -t$maxwall --account=$ta $bin_id
expect {
-re "launching ($number)" {
+ set job_id $expect_out(1,string)
incr matches
exp_continue
}
@@ -52,11 +54,14 @@ proc inc21_21_3 {maxwall } {
}
}
+ if {$job_id != 0 && [wait_for_job $job_id "DONE"] != 0} {
+ send_user "\nFAILURE: job $job_id did not complete (Within: inc21.21.3)\n"
+ set exit_code 1
+ }
+
if { $matches != 1 } {
send_user "\nFAILURE: job dion't launch with correct limit (Within: inc21.21.3)\n"
set exit_code 1
return $exit_code
}
-
-
}
diff --git a/testsuite/expect/inc21.21.4 b/testsuite/expect/inc21.21.4
index 8f4afd587a9245fc7ac9eac5833b636258120e3d..a4924ff9f16053f93d643d300fd6197ee523a379 100644
--- a/testsuite/expect/inc21.21.4
+++ b/testsuite/expect/inc21.21.4
@@ -27,9 +27,10 @@
# Tesing maxwall+1
#
-proc inc21_21_4 {maxwall } {
+proc inc21_21_4 { maxwall } {
global number bin_id ta srun exit_code
+ set job_id 0
send_user "\nTest MaxWall overage (Within: inc21.21.4)\n"
@@ -43,6 +44,7 @@ proc inc21_21_4 {maxwall } {
exp_continue
}
-re "launching ($number)" {
+ set job_id $expect_out(1,string)
send_user "\nFAILURE: job should not have run. (Within: inc21.21.4)\n"
set exit_code 1
exp_continue
@@ -56,17 +58,12 @@ proc inc21_21_4 {maxwall } {
}
}
+ if {$job_id != 0 && [wait_for_job $job_id "DONE"] != 0} {
+ send_user "\nFAILURE: job $job_id did not complete (Within: inc21.21.4)\n"
+ set exit_code 1
+ }
+
if { $exit_code } {
return $exit_code
}
-
-
-
-
}
-
-
-
-
-
-
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 1fc216c84a16bc146b820f54fe84b227d0520a1a..3001603a1534d58a62acea79ce9c0d0a06cd77c5 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -42,13 +42,9 @@ set test_id "21.21"
set exit_code 0
set file_in "test.$test_id.input"
set ta "test$test_id-account.1"
-set timeout 60
-print_header $test_id
+set timeout 60
-if {[test_serial]} {
- send_user "\nWARNING: This test is not compatible with serial system\n"
- exit 0
-}
+print_header $test_id
proc _test_limits { } {
global file_in srun sbatch squeue scancel bin_id number bin_sleep bin_rm ta
@@ -87,13 +83,12 @@ proc _test_limits { } {
#
inc21_21_4 $acct_mod_assoc_vals(maxwall)
-
# This should overwrite the old file_in which has already been used,
# so no big deal.
make_bash_script $file_in "
$bin_sleep 5
"
-
+
# test job max cnt and submit
for {set inx 0} {$inx < $acct_mod_assoc_vals(maxsubmit)} {incr inx} {
set job_id($inx) 0
@@ -197,7 +192,7 @@ proc _test_limits { } {
if { $matches != 4 } {
- send_user "\nFAILURE: job's are in the state expected got $matches\n"
+ send_user "\nFAILURE: jobs are not in the expected state expected ($matches != 4)\n"
set exit_code 1
return $exit_code
}
@@ -205,6 +200,12 @@ proc _test_limits { } {
return $exit_code
}
+
+if {[test_serial]} {
+ send_user "\nWARNING: This test is not compatible with serial system\n"
+ exit 0
+}
+
#
# Check accounting config and bail if not found.
#
@@ -369,6 +370,7 @@ if {$job_id == 0} {
send_user "\nFAILURE: sbatch failed to use specified account\n"
set exit_code 1
}
+ cancel_job $job_id
}
#