From 552ed09dc942f0345c0327a497f20cf4d2426aec Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 27 May 2016 09:09:45 -0700
Subject: [PATCH] Modify test to ignore new srun warning
srun was modified to log
Warning: can't honor --ntasks-per-node set to 8 which doesn't match the requested tasks 23 with the number of requested nodes 3. Ignoring --ntasks-per-node.
but this tests was parsing that warning, causing a test failure.
Modify the test's parsing logic.
---
testsuite/expect/test1.97 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index d11f82c19ca..4b0022a3b72 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -235,7 +235,7 @@ proc submit_cpu {ntasks ncpus} {
-re "job ($number)" {
exp_continue
}
- -re "($number) ($alpha_numeric_nodelist)" {
+ -re " ($number) ($alpha_numeric_nodelist)" {
set tasks($x) $expect_out(1,string)
set nodes($x) $expect_out(2,string)
incr x 1
@@ -271,7 +271,7 @@ proc submit_tasks {ntasks ntaskpn} {
-re "job ($number)" {
exp_continue
}
- -re "($number) ($alpha_numeric_nodelist)" {
+ -re " ($number) ($alpha_numeric_nodelist)" {
set tasks($x) $expect_out(1,string)
set nodes($x) $expect_out(2,string)
incr x 1
--
GitLab