← Back to branch summary

~ubuntu-branches/ubuntu/wily/cups/wily

« back to all changes in this revision

Viewing changes to .pc/tests-wait-on-unfinished-jobs-everytime.patch/test/run-stp-tests.sh

  • Committer: Package Import Robot
  • Author(s): Didier Raboud
  • Date: 2013-05-03 11:30:59 UTC
  • mfrom: (100.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20130503113059-u4vwqd3op51vu7o7
Update the patch adding libusb error handling to also discard its
errors in the counting of warning messages; this should make the
error-suite succeed in more cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/tests-wait-on-unfinished-jobs-everytime.patch/test/run-stp-tests.sh
838
838
fi
839
839
 
840
840
# Warning log messages
841
 
count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'org.freedesktop.ColorManager' | grep -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
 
841
count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | grep -v 'org.freedesktop.ColorManager' | grep -v -E 'Avahi client failed: -(1|26)' | wc -l | awk '{print $1}'`
842
842
if test $count != 9; then
843
843
        echo "FAIL: $count warning messages, expected 9."
844
844
        $GREP '^W ' /tmp/cups-$user/log/error_log