diff --git a/testsuite/expect/test1.68 b/testsuite/expect/test1.68 index f4ecbffc448b64af0c0d6e3063f8def4deef4f9d..c4e38cbbdcd3b1362eb6c210fe5ca88b62317b9f 100755 --- a/testsuite/expect/test1.68 +++ b/testsuite/expect/test1.68 @@ -55,19 +55,27 @@ echo \"Test finished\" make_bash_script $stop_srun " $bin_sleep 15 -srun_proc=\$(ps -C srun -o pid=) -echo \"sending job to the background, pid=\$srun_proc\" +srun_proc=\$1 +echo \"suspending job, pid=\$srun_proc\" kill -s stop \$srun_proc " make_bash_script $test_srun " set -m -./$stop_srun & -$srun -v -t1 ./$test_timer +$srun -v -t1 ./$test_timer & +./$stop_srun \$! & +wait +echo \"sending job to the background\" bg +if \[ \$? != 0 \]; then + echo \"BG Failed\" +fi $bin_sleep 25 echo \"sending job to foreground\" fg +if \[ \$? != 0 \]; then + echo \"FG Failed\" +fi " make_bash_script $file_in " @@ -107,6 +115,16 @@ expect { set fini_match 1 exp_continue } + -re "BG Failed" { + send_user "\nFAILURE: Failed to find suspended srun job in background\n" + set exit_code 1 + exp_continue + } + -re "FG Failed" { + send_user "\nFAILURE: Failed to find background srun job to put in foreground\n" + set exit_code 1 + exp_continue + } timeout { send_user "\nFAILURE: srun is not responding\n" set exit_code 1