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

Proposed by Sylvain Pineau on 2013-03-14
Status: Merged
Approved by: Brendan Donegan on 2013-03-14
Approved revision: 1980
Merged at revision: 1980
Proposed branch: lp:~sylvain-pineau/checkbox/kvm_devices
Merge into: lp:checkbox
Diff against target: 30 lines (+8/-1)
2 files modified
checkbox/parsers/udevadm.py (+6/-1)
debian/changelog (+2/-0)
To merge this branch: bzr merge lp:~sylvain-pineau/checkbox/kvm_devices
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve on 2013-03-14
Brendan Donegan (community) 2013-03-14 Approve on 2013-03-14
Review via email: mp+153304@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Sylvain Pineau (sylvain-pineau) wrote :

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

Brendan Donegan (brendan-donegan) wrote :

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

review: Approve
Zygmunt Krynicki (zyga) wrote :

Tricky! Thanks a lot :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
210 return "KEYBOARD"210 return "KEYBOARD"
211211
212 if test_bit(Input.KEY_CAMERA, bitmask, self._bits):212 if test_bit(Input.KEY_CAMERA, bitmask, self._bits):
213 return "CAPTURE"213 # Consider a device with both camera and mouse properties as a
214 # KVM hardware device ("keyboard, video and mouse")
215 if test_bit(Input.BTN_MOUSE, bitmask, self._bits):
216 return "KVM"
217 else:
218 return "CAPTURE"
214219
215 if test_bit(Input.BTN_TOUCH, bitmask, self._bits):220 if test_bit(Input.BTN_TOUCH, bitmask, self._bits):
216 return "TOUCH"221 return "TOUCH"
217222
=== 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 @@
6 [Sylvain Pineau]6 [Sylvain Pineau]
7 * scripts/udev_resource: Set the decoding error policy to 'ignore' to avoid7 * scripts/udev_resource: Set the decoding error policy to 'ignore' to avoid
8 breaking tests that depends on the udevadm resource (LP: #1151562)8 breaking tests that depends on the udevadm resource (LP: #1151562)
9 * scripts/udev_resource: Identify KVM devices as such to avoid reporting them
10 as just CAPTURE devices (LP: #1065064)
911
10 [ Daniel Manrique ]12 [ Daniel Manrique ]
11 * scripts/glob_test: Fixed swapping of repetitions and time parameters.13 * scripts/glob_test: Fixed swapping of repetitions and time parameters.

Subscribers

People subscribed via source and target branches