Unity

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

  1. lp-1397006
  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: 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 :

FAILED: Continuous integration, rev:3885
http://jenkins.qa.ubuntu.com/job/unity-ci/1116/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/3

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3885
http://jenkins.qa.ubuntu.com/job/unity-ci/1117/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/4

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3885
http://jenkins.qa.ubuntu.com/job/unity-ci/1118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/5/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/5

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

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
1=== modified file 'tests/autopilot/unity/tests/test_gnome_key_grabber.py'
2--- tests/autopilot/unity/tests/test_gnome_key_grabber.py 2014-02-06 09:31:09 +0000
3+++ tests/autopilot/unity/tests/test_gnome_key_grabber.py 2014-11-27 14:56:52 +0000
4@@ -7,11 +7,11 @@
5 # by the Free Software Foundation.
6
7 import dbus
8-import glib
9 import unity
10 import logging
11
12 from autopilot.matchers import *
13+from gi.repository import GLib
14 from testtools.matchers import *
15
16 log = logging.getLogger(__name__)
17@@ -64,13 +64,13 @@
18 log.info("pressing '%s'" % accelerator.shortcut)
19 self.keyboard.press_and_release(accelerator.shortcut)
20
21- loop = glib.MainLoop()
22+ loop = GLib.MainLoop()
23
24 def wait():
25 loop.quit()
26 return False
27
28- glib.timeout_add_seconds(1, wait)
29+ GLib.timeout_add_seconds(1, wait)
30 loop.run()
31
32 return self.activated[0]