From d9422a7fe848f57b6adc5a6781319096eb53d6f3 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 12 Jun 2009 20:35:43 +0000
Subject: [PATCH] modify test19.5 due to possible failure for power save mode.
add global test_power_save
---
testsuite/expect/globals | 32 ++++++++++++++++++++++++++++++++
testsuite/expect/test19.5 | 8 ++++++--
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index e9520b849da..418270cb708 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -637,6 +637,38 @@ proc test_assoc_enforced { } {
return $assoc_enforced
}
+################################################################
+#
+# Proc: test_power_save
+#
+# Return 1 if power save mode is enabled, 0 otherwise
+#
+################################################################
+proc test_power_save { } {
+ global scontrol number
+
+ log_user 0
+ set resume_rate 0
+ spawn $scontrol show config
+ expect {
+ -re "ResumeTimeout *= ($number)" {
+ set resume_rate $expect_out(1,string)
+ exp_continue
+ }
+ eof {
+ wait
+ }
+ }
+ log_user 1
+
+ if {$resume_rate == 0} {
+ set power_save 0
+ } else {
+ set power_save 1
+ }
+ return $power_save
+}
+
################################################################
#
# Proc: slurmd_user_root
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index 22e73b2ce8f..89bf17d9c30 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -221,8 +221,12 @@ if {[wait_for_file $file_out_fini] != 0} {
}
}
if {$job_fini == 0} {
- send_user "\nFAILURE: file $file_out_fini contents are bad\n"
- set exit_code 1
+ if {[test_power_save] == 0} {
+ send_user "\nFAILURE: file $file_out_fini contents are bad\n"
+ set exit_code 1
+ } else {
+ send_user "\nWARNING: job timeout bad, possibly due to power save mode\n"
+ }
}
}
--
GitLab