Add tests to confirm procesor/task counts for salloc/slaunch

testsuite/expect/README

@@ -341,7 +341,7 @@ test15.7   Test of processors, memory, and temporary disk space
            Also test that priority zero job is not started (--hold option).
 test15.8   Test of immediate allocation option (--immediate option).
 test15.9   Confirm that salloc exit code processing.
-test15.10  Confirm that a job executes with the proper processor count (--nprocs)
+test15.10  Confirm that a job allocates the proper procesor count (--nprocs)
 
 
 test16.#   Testing of sattach options.
@@ -412,5 +412,6 @@ test18.1   Confirm slaunch usage option works (--usage option).
 test18.2   Confirm slaunch help option works (--help option).
 test18.3   Confirm that slaunch reports a proper version number
            (--version option).
-
+test18.4   Confirm that a job executes with the proper task count (--nprocs
+           and --overcommit options).
 

testsuite/expect/test15.10

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Confirm that a job allocates the proper procesor count (--nprocs) 
+#
+# Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
+#          "FAILURE: ..." otherwise with an explanation of the failure, OR
+#          anything else indicates a failure mode that must be investigated.
+############################################################################
+# Copyright (C) 2002-2006 The Regents of the University of California.
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Morris Jette <jette1@llnl.gov>
+# UCRL-CODE-217948.
+# 
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.llnl.gov/linux/slurm/>.
+#  
+# SLURM is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+# 
+# SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with SLURM; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+############################################################################
+source ./globals
+
+set test_id     "15.10"
+set exit_code   0
+set job_id      0
+
+print_header $test_id
+
+for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
+	set tasks_set $inx
+	set tasks_get 0
+	set timeout $max_job_delay
+	spawn $salloc -n$tasks_set -v -t1 $bin_bash  
+	expect {
+		-re "Granted job allocation ($number).*" {
+			set job_id $expect_out(1,string)
+			send "$scontrol show job $job_id\n"
+			exp_continue
+		}
+		-re "ReqProcs=($number).*" {
+			set tasks_get $expect_out(1,string)
+			send "exit\n"
+			exp_continue
+		}
+		-re "Failed to allocate.*" {
+			send_user "\nThis error is not unexpected, no worries\n"
+			set tasks_get $tasks_set
+		}
+		timeout {
+			send_user "\nFAILURE: salloc not responding\n"
+			kill_salloc
+			set exit_code 1
+			exp_continue
+		}
+		eof {
+			if {$tasks_get < $tasks_set} {
+				send_user "\nFAILURE: Did not get proper number of tasks: "
+				send_user "$tasks_get < $tasks_set\n"
+				set exit_code 1
+			} else {
+				send_user "test of $tasks_get processors good\n\n" 
+			}
+			wait
+		}
+	}
+}
+
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code

testsuite/expect/test18.4

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Confirm that a job executes with the proper task count (--nprocs
+#          and --overcommit options).
+#
+# Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
+#          "FAILURE: ..." otherwise with an explanation of the failure, OR
+#          anything else indicates a failure mode that must be investigated.
+############################################################################
+# Copyright (C) 2002-2006 The Regents of the University of California.
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Morris Jette <jette1@llnl.gov>
+# UCRL-CODE-217948.
+# 
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.llnl.gov/linux/slurm/>.
+#  
+# SLURM is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+# 
+# SLURM is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with SLURM; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+############################################################################
+source ./globals
+
+set test_id     "18.4"
+set exit_code   0
+set job_id      0
+
+print_header $test_id
+
+for {set inx 1} {$inx < 8} {set inx [expr $inx * 2]} {
+	set tasks_set $inx
+	set tasks_get 0
+	set timeout $max_job_delay
+	spawn $salloc -N1-4 -t1 $slaunch -n$tasks_set --overcommit $bin_id
+	expect {
+		-re "uid=" {
+			incr tasks_get
+			exp_continue
+		}
+		timeout {
+			send_user "\nFAILURE: salloc not responding\n"
+			kill_salloc
+			set exit_code 1
+			exp_continue
+		}
+		eof {
+			if {$tasks_get < $tasks_set} {
+				send_user "\nFAILURE: Did not get proper number of tasks: "
+				send_user "$tasks_get < $tasks_set\n"
+				set exit_code 1
+			} else {
+				send_user "test of $tasks_get tasks good\n\n"
+			}			
+			wait
+		}
+	}
+}
+
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code