Merge lp:~bregma/unity/lp-1397006 into lp:unity

Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3894
Proposed branch: lp:~bregma/unity/lp-1397006
Merge into: lp:unity
Diff against target: 32 lines (+3/-3)
1 file modified
tests/autopilot/unity/tests/test_gnome_key_grabber.py (+3/-3)
To merge this branch: bzr merge lp:~bregma/unity/lp-1397006
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+243051@code.launchpad.net

Commit message

replace the use of static glib with gi glib in AP test cases

Description of the change

Replaces the use of static glib with gi glib in AP test cases.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep, fixes the issue.

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-02-06 09:31:09 +0000
+++ tests/autopilot/unity/tests/test_gnome_key_grabber.py 2014-11-27 14:56:52 +0000
@@ -7,11 +7,11 @@
7# by the Free Software Foundation.7# by the Free Software Foundation.
88
9import dbus9import dbus
10import glib
11import unity10import unity
12import logging11import logging
1312
14from autopilot.matchers import *13from autopilot.matchers import *
14from gi.repository import GLib
15from testtools.matchers import *15from testtools.matchers import *
1616
17log = logging.getLogger(__name__)17log = logging.getLogger(__name__)
@@ -64,13 +64,13 @@
64 log.info("pressing '%s'" % accelerator.shortcut)64 log.info("pressing '%s'" % accelerator.shortcut)
65 self.keyboard.press_and_release(accelerator.shortcut)65 self.keyboard.press_and_release(accelerator.shortcut)
6666
67 loop = glib.MainLoop()67 loop = GLib.MainLoop()
6868
69 def wait():69 def wait():
70 loop.quit()70 loop.quit()
71 return False71 return False
7272
73 glib.timeout_add_seconds(1, wait)73 GLib.timeout_add_seconds(1, wait)
74 loop.run()74 loop.run()
7575
76 return self.activated[0]76 return self.activated[0]