diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 33260b78e7024083cde8db1821e1ed7e0549b0e1..e2f0fd5ba55ace7df2048b91b136142274db57b3 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -38,28 +38,155 @@ set exit_code 0
set matches 0
set name_string "\[a-zA-Z0-9\]\[^ ]*"
set node_state ""
-set node_name ""
+set num_nodes 0
+set num_cpus 0
set mismatches 0
+# We start the node position of the array to 3 because the first 2 nodes will be
+# used for allocated state since scontrol cannot change node state to allocated
+set node_pos 2
+array set node_list {}
+
+proc change_state { state } {
+
+ global scontrol node_list node_pos exit_code
+
+ for {set i 0} {$i<2} {incr i 1} {
+ spawn $scontrol update nodename=$node_list($node_pos) state=$state reason=test
+ expect {
+ timeout {
+ send_user "\nFAILURE: scontrol is not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+ }
+ incr node_pos 1
+ }
+}
+
+proc reset_state { } {
+
+ global scontrol node_list node_pos exit_code
+
+ foreach num [array names node_list] {
+ spawn $scontrol update nodename=$node_list($num) state=idle
+ expect {
+ timeout {
+ send_user "\nFAILURE: scontrol is not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+ }
+ }
+}
print_header $test_id
if (![string compare $partition ""]) {
set partition [default_partition]
}
+
#
-# Check the sinfo long format looking for filtering options
+# Get some values to test against
#
+spawn $sinfo -o%30D%30c --noheader -p$partition
+expect {
+ -re "($number) *($number)" {
+ set num_nodes $expect_out(1,string)
+ set num_cpus $expect_out(2,string)
+ exp_continue
+ }
+ timeout {
+ send_user "\nFAILURE: sinfo is not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+}
+
+if {$num_nodes < 8} {
+ send_user "\nWARNING: This test requires 8 or more nodes but only "
+ send_user "found $num_nodes available\n"
+ exit 0
+}
+
+if {$num_cpus == 0} {
+ send_user "\nFAILURE: was not able to get number of "
+ send_user "cpus (num_cpus = $num_cpus)\n"
+ exit 0
+}
-spawn $sinfo --Node --long --exact -p$partition
+#
+# Get a list of nodes that we can use
+#
+set i 0
+spawn $sinfo -o%n --noheader -p$partition
expect {
- -re "($end_of_line)($name_string) *($number_with_suffix) *($name_string) *($alpha)" {
- if (![string compare $node_name ""]) {
- set node_name $expect_out(2,string)
+ -re "($alpha_numeric_under)" {
+ if {$i<8} {
+ set node_list($i) $expect_out(1,string)
+ incr i 1
+ exp_continue
}
- if (![string compare $node_state ""]) {
- set node_state $expect_out(5,string)
+ }
+ timeout {
+ send_user "\nFAILURE: sinfo is not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+}
+
+if {$i != 8} {
+ send_user "\nFAILURE: unable to get all the required nodes\n"
+ exit 0
+}
+
+#
+# Submit a job to filter for allocated job state
+#
+send_user "\nTesting ALLOCATED state\n"
+set tmp_id 0
+set tmp_sc "test$test_id\_tmp_sc"
+make_bash_script $tmp_sc "sleep 20"
+spawn $sbatch -w$node_list(0),$node_list(1) -o/dev/null -n[expr 2 * $num_cpus] $tmp_sc
+expect {
+ -re "Submitted batch job ($number)" {
+ set tmp_id $expect_out(1,string)
+ exp_continue
+ }
+ timeout {
+ send_user "\nFAILURE: sbatch is not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+}
+
+if {$tmp_id == 0} {
+ send_user "\nFAILURE: sbatch did not submit job\n"
+ set exit_code 1
+}
+
+wait_for_job $tmp_id RUNNING
+
+spawn $sinfo --Node --node=$node_list(0),$node_list(1) --long --exact --state=allocated -p$partition
+expect {
+ -re "($end_of_line)($name_string) *($number_with_suffix) *($name_string) *($alpha)" {
+ if ([string compare $expect_out(5,string) "allocated"]) {
+ incr mismatches
}
exp_continue
}
+ -re "error:" {
+ send_user "\nFAILURE: Unexpected error from sinfo\n"
+ set exit_code 1
+ }
-re "Unable to contact" {
send_user "\nFAILURE: slurm appears to be down\n"
exit 1
@@ -73,14 +200,18 @@ expect {
}
}
+cancel_job $tmp_id
+
#
-# Use sinfo state filter
+# Change node state to idle and use state filter to filter node
#
+send_user "\nTesting IDLE state\n"
+change_state idle
-spawn $sinfo --Node --long --exact --state=$node_state -p$partition
+spawn $sinfo --Node --node=$node_list(2),$node_list(3) --long --exact --state=idle -p$partition
expect {
-re "($end_of_line)($name_string) *($number_with_suffix) *($name_string) *($alpha)" {
- if ([string compare $expect_out(5,string) $node_state]) {
+ if ([string compare $expect_out(5,string) "idle"]) {
incr mismatches
}
exp_continue
@@ -103,13 +234,44 @@ expect {
}
#
-# Use sinfo node name filter
+# Change node state to down and use state filter to filter node
#
+send_user "\nTesting DOWN state\n"
+change_state down
+spawn $sinfo --Node --node=$node_list(4),$node_list(5) --long --exact --state=down -p$partition
+expect {
+ -re "($end_of_line)($name_string) *($number_with_suffix) *($name_string) *($alpha)" {
+ if ([string compare $expect_out(5,string) "down"]) {
+ incr mismatches
+ }
+ exp_continue
+ }
+ -re "error:" {
+ send_user "\nFAILURE: Unexpected error from sinfo\n"
+ set exit_code 1
+ }
+ -re "Unable to contact" {
+ send_user "\nFAILURE: slurm appears to be down\n"
+ exit 1
+ }
+ timeout {
+ send_user "\nFAILURE: sinfo not responding\n"
+ set exit_code 1
+ }
+ eof {
+ wait
+ }
+}
-spawn $sinfo --Node --long --exact --nodes=$node_name -p$partition
+#
+# Change node state to drain and use state filter to filter node
+#
+send_user "\nTesting DRAIN state\n"
+change_state drain
+spawn $sinfo --Node --node=$node_list(6),$node_list(7) --long --exact --state=drain -p$partition
expect {
-re "($end_of_line)($name_string) *($number_with_suffix) *($name_string) *($alpha)" {
- if ([string compare $expect_out(2,string) $node_name]) {
+ if ([string compare $expect_out(5,string) "drained"]) {
incr mismatches
}
exp_continue
@@ -131,6 +293,11 @@ expect {
}
}
+#
+# Reset node states back to idle
+#
+reset_state
+
if {$mismatches != 0} {
send_user "\nFAILURE: sinfo node filtering error\n"
set exit_code 1