From 2e68555cca343c787523fb9226f8cd41d0c2f10f Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 13 Sep 2012 10:57:35 -0700
Subject: [PATCH] Minor test updates
---
testsuite/expect/inc3.11.7 | 3 ---
testsuite/expect/inc3.11.8 | 3 +--
testsuite/expect/test15.21 | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/testsuite/expect/inc3.11.7 b/testsuite/expect/inc3.11.7
index 8815a63a811..2323d2999b5 100644
--- a/testsuite/expect/inc3.11.7
+++ b/testsuite/expect/inc3.11.7
@@ -232,7 +232,6 @@ proc inc3_11_7 {} {
}
-re "JobState=PENDING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n"
- set exit_code 0
exp_continue
}
-re "JobState=RUNNING" {
@@ -284,7 +283,6 @@ proc inc3_11_7 {} {
}
-re "JobState=PENDING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n"
- set exit_code 0
exp_continue
}
-re "JobState=RUNNING" {
@@ -325,7 +323,6 @@ proc inc3_11_7 {} {
}
-re "JobState=RUNNING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is RUNNING as expected\033\[m\n"
- set exit_code 0
exp_continue
}
timeout {
diff --git a/testsuite/expect/inc3.11.8 b/testsuite/expect/inc3.11.8
index 60492cf37a1..7294bb16100 100644
--- a/testsuite/expect/inc3.11.8
+++ b/testsuite/expect/inc3.11.8
@@ -103,10 +103,9 @@ proc inc3_11_8 {} {
set core_res_num [expr $core_res_num + 1]
# Make the reservation using more cores then free in a node
- set ret_code [create_res "StartTime=now Duration=60 NodeCnt=1 CoreCnt=$core_res_num User=$user_name" 0]
+ set ret_code [create_res "StartTime=now Duration=60 NodeCnt=1 CoreCnt=$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected\033\[m\n"
- set exit_code 0
} else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not\033\[m\n"
set exit_code 1
diff --git a/testsuite/expect/test15.21 b/testsuite/expect/test15.21
index 7e30050d0d7..46891c0a6f6 100755
--- a/testsuite/expect/test15.21
+++ b/testsuite/expect/test15.21
@@ -79,7 +79,7 @@ expect {
set job_id $expect_out(1,string)
exp_continue
}
- -re "Failed to allocate resources" {
+ -re "Unable to allocate resources" {
send_user "\nWARNING: can't test salloc task distribution\n"
exit $exit_code
}
--
GitLab