Merge lp:~thomir-deactivatedaccount/autopilot/fix-ibus into lp:autopilot

[Thomi Richards]

Make autopilot use gir IBus module, instead of older python-ibus module.

Problem:

Autopilot still used the 'ibus' module, which in turn imported 'gobject', which should not be imported together with 'gi.repository.GObject', which we're using elsewhere in autopilot.

Solution:

The solution is to convert autopilot to use the gi.repository.IBus module.

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

93. By Thomi Richards on 2012-11-19

Fixed error in debian/control

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/autopilot-ci/111/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/111/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/111/console

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

94. By Thomi Richards on 2012-11-20

Fix get_name issue.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/autopilot-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/112/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/112/console

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

95. By Thomi Richards on 2012-11-20

Fix another place where config setting API changed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/autopilot-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/113/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/113/console

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

96. By Thomi Richards on 2012-11-20

Perhaps you don't need to restart the bus anymore?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/autopilot-ci/114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/114/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/114/console

review: Approve (continuous-integration)

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

97. By Thomi Richards on 2012-11-20

Removed unused method from the ibus emulator module.:

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/autopilot-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/115/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/115/console

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks and works fine. +1. Not approving globally to fix failing ibus tests first.

review: Approve

[lp:~thomir-deactivatedaccount/autopilot/fix-ibus]

98. By Thomi Richards on 2012-11-20

re-introduce daemon restart.

99. By Thomi Richards on 2012-11-20

Wait until the new bus is connected.

100. By Thomi Richards on 2012-11-20

Kill the daemon if we can't connect after 10 seconds.

101. By Thomi Richards on 2012-11-21

bug fix.

102. By Thomi Richards on 2012-11-21

Try caching the bus object.

103. By Thomi Richards on 2012-11-21

Don't call .new() on IBus.Bus to create a new Bus object.

104. By Thomi Richards on 2012-11-21

Steal code from upstream to start the bus.

105. By Thomi Richards on 2012-11-21

Fixed bug.

106. By Thomi Richards on 2012-11-21

Small cleanup.

107. By Thomi Richards on 2012-11-21

whitespace cleanup.

[Brandon Schaefer (brandontschaefer)]

Sweet, fixes it for me unity side :). (And changes look good!)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/autopilot-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=amd64/116/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-ci/./distribution=precise,flavor=i386/116/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/autopilot-ci/116//rebuild/?

review: Approve (continuous-integration)

=== modified file 'autopilot/emulators/ibus.py'
--- autopilot/emulators/ibus.py	2012-10-26 13:34:34 +0000
+++ autopilot/emulators/ibus.py	2012-11-21 00:53:22 +0000
@@ -10,13 +10,11 @@
 
 from __future__ import absolute_import
 
-import ibus
-import ibus.common
+from gi.repository import IBus, GLib
 import os
 import logging
 import subprocess
 from gi.repository import GConf
-from time import sleep
 
 
 logger = logging.getLogger(__name__)
@@ -29,27 +27,35 @@
     :raises: **RuntimeError** in the case of ibus-daemon being unavailable.
 
     """
-    max_tries = 5
-    for i in range(max_tries):
-        if ibus.common.get_address() is None:
-            pid = os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "-d", "--xim")
-            logger.info("Started ibus-daemon with pid %i." % (pid))
-            sleep(2)
-        else:
-            return ibus.Bus()
-    raise RuntimeError("Could not start ibus-daemon after %d tries." % (max_tries))
+    bus = IBus.Bus()
+    if bus.is_connected():
+        return bus
+
+    main_loop = GLib.MainLoop()
+
+    timeout = 5
+    GLib.timeout_add_seconds(timeout, lambda *args: main_loop.quit())
+    bus.connect("connected", lambda *args: main_loop.quit())
+
+    os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
+
+    main_loop.run()
+
+    if not bus.is_connected():
+        raise RuntimeError("Could not start ibus-daemon after %d seconds." % (timeout))
+    return bus
 
 
 def get_available_input_engines():
     """Get a list of available input engines."""
     bus = get_ibus_bus()
-    return [e.name for e in bus.list_engines()]
+    return [e.get_name() for e in bus.list_engines()]
 
 
 def get_active_input_engines():
     """Get the list of input engines that have been activated."""
     bus = get_ibus_bus()
-    return [e.name for e in bus.list_active_engines()]
+    return [e.get_name() for e in bus.list_active_engines()]
 
 
 def set_active_engines(engine_list):
@@ -85,45 +91,20 @@
 
     config.set_value("general",
                      "preload_engine_mode",
-                     ibus.common.PRELOAD_ENGINE_MODE_USER)
+                     GLib.Variant.new_int32(IBus.PreloadEngineMode.USER))
 
     old_engines = get_active_input_engines()
-    config.set_list("general", "preload_engines", engine_list, "s")
+    config.set_value("general",
+                    "preload_engines",
+                    GLib.Variant("as", engine_list)
+                    )
     # need to restart the ibus bus before it'll pick up the new engine.
     # see bug report here:
     # http://code.google.com/p/ibus/issues/detail?id=1418&thanks=1418&ts=1329885137
     bus.exit(restart=True)
-    sleep(1)
     return old_engines
 
 
-def set_global_input_engine(engine_name):
-    """Set the global iBus input engine by name.
-
-    This function enables the global input engine. To turn it off again, pass None
-    as the engine name.
-
-    :raises: **TypeError** on invalid *engine_name* parameter.
-    :raises: **ValueError** when *engine_name* is an unknown engine.
-
-    """
-    if not (engine_name is None or isinstance(engine_name, basestring)):
-        raise TypeError("engine_name type must be either str or None.")
-
-    bus = get_ibus_bus()
-
-    if engine_name:
-        available_engines = get_available_input_engines()
-        if not engine_name in available_engines:
-            raise ValueError("Unknown engine '%s'" % (engine_name))
-        bus.get_config().set_value("general", "use_global_engine", True)
-        bus.set_global_engine(engine_name)
-        logger.info('Enabling global ibus engine "%s".' % (engine_name))
-    else:
-        bus.get_config().set_value("general", "use_global_engine", False)
-        logger.info('Disabling global ibus engine.')
-
-
 def set_gconf_option(path, value):
     """Set the gconf setting on `path` to the defined `value`"""
     _set_gconf_list (path, value)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-01 14:38:33 +0000
+++ debian/changelog	2012-11-21 00:53:22 +0000
@@ -6,6 +6,7 @@
 
   [ Thomi Richards ]
   * Build sphinx documentation and package it in python-autopilot. 
+  * Change autopilot to use gir IBus module (lp: #1078917).
 
  -- Didier Roche <[e-mail]>  Fri, 28 Sep 2012 08:40:21 +0200
 

=== modified file 'debian/control'
--- debian/control	2012-11-15 06:59:42 +0000
+++ debian/control	2012-11-21 00:53:22 +0000
@@ -20,7 +20,6 @@
          gir1.2-ibus-1.0,
          python-compizconfig,
          python-dbus,
-         python-ibus,
          python-junitxml,
          python-qt4,
          python-testscenarios,