Skip to content
Snippets Groups Projects
Commit f0da41dd authored by Danny Auble's avatar Danny Auble
Browse files

Fix tests to work now that a job can pend forever on an association

limit since it behaves the same way a QOS limit would unless the QOS has
the DenyOnLimit flag set.
parent 11caeeb0
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,7 @@ proc inc21_21_2 {maxnode} { ...@@ -35,7 +35,7 @@ proc inc21_21_2 {maxnode} {
# #
# Spawn a job testing maxnode+1 # Spawn a job testing maxnode+1
# #
spawn $srun -N[expr $maxnode + 1] --account=$ta $bin_id spawn $srun -N[expr $maxnode + 1] --account=$ta -I $bin_id
expect { expect {
-re "Job violates accounting policy" { -re "Job violates accounting policy" {
send_user "\nThis error is expected, not a problem (Within: inc21.21.2)\n" send_user "\nThis error is expected, not a problem (Within: inc21.21.2)\n"
......
...@@ -36,7 +36,7 @@ proc inc21_21_4 {maxwall } { ...@@ -36,7 +36,7 @@ proc inc21_21_4 {maxwall } {
# #
# Spawn a job testing maxwall+1 # Spawn a job testing maxwall+1
# #
spawn $srun -t[expr $maxwall + 1] --account=$ta $bin_id spawn $srun -t[expr $maxwall + 1] --account=$ta -I $bin_id
expect { expect {
-re "Job violates accounting/QOS policy" { -re "Job violates accounting/QOS policy" {
send_user "\nThis error is expected, not a problem (Within: inc21.21.4)\n" send_user "\nThis error is expected, not a problem (Within: inc21.21.4)\n"
......
...@@ -170,7 +170,7 @@ proc _test_limits { } { ...@@ -170,7 +170,7 @@ proc _test_limits { } {
set matches 0 set matches 0
set mypid [spawn $squeue -o "\%i \%t \%r"] set mypid [spawn $squeue -o "\%i \%t \%r"]
expect { expect {
-re "($job_id(2)|$job_id(3)).PD.AssociationJobLimit" { -re "($job_id(2)|$job_id(3)).PD.AssocMaxJobsLimit" {
incr matches incr matches
exp_continue exp_continue
} }
......
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