Merge lp:~bregma/unity/lp-1433648-bis into lp:unity

Proposed by Stephen M. Webb on 2015-03-24
Status: Merged
Approved by: Christopher Townsend on 2015-03-24
Approved revision: 3930
Merged at revision: 3931
Proposed branch: lp:~bregma/unity/lp-1433648-bis
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
tests/autopilot/unity/tests/test_gnome_key_grabber.py (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity/lp-1433648-bis
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve on 2015-03-24
Christopher Townsend 2015-03-24 Approve on 2015-03-24
Review via email: mp+253957@code.launchpad.net

Commit message

fix AP test failure due to new parameter added to key grabbing

Description of the change

Fixes new AP failures resulting from changes for #1433648.

To post a comment you must log in.
Christopher Townsend (townsend) wrote :

Yep

review: Approve
Marco Trevisan (Treviño) (3v1n0) wrote :

Right, forgot about that... :(

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/unity/tests/test_gnome_key_grabber.py'
2--- tests/autopilot/unity/tests/test_gnome_key_grabber.py 2014-11-27 14:53:11 +0000
3+++ tests/autopilot/unity/tests/test_gnome_key_grabber.py 2015-03-24 14:00:13 +0000
4@@ -45,7 +45,7 @@
5 self.activated = [False]
6 self.active = True
7
8- def accelerator_activated(action, device):
9+ def accelerator_activated(action, device, timestamp):
10 if self.active and action in self.activatable:
11 log.info('%d activated' % action)
12 self.activated[0] = True