Merge lp:~bladernr/checkbox/1169488-fix-bluetooth-test into lp:checkbox

[Jeff Lane ]

changes the dpkg line to use dpgk-query -W obexftp. This avoids weird subshell funk with pipes and grep stuff that was triggering a strange Broken Pipe Error in script output during test runs, even if the script was successful.

Output before the fix:
dpkg-query: error: error writing to '<standard output>': Broken pipe Checking 00:02:72:DC:5E:38 for JPEG_Color_Image_Ubuntu.jpg Will check for a filesize of 25770 Browsing 00:02:72:DC:5E:38 ... Co...

Output after the fix:
Checking 08:ed:b9:4b:18:6a for JPEG_Color_Image_Ubuntu.jpg Will check for a filesize of 25770 Browsing 08:ed:b9:4b:18:6a ... Connecting..\done Tried to connect for 910ms Receiving "(null)"...|done...

Verified by Jeffrey Chang on a system in TPE that was consistently showing the failure.

[Zygmunt Krynicki (zyga)]

+1

Dziękuję, thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-24 15:50:49 +0000
+++ debian/changelog	2013-04-25 13:44:05 +0000
@@ -19,6 +19,8 @@
     scripts/fwts_test: no longer fails on fwts errors if "-f none" is chosen.
     Now it should only fail by manual indication if the actual sleep action
     fails. (LP: #1169922)
+  * scripts/bluetooth_test: test no longer generates odd Broken Pipe error when
+    the dpkg bit verifies obexftp is installed (LP: #1169488)
 
  -- Brendan Donegan <[e-mail]>  Wed, 24 Apr 2013 16:33:15 +0100
 

=== modified file 'scripts/bluetooth_test'
--- scripts/bluetooth_test	2012-10-02 17:18:02 +0000
+++ scripts/bluetooth_test	2013-04-25 13:44:05 +0000
@@ -6,7 +6,7 @@
 BTADDR=$2
 ACTION=$3
 
-if ! dpkg -l | grep -q obexftp; then
+if ! dpkg-query -W obexftp >/dev/null 2>&1; then
     echo "You must install obexftp to run this script"
     exit 1
 fi