summaryrefslogtreecommitdiff
path: root/debian/patches/0002-Tests-Ignore-warnings-from-colord-and-Avahi.patch
blob: a0c55e47357c9afabdb320095b6ab46c92dd8b88 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:09 +0200
Subject: Tests: Ignore warnings from colord and Avahi

These warnings change the expected number of warnings

Patch-Name: tests-ignore-warnings.patch
---
 test/run-stp-tests.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 2f9630f..a601581 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1040,7 +1040,11 @@ else
 fi
 
 # Warning log messages
-count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | wc -l | awk '{print $1}'`
+count=`$GREP '^W ' $BASE/log/error_log | $GREP -v CreateProfile | \
+       $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}'`
 if test $count != 8; then
 	echo "FAIL: $count warning messages, expected 8."
 	$GREP '^W ' $BASE/log/error_log