Unity

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

  1. lp-1433648-bis
  2. Merge into trunk
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
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
Christopher Townsend Approve
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.
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep

review: Approve
Revision history for this message
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
=== modified file 'tests/autopilot/unity/tests/test_gnome_key_grabber.py'
--- tests/autopilot/unity/tests/test_gnome_key_grabber.py 2014-11-27 14:53:11 +0000
+++ tests/autopilot/unity/tests/test_gnome_key_grabber.py 2015-03-24 14:00:13 +0000
@@ -45,7 +45,7 @@
45 self.activated = [False]45 self.activated = [False]
46 self.active = True46 self.active = True
4747
48 def accelerator_activated(action, device):48 def accelerator_activated(action, device, timestamp):
49 if self.active and action in self.activatable:49 if self.active and action in self.activatable:
50 log.info('%d activated' % action)50 log.info('%d activated' % action)
51 self.activated[0] = True51 self.activated[0] = True