From 108edd31cf019f2e6926ee5d117c502df3ec809d Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 3 Jan 2013 11:13:34 -0800
Subject: [PATCH] Modify test for changed scontrol output and disable with
select/serial
---
testsuite/expect/test17.17 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index 6f8fe42376e..3485244bbab 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -47,6 +47,9 @@ print_header $test_id
if {[test_cray]} {
send_user "\nWARNING: This test is incompatible with Cray systems\n"
exit $exit_code
+} elseif {[test_serial]} {
+ send_user "\nWARNING: Test incompatible with select/serial\n"
+ exit $exit_code
}
#
@@ -114,14 +117,14 @@ set waited 1
set timeout [expr $max_job_delay + 5]
set srun_pid [spawn $srun -N1 --nodelist=$nodelist_name -t1 --share $scontrol -o show job $job_id1]
expect {
- -re "Partition=($alpha_numeric_under)" {
- set partition $expect_out(1,string)
- exp_continue
- }
-re "JobState=RUN" {
set waited 0
exp_continue
}
+ -re "Partition=($alpha_numeric_under)" {
+ set partition $expect_out(1,string)
+ exp_continue
+ }
timeout {
send_user "\nFAILURE: srun not responding\n"
slow_kill $srun_pid
--
GitLab