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

Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2165
Merged at revision: 2168
Proposed branch: lp:~brendan-donegan/checkbox/bug1184882
Merge into: lp:checkbox
Diff against target: 33 lines (+3/-2)
2 files modified
checkbox-old/debian/changelog (+3/-0)
checkbox-old/jobs/touchpad.txt.in (+0/-2)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1184882
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+167908@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-old/debian/changelog'
2--- checkbox-old/debian/changelog 2013-06-06 17:46:07 +0000
3+++ checkbox-old/debian/changelog 2013-06-07 08:20:38 +0000
4@@ -17,6 +17,9 @@
5 * qt/frontend/qtfront.cpp, qtfront.h, checkbox_qt/qt_interface.py: Select
6 appropriate radio button in showTest if the test already has a result set
7 rather than just defaulting to skip always (LP: #1181952)
8+ * jobs/touchpad.txt.in - Remove the requires line for touch_mode in
9+ touchpad/horizontal and touchpad/vertical so that those tests will
10+ at least run on those systems where they are supposed to (LP: #1184882)
11
12 [ Daniel Manrique ]
13 * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.
14
15=== modified file 'checkbox-old/jobs/touchpad.txt.in'
16--- checkbox-old/jobs/touchpad.txt.in 2013-05-29 07:50:30 +0000
17+++ checkbox-old/jobs/touchpad.txt.in 2013-06-07 08:20:38 +0000
18@@ -13,7 +13,6 @@
19 plugin: user-interact
20 name: touchpad/horizontal
21 requires:
22- xinput.touch_mode == 'dependent'
23 'Button Horiz Wheel Left' in xinput.button_labels and 'Button Horiz Wheel Right' in xinput.button_labels
24 command: touchpad_test right left
25 _description:
26@@ -28,7 +27,6 @@
27 plugin: user-interact
28 name: touchpad/vertical
29 requires:
30- xinput.touch_mode == 'dependent'
31 'Button Wheel Up' in xinput.button_labels and 'Button Wheel Down' in xinput.button_labels
32 command: touchpad_test up down
33 _description:

Subscribers

People subscribed via source and target branches