Merge remote-tracking branch 'origin/slurm-2.6'

Conflicts:
	testsuite/expect/inc21.30.6

testsuite/expect/inc21.30.6

@@ -36,7 +36,7 @@ proc inc21_30_6 {} {
 	send_user "\nStarting MaxNode limit test\n\n"
 	set job_id1 0
 
-	spawn $salloc --account=$acct -N$maxnode_num $srun $bin_sleep 2
+	spawn $salloc --account=$acct -N$maxnode_num --exclusive -t1 $srun $bin_sleep 2
 	expect {
 		-re "Granted job allocation ($number)" {
 			set job_id1 $expect_out(1,string)
@@ -58,7 +58,7 @@ proc inc21_30_6 {} {
 	# cancels remaining jobs
 	cancel_job $job_id1
 
-	spawn $salloc --account=$acct -N[expr $maxnode_num + 1] $srun $bin_sleep 2
+	spawn $salloc --account=$acct -N[expr $maxnode_num + 1] --exclusive -t1 $srun $bin_sleep 2
 	expect {
 		-re "Pending job allocation ($number)" {
 			set job_id1 $expect_out(1,string)

testsuite/expect/test21.30

@@ -259,12 +259,18 @@ mod_qos -1 $grcpu_num -1 -1 -1 -1 -1 -1
 sleep 5
 #test GrpCpus
 inc21_30_2
+if {$exit_code != 0} {
+	endit
+}
 
 mod_qos -1 -1 $grjobs_num -1 -1 -1 -1 -1
 
 sleep 5
 # test GrpJob limits
 inc21_30_3
+if {$exit_code != 0} {
+	endit
+}
 
 
 mod_qos -1 -1 -1 $grsub_num -1 -1 -1 -1
@@ -272,6 +278,9 @@ mod_qos -1 -1 -1 $grsub_num -1 -1 -1 -1
 sleep 5
 # test GrpSubmit
 inc21_30_4
+if {$exit_code != 0} {
+	endit
+}
 
 
 mod_qos -1 -1 -1 -1 $maxcpu_num -1 -1 -1
@@ -279,23 +288,35 @@ mod_qos -1 -1 -1 -1 $maxcpu_num -1 -1 -1
 sleep 5
 #test MaxCpus limits
 inc21_30_5
+if {$exit_code != 0} {
+	endit
+}
 
 mod_qos -1 -1 -1 -1 -1 $maxnode_num -1 -1
 
 sleep 5
 #test MaxNode limit
 inc21_30_6
+if {$exit_code != 0} {
+	endit
+}
 
 mod_qos -1 -1 -1 -1 -1 -1 $maxjobs_num -1
 
 sleep 5
 #test MaxJobs limit
 inc21_30_7
+if {$exit_code != 0} {
+	endit
+}
 
 mod_qos -1 -1 -1 -1 -1 -1 -1 $maxjobsub_num
 
 sleep 5
 #test MaxJobsSubmits limit
 inc21_30_8
+if {$exit_code != 0} {
+	endit
+}
 
 endit