Merge lp:~roadmr/ubuntu/oneiric/checkbox/0.12.10 into lp:ubuntu/oneiric-proposed/checkbox

[Daniel Manrique]

This fixes the code for the two 0.12.9 bugs that failed verification (one was missing code, so I added it; the code for the other didn't fix the bug, so I removed it). I also re-added one dependency that got removed by mistake and updated the changelog to bump the version to 0.12.10.

Merge requested on -proposed directly, with just the changes that need to be applied on top of 0.12.9.

Thanks!

[lp:~roadmr/ubuntu/oneiric/checkbox/0.12.10]

38. By Daniel Manrique on 2012-02-28

Restored 0.12.9 changelog and added reverted code description to 0.12.10

[Mathieu Trudel-Lapierre (cyphermox)]

I think this got merged; I'll set the state to merged.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 16:49:05 +0000
+++ debian/changelog	2012-02-28 18:49:17 +0000
@@ -1,3 +1,14 @@
+checkbox (0.12.10) oneiric-proposed; urgency=low
+
+   [Brendan Donegan]  
+   * Have the bluetooth/detect tests require a device with the category
+     BLUETOOTH to run, thus preventing the test from failing on systems with
+     no Bluetooth device (LP: #862322)
+   * Remove fix for bug 877752 on connect_wireless, as it was not working as
+     intended.
+
+ -- Daniel Manrique <[e-mail]>  Tue, 07 Feb 2012 15:30:36 -0500
+
 checkbox (0.12.9) oneiric-proposed; urgency=low
 
    [Brendan Donegan]  

=== modified file 'jobs/bluetooth.txt.in'
--- jobs/bluetooth.txt.in	2011-09-01 12:23:07 +0000
+++ jobs/bluetooth.txt.in	2012-02-28 18:49:17 +0000
@@ -1,13 +1,17 @@
 plugin: shell 
 name: bluetooth/detect
-requires: package.name == 'bluez'
+requires: 
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
 command: hcitool dev | tail -n+2 | awk '{print $2}' |grep -E "^([0-9a-fA-F]{2}\:){5}[0-9a-fA-F]{2}$"
 _description:
  Output address of detected Bluetooth device, if any, or exits with error if none is found.
 
 plugin: shell
 name: bluetooth/detect-output
-requires: package.name == 'bluez'
+requires:
+ package.name == 'bluez'
+ device.category == 'BLUETOOTH'
 command: hcitool dev | tail -n+2 | awk '{print $2}'; hcitool dev | tail -n+2 | awk '{print $2}' > $CHECKBOX_DATA/bluetooth_address
 _description:
  Automated test to store output in checkbox report

=== modified file 'scripts/connect_wireless'
--- scripts/connect_wireless	2011-12-02 16:49:05 +0000
+++ scripts/connect_wireless	2012-02-28 18:49:17 +0000
@@ -8,7 +8,7 @@
 if [ $? -eq 0 ]
 then
     ap=$(echo $active_connection | awk -F\' '{print $2}')
-    conn=$(nmcli -t -f UUID,NAME,TYPE con list | grep wireless | grep -e "$ap$" | awk -F\: '{print $1}')
+    conn=$(nmcli -t -f UUID,NAME con list | grep -e "$ap$" | awk -F\: '{print $1}')
 else
     conn=$(nmcli -t -f UUID,TYPE con list | grep wireless | head -n 1 | awk -F\: '{print $1}')
 fi