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

[Brendan Donegan]

touchpad/horizontal and touchpad/vertical were being skipped on some systems with touchpads that were purely single-touch only, i.e. don't even support two finger scrolling. This is because they were seeking the attribute 'touch_mode == dependent' but such touchpads don't have this attribute.

For now we'll remove the requirement. This may mean these tests run erroneously on some systems and will have to be skipped manually by the tester.

[Daniel Manrique (roadmr)]

It's a reasonable workaround, and it's been discussed with stakeholders, so +1. Thanks!

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-06 17:46:07 +0000
+++ checkbox-old/debian/changelog	2013-06-07 08:20:38 +0000
@@ -17,6 +17,9 @@
   * qt/frontend/qtfront.cpp, qtfront.h, checkbox_qt/qt_interface.py: Select
     appropriate radio button in showTest if the test already has a result set
     rather than just defaulting to skip always (LP: #1181952)
+  * jobs/touchpad.txt.in - Remove the requires line for touch_mode in
+    touchpad/horizontal and touchpad/vertical so that those tests will
+    at least run on those systems where they are supposed to (LP: #1184882)
 
   [ Daniel Manrique ]
   * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.
 
=== modified file 'checkbox-old/jobs/touchpad.txt.in'
--- checkbox-old/jobs/touchpad.txt.in	2013-05-29 07:50:30 +0000
+++ checkbox-old/jobs/touchpad.txt.in	2013-06-07 08:20:38 +0000
@@ -13,7 +13,6 @@
 plugin: user-interact
 name: touchpad/horizontal
 requires:
-  xinput.touch_mode == 'dependent'
   'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels
 command: touchpad_test right left
 _description:
@@ -28,7 +27,6 @@
 plugin: user-interact
 name: touchpad/vertical
 requires:
-  xinput.touch_mode == 'dependent'
   'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels
 command: touchpad_test up down
 _description: