From 8ffadb1c745e2fa10199cfb3bd6b199636ce5d59 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 3 Jan 2018 09:20:34 -0700
Subject: [PATCH] Fix tests to run on single node cluster
---
testsuite/expect/test1.59 | 5 +----
testsuite/expect/test38.10 | 1 +
testsuite/expect/test38.17 | 8 ++++++++
testsuite/expect/test38.2 | 8 ++++++++
testsuite/expect/test38.4 | 8 ++++++++
5 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index 69ac646ce59..e2dc89ca2d0 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -62,12 +62,9 @@ if {[test_launch_poe]} {
# find out if we have enough nodes to test functionality
set partition [default_partition]
-
set node_count [get_node_cnt_in_part $partition]
if { $node_count < 3 } {
- send_user "WARNING: system must have at least 3 \
- nodes to run this test on. This system \
- only has $node_count.\n"
+ send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
exit $exit_code
}
diff --git a/testsuite/expect/test38.10 b/testsuite/expect/test38.10
index b2639c16a70..aded5a13464 100755
--- a/testsuite/expect/test38.10
+++ b/testsuite/expect/test38.10
@@ -31,6 +31,7 @@
source ./globals
set test_id "38.10"
+set exit_code 0
print_header $test_id
set prompt "PROMPT: "
diff --git a/testsuite/expect/test38.17 b/testsuite/expect/test38.17
index 0eac423e716..4785c12ee4c 100755
--- a/testsuite/expect/test38.17
+++ b/testsuite/expect/test38.17
@@ -52,6 +52,14 @@ proc end_it { exit_code } {
print_header $test_id
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+ send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+ exit $exit_code
+}
+
if {[test_front_end]} {
send_user "\nWARNING: This test is incompatible with front-end systems\n"
exit $exit_code
diff --git a/testsuite/expect/test38.2 b/testsuite/expect/test38.2
index 037f136afdf..7bc3f935f01 100755
--- a/testsuite/expect/test38.2
+++ b/testsuite/expect/test38.2
@@ -40,6 +40,14 @@ set file_out "test$test_id.out"
print_header $test_id
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+ send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+ exit $exit_code
+}
+
proc sbatch {} {
global number sbatch file_in bin_sleep file_out job_id
diff --git a/testsuite/expect/test38.4 b/testsuite/expect/test38.4
index 2112244564e..c95569aead0 100755
--- a/testsuite/expect/test38.4
+++ b/testsuite/expect/test38.4
@@ -41,6 +41,14 @@ set file_out "test$test_id.out"
print_header $test_id
+# find out if we have enough nodes to test functionality
+set partition [default_partition]
+set node_count [get_node_cnt_in_part $partition]
+if { $node_count < 3 } {
+ send_user "WARNING: Insufficient nodes in default partition ($node_count < 3)\n"
+ exit $exit_code
+}
+
proc salloc {} {
global number salloc bin_sleep file_out job_id
--
GitLab