diff --git a/Sanity/printing-sanity-test/main.fmf b/Sanity/printing-sanity-test/main.fmf index dffccfc..12ce85f 100644 --- a/Sanity/printing-sanity-test/main.fmf +++ b/Sanity/printing-sanity-test/main.fmf @@ -9,7 +9,7 @@ recommend: - cups - file - ghostscript -duration: 40m +duration: 66m enabled: true tag: - NoRHEL4 diff --git a/Sanity/printing-sanity-test/runtest.sh b/Sanity/printing-sanity-test/runtest.sh index fd76bb3..8962018 100755 --- a/Sanity/printing-sanity-test/runtest.sh +++ b/Sanity/printing-sanity-test/runtest.sh @@ -57,7 +57,12 @@ rlJournalStart for f in $TEXT $PS $PDF $IMAGE do rlRun "lp -d $queue $f" 0 "Print a $f on $queue" - sleep 88 + rlLog "Waiting for $queue in a loop, test could end here if error, do NOT IGNORE" + while [ `lpstat -o $queue | wc -l` -ne "0" ] + do + sleep 1 + done + rlAssertEquals "No hanging jobs" `lpstat -o $queue | wc -l` 0 rlRun "file --mime /tmp/ps | grep charset" 0 "File exists" rlRun "rm -f /tmp/ps"