Merge lp:~brendan-donegan/ubuntu/raring/checkbox/0.15.5 into lp:ubuntu/raring/checkbox

[Brendan Donegan]

* New upstream release (LP: #1158798)
* 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)

Unmerged revisions

1883. By Brendan Donegan on 2013-03-22

* New upstream release (LP: #1158798)

* 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)

1882. By Brendan Donegan on 2013-03-22

Include fix for Bug #1151562 in Ubuntu candidate.

1881. By Brendan Donegan on 2013-03-22

Incremented version in changelog and added candidate revision bug

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2013-03-07 15:52:02 +0000
+++ checkbox/parsers/udevadm.py	2013-03-22 16:55:31 +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-07 15:52:02 +0000
+++ debian/changelog	2013-03-22 16:55:31 +0000
@@ -1,3 +1,15 @@
+checkbox (0.15.5) raring; urgency=low
+
+  * New upstream release (LP: #1158798) 
+
+  [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)
+
+ -- Brendan Donegan <[e-mail]>  Fri, 22 Mar 2013 16:14:06 +0000
+
 checkbox (0.15.4) raring; urgency=low
 
   * New upstream release (LP: #1152223)

=== modified file 'scripts/udev_resource'
--- scripts/udev_resource	2013-03-07 15:52:02 +0000
+++ scripts/udev_resource	2013-03-22 16:55:31 +0000
@@ -43,10 +43,9 @@
         output = check_output(['udevadm', 'info', '--export-db'])
     except CalledProcessError as exc:
         raise SystemExit(exc)
-    try:
-        output = output.decode("UTF-8")
-    except UnicodeDecodeError as exc:
-        raise SystemExit("udevadm output is not valid UTF-8")
+    # Set the error policy to 'ignore' in order to let tests depending on this
+    # resource to properly match udev properties
+    output = output.decode("UTF-8", errors='ignore')
     udev = UdevadmParser(output)
     result = UdevResult()
     udev.run(result)