Skip to content
Snippets Groups Projects
Commit 2e68555c authored by Morris Jette's avatar Morris Jette
Browse files

Minor test updates

parent 3e705ece
No related branches found
No related tags found
No related merge requests found
...@@ -232,7 +232,6 @@ proc inc3_11_7 {} { ...@@ -232,7 +232,6 @@ proc inc3_11_7 {} {
} }
-re "JobState=PENDING" { -re "JobState=PENDING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n" send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n"
set exit_code 0
exp_continue exp_continue
} }
-re "JobState=RUNNING" { -re "JobState=RUNNING" {
...@@ -284,7 +283,6 @@ proc inc3_11_7 {} { ...@@ -284,7 +283,6 @@ proc inc3_11_7 {} {
} }
-re "JobState=PENDING" { -re "JobState=PENDING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n" send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected\033\[m\n"
set exit_code 0
exp_continue exp_continue
} }
-re "JobState=RUNNING" { -re "JobState=RUNNING" {
...@@ -325,7 +323,6 @@ proc inc3_11_7 {} { ...@@ -325,7 +323,6 @@ proc inc3_11_7 {} {
} }
-re "JobState=RUNNING" { -re "JobState=RUNNING" {
send_user "\n\033\[32mSUCCESS: Job $job_id is RUNNING as expected\033\[m\n" send_user "\n\033\[32mSUCCESS: Job $job_id is RUNNING as expected\033\[m\n"
set exit_code 0
exp_continue exp_continue
} }
timeout { timeout {
......
...@@ -103,10 +103,9 @@ proc inc3_11_8 {} { ...@@ -103,10 +103,9 @@ proc inc3_11_8 {} {
set core_res_num [expr $core_res_num + 1] set core_res_num [expr $core_res_num + 1]
# Make the reservation using more cores then free in a node # 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} { if {$ret_code != 0} {
send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected\033\[m\n" send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected\033\[m\n"
set exit_code 0
} else { } else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not\033\[m\n" send_user "\n\033\[31mFAILURE: reservation was created when it should have not\033\[m\n"
set exit_code 1 set exit_code 1
......
...@@ -79,7 +79,7 @@ expect { ...@@ -79,7 +79,7 @@ expect {
set job_id $expect_out(1,string) set job_id $expect_out(1,string)
exp_continue exp_continue
} }
-re "Failed to allocate resources" { -re "Unable to allocate resources" {
send_user "\nWARNING: can't test salloc task distribution\n" send_user "\nWARNING: can't test salloc task distribution\n"
exit $exit_code exit $exit_code
} }
......
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