From 456d498d85aed0eab2a52e75b4af1648a4b0ad4c Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 21 Jan 2016 09:16:41 -0800
Subject: [PATCH] Fix test for delayed job launch
If a job launch is delayed, the test was failing due to bad parsing.
These lines were being interpretted as a counter folloed by node
names of "queued" and "has":
srun: job 1332712 queued and waiting for resources
srun: job 1332712 has been allocated resources
---
testsuite/expect/test1.97 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index 0a975815ce6..d11f82c19ca 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -232,6 +232,9 @@ proc submit_cpu {ntasks ncpus} {
set x 0
spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks -w$nodelist -c$ncpus --exclusive $bin_printenv SLURMD_NODENAME | $bin_sort -V | $bin_uniq -c"
expect {
+ -re "job ($number)" {
+ exp_continue
+ }
-re "($number) ($alpha_numeric_nodelist)" {
set tasks($x) $expect_out(1,string)
set nodes($x) $expect_out(2,string)
@@ -265,6 +268,9 @@ proc submit_tasks {ntasks ntaskpn} {
set x 0
spawn $bin_bash -c "$srun -N$num_nodes -n$ntasks --ntasks-per-node=$ntaskpn -w$nodelist --exclusive $bin_printenv SLURMD_NODENAME | $bin_sort -V | $bin_uniq -c"
expect {
+ -re "job ($number)" {
+ exp_continue
+ }
-re "($number) ($alpha_numeric_nodelist)" {
set tasks($x) $expect_out(1,string)
set nodes($x) $expect_out(2,string)
--
GitLab