Testsuite - Fix list_to_range implementation
Make scontrol calls quiet in node_range_to_list and node_list_to_range
Bug 11771
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index dfaef4d..2fade51 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -3977,7 +3977,7 @@
global scontrol
set comalist [join $nodes_list ,]
- set hostlist [run_command_output -fail "$scontrol show hostlist $comalist"]
+ set hostlist [run_command_output -nolog -fail "$scontrol show hostlist $comalist"]
set hostlist [string trimright $hostlist "\r\n"]
}
@@ -4001,10 +4001,10 @@
#
################################################################
-proc list_to_range {range_expression} {
- set node_range_expression \[$range_expression\]
- set range_list [node_list_to_range $node_range_expression]
- return $range_list
+proc list_to_range {numeric_list} {
+ set node_range_expression [node_list_to_range $numeric_list]
+ set range_expression [regsub {^\[(.*)\]$} $node_range_expression {\1}]
+ return $range_expression
}
@@ -4030,7 +4030,7 @@
global scontrol
set node_list [list]
- set output [run_command_output -fail "$scontrol show hostnames $node_range_expression"]
+ set output [run_command_output -nolog -fail "$scontrol show hostnames $node_range_expression"]
foreach line [split $output "\n"] {
if {$line eq ""} {
break
