From d46b3f65cfa839f6efeabc4db66d120116f6d5a5 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 2 Jul 2009 20:43:38 +0000
Subject: [PATCH] Add ignore_jobs flag to all reservation creations so they
don't fail when jobs are running (change for slurm v2.1) Add simple test for
License option when creating a reservation
---
testsuite/expect/test3.11 | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index aa976e80331..2d2dd91b0dc 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -277,17 +277,18 @@ expect {
#
set badtests "
{}
- {Duration=5 Nodes=$def_node User=$user_name}
- {StartTime=now Nodes=$def_node User=$user_name}
- {StartTime=midnight Duration=600 User=$user_name}
- {StartTime=now Duration=5 Nodes=ALL}
- {StartTime=now Duration=5 NodeCnt= Nodes= User=$user_name}
- {StartTime=now Duration=5 User=$user_name}
- {StartTime=blah Duration=5 Nodes=$def_node User=$user_name}
- {StartTime=now Duration=foo Nodes=$def_node User=$user_name}
- {StartTime=now Duration=5 Nodes=$def_node User=$user_name PartitionName=badpartname}
- {StartTime=now Duration=5 Nodes=$def_node User=$user_name Flags=badtype}
- {StartTime=now+10minutes EndTime=now Nodes=$def_node User=$user_name}
+ {Duration=5 Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=midnight Duration=600 User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=ALL Flags=ignore_jobs}
+ {StartTime=now Duration=5 NodeCnt= Nodes= User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 User=$user_name Flags=ignore_jobs}
+ {StartTime=blah Duration=5 Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=foo Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name PartitionName=badpartname Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name Flags=badtype,ignore_jobs}
+ {StartTime=now+10minutes EndTime=now Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name Licenses=DUMMY_FOR_TESTING Flags=ignore_jobs}
"
# {StartTime=now Duration=5 Nodes=$def_node Account=badaccountname}
@@ -308,13 +309,13 @@ if {[test_super_user] == 0} {
}
set goodtests "
- {StartTime=now Duration=5 Nodes=$def_node User=$user_name}
- {StartTime=now+5minutes EndTime=now+10minutes Nodes=$def_node User=$user_name}
- {StartTime=midnight Duration=600 Nodes=$def_node User=$user_name}
- {StartTime=now Duration=5 Nodes=ALL User=$user_name}
- {StartTime=now Duration=5 NodeCnt=1 User=$user_name}
- {StartTime=now Duration=5 Nodes=$def_node User=$user_name PartitionName=$def_partition}
- {StartTime=now Duration=5 Nodes=$def_node User=$user_name Flags=Maint}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now+5minutes EndTime=now+10minutes Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=midnight Duration=600 Nodes=$def_node User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=ALL User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 NodeCnt=1 User=$user_name Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name PartitionName=$def_partition Flags=ignore_jobs}
+ {StartTime=now Duration=5 Nodes=$def_node User=$user_name Flags=Maint Flags=ignore_jobs}
"
foreach test $goodtests {
set ret_code [create_res $test 0]
--
GitLab