From fee2dbfabf9403a81780bc9e7930e4f56ffe529b Mon Sep 17 00:00:00 2001
From: Felip Moll <felip.moll@schedmd.com>
Date: Tue, 28 Nov 2017 11:41:05 -0700
Subject: [PATCH] Modify test for better flexibility
Bug 4299
---
testsuite/expect/test15.39 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/testsuite/expect/test15.39 b/testsuite/expect/test15.39
index b26b7e3af85..fbec41792e1 100755
--- a/testsuite/expect/test15.39
+++ b/testsuite/expect/test15.39
@@ -73,14 +73,13 @@ if {$matches < $needed_nodes} {
set job_id 0
set timeout $max_job_delay
-set salloc_pid [spawn $salloc -p $partition -N1-2 --use-min-nodes -n$ncpus $bin_printenv SLURM_NNODES]
-#set salloc_pid [spawn $salloc -p $partition -N1-2 -n$ncpus $bin_printenv SLURM_NNODES]
+set salloc_pid [spawn $salloc -p $partition -N1-2 --use-min-nodes -n$ncpus $bin_printenv]
expect {
-re "Granted job allocation ($number)" {
set job_id $expect_out(1,string)
exp_continue
}
- -re "($number)" {
+ -re "SLURM_NNODES=($number)" {
set nodes $expect_out(1,string)
if {$nodes != 1} {
send_user "\nFAILURE: expected 1 allocated node\n"
--
GitLab