Unity

Merge lp:~3v1n0/unity/scroll-wheel-ap-fixes into lp:unity

  1. scroll-wheel-ap-fixes
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3852
Proposed branch: lp:~3v1n0/unity/scroll-wheel-ap-fixes
Merge into: lp:unity
Diff against target: 22 lines (+4/-4)
1 file modified
tests/autopilot/unity/emulators/switcher.py (+4/-4)
To merge this branch: bzr merge lp:~3v1n0/unity/scroll-wheel-ap-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Azzarone (community) Approve
Review via email: mp+229754@code.launchpad.net

Commit message

Autopilot, Switcher: use correct right/left scroll buttons for next/prev mouse selection

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3849
http://jenkins.qa.ubuntu.com/job/unity-ci/1044/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/131

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1044/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/emulators/switcher.py'
2--- tests/autopilot/unity/emulators/switcher.py 2013-12-21 04:31:32 +0000
3+++ tests/autopilot/unity/emulators/switcher.py 2014-08-06 10:02:41 +0000
4@@ -189,14 +189,14 @@
5 def next_via_mouse(self):
6 """Move to the next icon using the mouse scroll wheel."""
7 logger.debug("Selecting next item in switcher with mouse scroll wheel.")
8- self._mouse.press(6)
9- self._mouse.release(6)
10+ self._mouse.press(7)
11+ self._mouse.release(7)
12
13 def previous_via_mouse(self):
14 """Move to the previous icon using the mouse scroll wheel."""
15 logger.debug("Selecting previous item in switcher with mouse scroll wheel.")
16- self._mouse.press(7)
17- self._mouse.release(7)
18+ self._mouse.press(6)
19+ self._mouse.release(6)
20
21 @property
22 def detail_selection_index(self):