Add more salloc tests.

testsuite/expect/README

@@ -339,6 +339,7 @@ test15.6   Test of salloc verbose mode (--verbose option).
 test15.7   Test of processors, memory, and temporary disk space
            constraints options (--mincpus, --mem, and --tmp options).
            Also test that priority zero job is not started (--hold option).
+test15.8   Test of immediate allocation option (--immediate option).
 
 
 test16.#   Testing of sattach options.

testsuite/expect/test15.7

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Test of processors, memory, and temporary disk space 
+#          constraints options (--mincpus, --mem, and --tmp options).
+#          Also test that priority zero job is not started (--hold 
+#          option).
+#
+# 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.7"
+set exit_code   0
+set job_id      0
+
+set cpu_cnt     1
+set mem_size    13
+set tmp_size    2
+set matches     0
+
+print_header $test_id
+
+#
+# Spawn a salloc job with constraints
+#
+spawn $salloc --mincpus=$cpu_cnt --mem=$mem_size --tmp=$tmp_size --hold -t1 $bin_id
+expect {
+	-re "Pending job allocation ($number)" {
+		set job_id $expect_out(1,string)
+	}
+	-re "uid=" {
+		send_user "\nFAILURE: salloc --hold option ineffective\n"
+		set exit_code 1
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: srun not responding\n"
+		kill_salloc
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+if {$job_id == 0} {
+	send_user "\nFAILURE: salloc failure\n"
+	exit 1
+}
+
+#
+# Confirm constraints are registered and wait for job completion
+#
+spawn $scontrol show job $job_id
+expect {
+	-re "Priority=($number)" {
+		set read_prio $expect_out(1,string)
+		if {$read_prio == 0} {
+			incr matches
+			send_user "match of Priority\n"
+		}
+		exp_continue
+	}
+	-re "JobState=PENDING" {
+		incr matches
+		send_user "match of JobState\n"
+		exp_continue
+	}
+	-re "MinProcs=($number)" {
+		set read_proc $expect_out(1,string)
+		if {$read_proc == $cpu_cnt} {
+			incr matches
+			send_user "match of MinProcs\n"
+		}
+		exp_continue
+	}
+	-re "MinMemory=($number)" {
+		set read_mem $expect_out(1,string)
+		if {$read_mem == $mem_size} {
+			incr matches
+			send_user "match of MinMemory\n"
+		}
+		exp_continue
+	}
+	-re "MinTmpDisk=($number)" {
+		set read_disk $expect_out(1,string)
+		if {$read_disk == $tmp_size} {
+			incr matches
+			send_user "match of MinTmpDisk\n"
+		}
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: scontrol not responding\n"
+		set exit_code 1
+	}
+	eof {
+		wait
+	}
+}
+cancel_job $job_id
+
+if {$matches != 5} {
+	send_user "\nFAILURE: Did not get proper constraints\n"
+	set exit_code 1
+}
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code

testsuite/expect/test15.8

+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Test of immediate allocation option (--immediate option).
+#
+# 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.8"
+set exit_code   0
+set matches     0
+
+print_header $test_id
+
+#
+# Spawn a srun immediate execution job with hold (priority==0) option, 
+# The job can't run immediately with a priority of zero
+#
+set timeout 10
+spawn $salloc --immediate --hold -t1 $bin_pwd
+expect {
+	-re "Failed to allocate resources" {
+		send_user "This error is expected, no worries\n"
+		incr matches
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: salloc not responding\n"
+		kill_salloc
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+if {$matches != 1} {
+	send_user "\nFAILURE: failed to hold job as requested\n"
+	set exit_code 1
+}
+
+
+#
+# Spawn a salloc immediate execution job, it should run or fail immediately
+# Note the small value of timeout
+#
+set matches 0
+spawn $salloc --immediate -v -t1 $bin_pwd
+expect {
+	-re "error" {
+		send_user "This error is not unexpected, no worries\n"
+		incr matches
+		exp_continue
+	}
+	-re "Granted job allocation" {
+		incr matches
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: salloc not responding\n"
+		kill_salloc
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+
+if {$matches != 1} {
+	send_user "\nFAILURE: Immediate initiation option failure\n"
+	set exit_code 1
+}
+if {$exit_code == 0} {
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code