tweak tests for job array mods

testsuite/expect/test3.8

@@ -216,11 +216,16 @@ set disabled 0
 exec $bin_sleep 15
 spawn $scontrol requeue $job_id
 expect {
-	-re "error.*disabled" {
+	-re "Requested operation is presently disabled" {
 		set disabled 1
 		send_user "This error was expected, no worries\n"
 		exp_continue
 	}
+	-re "error" {
+		send_user "\nFAILURE: some scontrol error happened\n"
+		set exit_code 1
+		exp_continue
+	}
 	timeout {
 		send_user "\nFAILURE: scontrol not responding\n"
 		set exit_code 1

testsuite/expect/test6.5

@@ -107,6 +107,7 @@ expect {
 		set exit_code 1
 	}
 	eof {
+		wait
 	}
 }
 if {$matches != 1} {
@@ -126,6 +127,7 @@ expect {
 		set exit_code 1
 	}
 	eof {
+		wait
 	}
 }
 if {$matches != 0} {