Merge branch 'slurm-2.5'

testsuite/expect/inc3.11.7

@@ -67,6 +67,8 @@ proc inc3_11_7 {} {
 	exec $bin_rm -f $file_in
 	make_bash_script $file_in "$bin_sleep 100"
 
+	# Sleep short time in case clocks are not synchronized
+	sleep 5
 
 	# (First test) Submit the batch job: a simple job using just 1 core inside the reservation
 	set sbatch_pid [spawn $sbatch -n1 --reservation=$res_name --output=/dev/null $file_in]

testsuite/expect/test2.7

@@ -108,7 +108,7 @@ if {$rem_time > 60} {
 	send_user "\nFAILURE: job remaining time is wrong $rem_time\n"
 	set exit_code 1
 }
-if {$rem_time < 58} {
+if {$rem_time < 56} {
 	send_user "\nFAILURE: job remaining time seems too small\n"
 	set exit_code 1
 }