Checkbox

Merge lp:~roadmr/checkbox/852014 into lp:checkbox

  1. 852014
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Merged at revision: 1057
Proposed branch: lp:~roadmr/checkbox/852014
Merge into: lp:checkbox
Diff against target: 23 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
jobs/suspend.txt.in (+1/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/852014
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+76282@code.launchpad.net

Description of the change

Fixes the bug where systems without bluetooth would actually fail bluetooth_after_suspend. I basically switched from using grep to using diff, which handles empty files/strings better and gives sane return values in that scenario.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Very nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-20 20:01:06 +0000
3+++ debian/changelog 2011-09-20 20:08:24 +0000
4@@ -8,6 +8,7 @@
5 * Restored _recover attribute, re-enabling welcome and test selection
6 screens (LP: #852204)
7 * Remove memory/test from the Ubuntu Friendly whitelist (LP: #853799)
8+ * Use diff instead of grep, better comparing of empty files (LP: #852014)
9
10 [ Evan Broder ]
11 * Replace resolution_test with an implementation which uses GdkScreen to
12
13=== modified file 'jobs/suspend.txt.in'
14--- jobs/suspend.txt.in 2011-09-08 16:52:42 +0000
15+++ jobs/suspend.txt.in 2011-09-20 20:08:24 +0000
16@@ -121,7 +121,7 @@
17 name: suspend/bluetooth_detect_after_suspend
18 depends: suspend/suspend_advanced bluetooth/detect-output
19 requires: package.name == 'bluez'
20-command: grep -q "`hcitool dev | tail -n+2 | awk '{print $2}'`" $CHECKBOX_DATA/bluetooth_address
21+command: hcitool dev | tail -n+2 | awk '{print $2}' |diff $CHECKBOX_DATA/bluetooth_address -
22 _description:
23 This test grabs the hardware address of the bluetooth adapter after suspend and compares it to the address grabbed before suspend.
24

Subscribers

People subscribed via source and target branches