modify test4.12 to only check for nodes in the default partition

testsuite/expect/globals

@@ -177,7 +177,7 @@ set end_of_line          "\[\r\n\]"
 set number               "\[0-9\]+"
 set float                "\[0-9\]+\\.?\[0-9\]+"
 set whitespace		 "\[ \t\n\r\f\v\]+"
-set alpha_numeric_nodelist "$alpha_numeric_under\\\[?\[$alpha_numeric_under\]?\\\]"
+set alpha_numeric_nodelist "$alpha_numeric_under\\\[?\[$alpha_numeric_under\]?\\\]?"
 #
 # Cache SlurmUser to check for SuperUser requests
 #

testsuite/expect/test4.12

@@ -282,12 +282,77 @@ proc allocate_and_quit { node proc_cnt total_procs } {
 
 print_header $test_id
 
-# find me an idle node
+# find the default partition
 log_user 0
-spawn $scontrol show node
+set def_part ""
+set def_part_found 0
+spawn $sinfo
 expect {
-	-re "NodeName=($alpha_numeric_under) State=IDLE Procs=($number)(k?).* Sockets=($number) CoresPerSocket=($number) ThreadsPerCore=($number)"  {
-		if {!$inode_found} {
+	-re "($alpha_numeric_under)\\\* " {
+		set def_part $expect_out(1,string) 
+		set def_part_found 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: sinfo not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+log_user 1
+if {!$def_part_found} {
+	send_user "\nFAILURE: could not default partition on the system\n"
+	exit 1
+}
+
+# find the nodes in the default partition
+log_user 1
+set def_hostlist ""
+spawn $scontrol show part $def_part
+expect {
+	-re " Nodes=($alpha_numeric_nodelist)"  {
+		set def_hostlist $expect_out(1,string) 
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: scontrol not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+set host_cnt 0
+spawn $scontrol show hostnames $def_hostlist
+expect {
+	-re "($alpha_numeric_under)"  {
+		set host_name($host_cnt) $expect_out(1,string) 
+		incr host_cnt
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: scontrol not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+log_user 1
+if {$host_cnt == 0} {
+	send_user "\nFAILURE: could not any nodes in default partition\n"
+	exit 1
+}
+
+# find me an idle node in default partition
+log_user 0
+set inode_found 0
+for {set host_inx 0} {($host_inx < $host_cnt) && ($inode_found == 0)} {incr host_inx} {
+	spawn $scontrol show node
+	expect {
+		-re "NodeName=($alpha_numeric_under) State=IDLE Procs=($number)(k?).* Sockets=($number) CoresPerSocket=($number) ThreadsPerCore=($number)"  {
 			set inode_name $expect_out(1,string) 
 			set inode_procs $expect_out(2,string)
 			if {[string compare $expect_out(3,string) ""]} {
@@ -297,21 +362,21 @@ expect {
 			set inode_cores_per_socket $expect_out(5,string)
 			set inode_threads_per_core $expect_out(6,string)
 			set inode_found 1
+			exp_continue
+		}
+		timeout {
+			send_user "\nFAILURE: scontrol not responding\n"
+			set exit_code 1
+		}
+		eof {
+			wait
 		}
-		exp_continue
-	}
-	timeout {
-		send_user "\nFAILURE: scontrol not responding\n"
-		set exit_code 1
-	}
-	eof {
-		wait
 	}
 }
 log_user 1
 
 if {!$inode_found} {
-	send_user "\nFAILURE: couldn't find an idle node on the system\n"
+	send_user "\nFAILURE: couldn't find an idle node in the default partition\n"
 	exit 1
 }