diff --git a/Sanity/printing-sanity-test/runtest.sh b/Sanity/printing-sanity-test/runtest.sh index f577013..132a6ea 100755 --- a/Sanity/printing-sanity-test/runtest.sh +++ b/Sanity/printing-sanity-test/runtest.sh @@ -39,10 +39,13 @@ rlJournalStart rlAssertRpm $PACKAGE rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" - rlFileBackup /etc/cups/cups-files.conf + rlFileBackup --clean /etc/cups/ + rlFileBackup --clean /var/spool/cups/ rlRun "echo 'FileDevice Yes' >> /etc/cups/cups-files.conf" rlRun "/usr/bin/gs -dNOPAUSE -dBATCH -sDEVICE=ps2write -sOutputFile=$PS $PDF" 0 "Create postscript file" rlServiceStart cups + rlRun "cupsctl LogLevel=debug2" + sleep 2 rlPhaseEnd rlPhaseStartTest @@ -56,8 +59,12 @@ rlJournalStart do for f in $TEXT $PS $PDF $IMAGE do + if test "x$queue" = "xXerox_ph3115" -a "x$f" = "x/etc/fstab" + then + rlRun "journalctl -u cups -f > out &" + fi rlRun "lp -d $queue $f" 0 "Print a $f on $queue" - rlRun "sleep 10" 0 "Wait reasonable time..." + rlRun "sleep 20" 0 "Wait reasonable time..." rlAssertEquals "No hanging jobs" `lpstat -o $queue | wc -l` 0 lpstat -o $queue @@ -68,6 +75,8 @@ rlJournalStart rlPhaseEnd rlPhaseStartCleanup + rlRun "kill $(pidof journalctl)" + rlRun "cat out" rlRun "lpadmin -x Dell_1100" rlRun "lpadmin -x Lexmark_x215mfp" rlRun "lpadmin -x Samsung_clp200"