Merge lp:~brandontschaefer/unity/ibus-daemon-workaroud-attempt3 into lp:unity

[Brandon Schaefer]

Kill the all the ibus-daemon process each test... attempting to beat out the k-indicator which seems to like to steal events from ibus...

Kill the all the ibus-daemon process each test... attempting to beat out the k-indicator which seems to like to steal events from ibus...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3547
http://jenkins.qa.ubuntu.com/job/unity-ci/413/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/302
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/300/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/301

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

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

Python recommends you replace os.spawnlp() with subprocess.Popen().

Instead of waiting 5 seconds you could use ps to poll every second (up to some max, like 10 s) to see if the ibus daemon has started.

The processes won't become zombies if you use os.waitpid() to wait for the reaped children (Popen().pid could be useful here).

[Christopher Townsend (townsend)]

The ibus mess has been worked out in another package, so this MP is no longer needed.

review: Disapprove

Unmerged revisions

3547. By Brandon Schaefer on 2013-10-02

* Try a different way to start the ibus-daemon...

=== modified file 'tests/autopilot/unity/tests/test_ibus.py'
--- tests/autopilot/unity/tests/test_ibus.py	2013-09-25 21:38:24 +0000
+++ tests/autopilot/unity/tests/test_ibus.py	2013-10-02 21:55:34 +0000
@@ -25,6 +25,8 @@
 from gi.repository import GLib
 from gi.repository import IBus
 import os
+import signal
+import subprocess
 from time import sleep
 import time
 import dbus
@@ -120,11 +122,18 @@
         This method adds a cleanUp to reset the old keys once the test is done.
 
         """
-        # FIXME, if im-config is not set to ibus by default, a baad ibus-daemon is start
+        # FIXME, if im-config is not set to ibus by default, a baad ibus-daemon is started
         # which doesn't allow ibus to work! Replace it with a useable one for now...
-        os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--replace", "--xim")
-
-        sleep(10)
+        # kill all ibus-daemons (some will be defunct), but we need to restart a deamon each time...
+        output = subprocess.Popen(['pgrep', '-f', 'ibus-daemon'], stdout=subprocess.PIPE).communicate()[0]
+
+        for pid in output.split():
+            os.kill(int(pid), signal.SIGTERM)
+            sleep(1)
+
+        if len(output.split()) > 0:
+            os.spawnlp(os.P_NOWAIT, "ibus-daemon", "ibus-daemon", "--xim")
+            sleep(5)
 
         bus = get_ibus_bus()
         config = bus.get_config()