From 1b679f705bbffbb7e7bdf930750e24b05320cb4b Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Fri, 1 Nov 2013 16:48:09 -0700
Subject: [PATCH] Fix test for new FairShareDampeningFactor
Disable test if FairShareDampeningFactor != 1
---
testsuite/expect/globals | 34 ++++++++++++++++++++++++++++++++++
testsuite/expect/test24.1 | 7 +++++++
2 files changed, 41 insertions(+)
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 6fc761306e1..c019b67736c 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -2696,3 +2696,37 @@ proc check_node_mem { } {
log_user 1
}
+
+################################################################
+#
+# Proc: get_fs_damping_factor
+#
+# Purpose: get FairShareDampeningFactor configuration parameter
+#
+# Returns FairShareDampeningFactor
+#
+################################################################
+proc get_fs_damping_factor { } {
+ global scontrol number
+
+ log_user 0
+ set damp 1
+ set scon_pid [spawn -noecho $scontrol show config]
+ expect {
+ -re "FairShareDampeningFactor *= ($number)" {
+ set damp $expect_out(1,string)
+ exp_continue
+ }
+ timeout {
+ send_user "\nFAILURE: scontrol not responding\n"
+ slow_kill $scon_pid
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+ }
+ log_user 1
+
+ return $damp
+}
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index 062b992a582..e7526701779 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -39,8 +39,15 @@ set test_id "24.1"
set exit_code 0
set test_prog "test$test_id.prog"
set matches 0
+
print_header $test_id
+set damp [get_fs_damping_factor]
+if {$damp != 1} {
+ send_user "Unable to run with FairShareDampeningFactor=$damp (must be 1)\n"
+ exit 0
+}
+
#
# Delete left-over programs and rebuild them
#
--
GitLab