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

[Sylvain Pineau]

Identify KVM devices as such to avoid reporting them as just CAPTURE devices

Identify KVM devices as such to avoid reporting them as just CAPTURE devices

[Sylvain Pineau (sylvain-pineau)]

Tested OK with the IBM Avocent KVM (Lex system 201011-6700) and with my own Trendnet TK-209K.

[Brendan Donegan (brendan-donegan)]

Oh very clever, excellent, let's get this in before we start the next release.

review: Approve

[Zygmunt Krynicki (zyga)]

Tricky! Thanks a lot :-)

review: Approve

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-12-21 10:25:48 +0000
+++ checkbox/parsers/udevadm.py	2013-03-14 09:15:26 +0000
@@ -210,7 +210,12 @@
                 return "KEYBOARD"
 
             if test_bit(Input.KEY_CAMERA, bitmask, self._bits):
-                return "CAPTURE"
+                # Consider a device with both camera and mouse properties as a
+                # KVM hardware device ("keyboard, video and mouse")
+                if test_bit(Input.BTN_MOUSE, bitmask, self._bits):
+                    return "KVM"
+                else:
+                    return "CAPTURE"
 
             if test_bit(Input.BTN_TOUCH, bitmask, self._bits):
                 return "TOUCH"
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-13 19:54:17 +0000
+++ debian/changelog	2013-03-14 09:15:26 +0000
@@ -6,6 +6,8 @@
   [Sylvain Pineau]
   * scripts/udev_resource: Set the decoding error policy to 'ignore' to avoid
     breaking tests that depends on the udevadm resource (LP: #1151562)
+  * scripts/udev_resource: Identify KVM devices as such to avoid reporting them
+    as just CAPTURE devices (LP: #1065064)
 
   [ Daniel Manrique ]
   * scripts/glob_test: Fixed swapping of repetitions and time parameters.