Tweak some tests for POE

testsuite/expect/test1.73

@@ -44,6 +44,12 @@ set exit_code       0
 
 print_header $test_id
 
+# POE launch is so slow that this test is impractical
+if {[test_launch_poe]} {
+	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
+	exit 0
+}
+
 #
 # Slurm time limit enforcement is performed within one minute of the actucal
 # job time limit, so a one minute limit job will be killed 60 to 120 seconds

testsuite/expect/test3.5

@@ -220,11 +220,7 @@ set sleep_time 300
 set timeout [expr $max_job_delay + $sleep_time]
 set srun_pid [spawn $srun -t1 -p $part_name $bin_sleep $sleep_time]
 expect {
-	-re "time limit exceeded" {
-		set timed_out 1
-		exp_continue
-	}
-	-re "Terminated" {
+	-re "(time limit|TIME LIMIT|TERMINATED)" {
 		set timed_out 1
 		exp_continue
 	}