From f0da41ddb74cf89700bc2406ad2121ef4070aac2 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 16 Sep 2014 10:33:02 -0700
Subject: [PATCH] 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.
---
testsuite/expect/inc21.21.2 | 2 +-
testsuite/expect/inc21.21.4 | 2 +-
testsuite/expect/test21.21 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/inc21.21.2 b/testsuite/expect/inc21.21.2
index f35f9f80de2..4a7adde6ba2 100644
--- a/testsuite/expect/inc21.21.2
+++ b/testsuite/expect/inc21.21.2
@@ -35,7 +35,7 @@ proc inc21_21_2 {maxnode} {
#
# 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 {
-re "Job violates accounting policy" {
send_user "\nThis error is expected, not a problem (Within: inc21.21.2)\n"
diff --git a/testsuite/expect/inc21.21.4 b/testsuite/expect/inc21.21.4
index 58858482d04..8f4afd587a9 100644
--- a/testsuite/expect/inc21.21.4
+++ b/testsuite/expect/inc21.21.4
@@ -36,7 +36,7 @@ proc inc21_21_4 {maxwall } {
#
# 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 {
-re "Job violates accounting/QOS policy" {
send_user "\nThis error is expected, not a problem (Within: inc21.21.4)\n"
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 06042b26761..1fc216c84a1 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -170,7 +170,7 @@ proc _test_limits { } {
set matches 0
set mypid [spawn $squeue -o "\%i \%t \%r"]
expect {
- -re "($job_id(2)|$job_id(3)).PD.AssociationJobLimit" {
+ -re "($job_id(2)|$job_id(3)).PD.AssocMaxJobsLimit" {
incr matches
exp_continue
}
--
GitLab