Merge lp:~brendan-donegan/checkbox/bug1023619_wireless_scanning_soft_blocked into lp:checkbox

[Brendan Donegan]

Simple fix to unblock the wifi before testing wireless scanning, preventing the situation where the wireless may be blocked after loading the Broadcom STA driver.

[Marc Tardif (cr3)]

Should the call to rfkill be added to the network_wireless_test script instead?

review: Needs Information

[Brendan Donegan (brendan-donegan)]

That's a possibility. Actually network_wireless_test is something we need to get rid of, because it uses deprecated kernel interfaces, so we need to modify the test to use nmcli. If we do this then the rfkill call will have to remain on the command line anyway

[Marc Tardif (cr3)]

That's a good motivation for putting rfkill in the test definition; it will be easier to remember when replacing the network_wireless_test script rather than looking in the script itself. For completeness, this is the bug you reported to make sure the script is eventually replaced:

https://bugs.launchpad.net/checkbox/+bug/900370

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-11 19:47:18 +0000
+++ debian/changelog	2012-07-11 21:37:22 +0000
@@ -90,6 +90,8 @@
     of timing issues. (LP: #1018563)
   * Catch exception raised in memory_compare by DMI RAM entries with No Module
     Installed in the Size field (LP: #1023220)
+  * Also unblock wireless before wireless_scanning test, as I neglected to do
+    this before. (LP: #1023619)
 
  -- Jeff Lane <[e-mail]>  Wed, 11 Jul 2012 13:21:46 -0400
 

=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2012-05-03 06:58:03 +0000
+++ jobs/wireless.txt.in	2012-07-11 21:37:22 +0000
@@ -2,7 +2,7 @@
 name: wireless/wireless_scanning
 user: root
 requires: package.name == 'wireless-tools'
-command: network_wireless_test
+command: rfkill unblock wlan wifi; network_wireless_test
 _description: Wireless scanning test. It scans and reports on discovered APs.
 
 plugin: manual