Merge lp:~sylvain-pineau/checkbox/bug855382 into lp:checkbox

[Sylvain Pineau]

Allow udev_resource to correctly categorise some wireless devices with spurious PCI IDs - fixes LP:855382

This MR improves the wireless devices detection.
The wireless category is now set if the subsystem is equal to ieee80211.

[Brendan Donegan (brendan-donegan)]

Please noone approve this until I get a chance to test it on the culprit tomorrow. Looks like it will work though!

review: Needs Information

[Brendan Donegan (brendan-donegan)]

By the way, while we have this opportunity, it would be good to run flake8 on udevadm.py. I believe there's only one existing error.

[Sylvain Pineau (sylvain-pineau)]

I tested the fix with the export-db file attached to bug 855382, just need to modify lines 31-32 in udev_resource:

# Command to retrieve udev information.
COMMAND = "cat /home/sylvain/export-db"

And regarding pep8, it reports no errors for me.

[lp:~sylvain-pineau/checkbox/bug855382]

1706. By Sylvain Pineau on 2012-09-25

Small fix after a flake8 check on udevadm.py

[Sylvain Pineau (sylvain-pineau)]

(pep|flake)8 OK

review: Needs Resubmitting

[Brendan Donegan (brendan-donegan)]

I heartily approve! Works on the mentioned Atheros chip and also Pandaboard ;)

review: Approve

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-08-16 08:27:48 +0000
+++ checkbox/parsers/udevadm.py	2012-09-25 12:00:48 +0000
@@ -91,6 +91,9 @@
         if "IFINDEX" in self._environment:
             return "NETWORK"
 
+        if self.bus == "ieee80211":
+            return "WIRELESS"
+
         if "PCI_CLASS" in self._environment:
             pci_class_string = self._environment["PCI_CLASS"]
             pci_class = int(pci_class_string, 16)
@@ -156,7 +159,7 @@
                 return "BLUETOOTH"
 
             if class_id == Pci.BASE_CLASS_BRIDGE \
-               and (subclass_id == Pci.CLASS_BRIDGE_PCMCIA \
+               and (subclass_id == Pci.CLASS_BRIDGE_PCMCIA
                     or subclass_id == Pci.CLASS_BRIDGE_CARDBUS):
                 return "SOCKET"
 
@@ -396,6 +399,10 @@
         if not device.bus:
             return True
 
+        # Keep 80211 devices
+        if device.bus == "ieee80211":
+            return False
+
         # Ignore devices without product information
         if not device.product and device.product_id is None:
             return True

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-24 15:05:45 +0000
+++ debian/changelog	2012-09-25 12:00:48 +0000
@@ -147,6 +147,9 @@
     and moved the rendercheck/tarball job into an attachment (LP #1053033)
   * scripts/optical_write_test: Filter ANSI escape char outputed by wodim 
     (LP: #1052803)
+  * checkbox/parsers/udevadm.py: Improved wireless devices detection.
+    The wireless category is now set if the subsystem is equal to ieee80211 
+    (LP: #855382)
 
   [Zygmunt Krynicki]
   * Fixed simple duplicate 'the' mistakes (LP: #1040022)