From 467f7f79c733d843f4d47ccecc06d5278e80c638 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 6 Mar 2009 20:44:16 +0000
Subject: [PATCH] Modify parsing logic to avoid problem with TaskPlugin
parameter that includes slurm.conf Add sleep to account for NFS network delay
---
testsuite/expect/test7.11 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/testsuite/expect/test7.11 b/testsuite/expect/test7.11
index cd6d688d2ce..7dfbff48a56 100755
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -7,7 +7,7 @@
# "FAILURE: ..." otherwise with an explanation of the failure, OR
# anything else indicates a failure mode that must be investigated.
############################################################################
-# Copyright (C) 2008 Lawrence Livermore National Security.
+# Copyright (C) 2008-2009 Lawrence Livermore National Security.
# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
# Written by Morris Jette <jette1@llnl.gov>
# CODE-OCEC-09-009. All rights reserved.
@@ -67,7 +67,7 @@ log_user 0
set config_dir ""
spawn $scontrol show config
expect {
- -re "SLURM_CONF.*= (/.*)/slurm.conf" {
+ -re "SLURM_CONF.*= (/.*)/slurm.conf.*SLURM_VERSION" {
set config_dir $expect_out(1,string)
exp_continue
}
@@ -114,6 +114,10 @@ expect {
}
}
+# Allow enough time for configuration file in NFS to be propogated
+# to all nodes of cluster
+exec sleep 30
+
#
# Test of srun help message
#
--
GitLab