Merge lp:~brendan-donegan/checkbox/bug886129_touch_as_mouse into lp:checkbox

[Brendan Donegan]

This change very simply adds 'device.category == TOUCH' as an accepted requirement for running the input/mouse test. At the moment some people with multitouch touchpads and touchscreens are getting the input devices category skipped, causing their system to get one star on the Ubuntu Friendly site.

I also took the opportunity to generalise the language used by the test to say 'pointing device' instead of 'mouse' specifically. If that's too controversial I can revert it.

This fix is for a bug that has been milestoned for the first Oneiric SRU so it would be good to get it merged ASAP

[Daniel Manrique (roadmr)]

This looks OK, thanks! merging...

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-14 20:53:56 +0000
+++ debian/changelog	2011-11-15 10:24:24 +0000
@@ -40,6 +40,8 @@
      (LP: #887964)
    * Guard against trying to write files to logical partitions on USB sticks
      (which will obviously fail) in usb_test (LP: #887049)
+   * Allow input/mouse test to run if a TOUCH device is present
+     (LP: #886129)
 
    [ Javier Collado ]
    * Broken job dependencies fixed (LP: #888447)

=== modified file 'jobs/input.txt.in'
--- jobs/input.txt.in	2011-10-07 18:59:33 +0000
+++ jobs/input.txt.in	2011-11-15 10:24:24 +0000
@@ -1,14 +1,14 @@
 plugin: manual
 name: input/mouse
-requires: device.category == 'MOUSE'
+requires: device.category == 'MOUSE' or device.category == 'TOUCH'
 _description:
  PURPOSE:
-     This test will test your mouse device
+     This test will test your pointing device
  STEPS:
-     1. Move the mouse
-     2. Perform some single/double/right click operations
+     1. Move the cursor using the pointing device or touch the screen.
+     2. Perform some single/double/right click operations.
  VERIFICATION:
-     Did the mouse work as expected??
+     Did the pointing device work as expected?
 
 plugin: manual
 name: input/keyboard