~ara/ubuntu/oneiric/checkbox/checkbox_0.12.5

« back to all changes in this revision

Viewing changes to checkbox/parsers/udev.py

  • Committer: Ara Pulido
  • Date: 2011-09-01 11:34:45 UTC
  • Revision ID: ara@ubuntu.com-20110901113445-p767wq4b6hrxbal4
New upstream release (LP: #838745):
[Ara Pulido]
* Created a "suspend" suite and renamed relevant tests.
[Brendan Donegan]
* Removed redundant tests in power-management suite.
* Fixed dependencies in power-management suite.
[Daniel Manrique]
* Changed name of apt-get test to reflect the suite it's in.
* Fixed typos in job definitions that caused them to not be run.
* Added missing description to info/hdparm test (LP: #832351)
* Quote command to obtain bluetooth address, to avoid hanging if 
  a device is not present (LP: #836756).
* Added BLUETOOTH category to udev parser.
* Removed some tests from default whitelist.
* Fixed dependencies for keys/sleep.

[Jeff Lane]
* Added new USB storage transfer test
* Re-worked and added automated audio test
[Marc Tardif]
* Added WIRELESS category to udev parser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
            class_id = (pci_class >> 8) & 0xFF
63
63
 
64
64
            if class_id == Pci.BASE_CLASS_NETWORK:
65
 
                return "NETWORK"
 
65
                if subclass_id == Pci.CLASS_NETWORK_WIRELESS:
 
66
                    return "WIRELESS"
 
67
                else:
 
68
                    return "NETWORK"
66
69
 
67
70
            if class_id == Pci.BASE_CLASS_DISPLAY:
68
71
                return "VIDEO"
114
117
                self._attributes["bInterfaceClass"], 16)
115
118
            interface_subclass = int(
116
119
                self._attributes["bInterfaceSubClass"], 16)
 
120
            interface_protocol = int(
 
121
                self._attributes["bInterfaceProtocol"], 16)
117
122
 
118
123
            if interface_class == Usb.BASE_CLASS_AUDIO:
119
124
                return "AUDIO"
132
137
                return "CAPTURE"
133
138
 
134
139
            if interface_class == Usb.BASE_CLASS_WIRELESS:
135
 
                return "NETWORK"
 
140
                if interface_protocol == Usb.PROTOCOL_BLUETOOTH:
 
141
                    return "BLUETOOTH"
 
142
                else:
 
143
                    return "WIRELESS"
136
144
 
137
145
        if "ID_TYPE" in self._environment:
138
146
            id_type = self._environment["ID_TYPE"]