Merge lp:~brandontschaefer/unity/ap-ibus-test-fixes into lp:unity

[Brandon Schaefer]

Fixes ibus pinyin and hangul ap test

== Problem ==
All the ibus test fail

== Fix ==
They were failing because of an option in ibus that doesn't allow using of different ibus-engines from your local. This is now toggled on. The Anthy test seem to still have a problem, but this fixes Pinyin and Hangul.

[Thomi Richards (thomir)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'tests/autopilot/autopilot/emulators/ibus.py'
--- tests/autopilot/autopilot/emulators/ibus.py	2012-04-02 20:18:58 +0000
+++ tests/autopilot/autopilot/emulators/ibus.py	2012-05-14 01:42:19 +0000
@@ -69,6 +69,11 @@
 
     bus = get_ibus_bus()
     config = bus.get_config()
+
+    config.set_value("general",
+                     "preload_engine_mode",
+                     ibus.common.PRELOAD_ENGINE_MODE_USER)
+
     old_engines = get_active_input_engines()
     config.set_list("general", "preload_engines", engine_list, "s")
     # need to restart the ibus bus before it'll pick up the new engine.

=== modified file 'tests/autopilot/autopilot/tests/test_ibus.py'
--- tests/autopilot/autopilot/tests/test_ibus.py	2012-04-25 04:34:55 +0000
+++ tests/autopilot/autopilot/tests/test_ibus.py	2012-05-14 01:42:19 +0000
@@ -11,6 +11,7 @@
 from testtools.matchers import Equals, NotEquals
 
 from autopilot.emulators.ibus import (
+    get_active_input_engines,
     set_active_engines,
     get_available_input_engines,
     )
@@ -30,20 +31,19 @@
     @classmethod
     def setUpClass(cls):
         cls._old_engines = None
-        cls.activate_input_engine_or_skip(cls.engine_name)
 
     @classmethod
     def tearDownClass(cls):
         if cls._old_engines is not None:
             set_active_engines(cls._old_engines)
 
-    @classmethod
-    def activate_input_engine_or_skip(cls, engine_name):
+    def activate_input_engine_or_skip(self, engine_name):
         available_engines = get_available_input_engines()
         if engine_name in available_engines:
-            cls._old_engines = set_active_engines([engine_name])
+            if get_active_input_engines() != [engine_name]:
+                IBusTests._old_engines = set_active_engines([engine_name])
         else:
-            raise AutopilotTestCase.skipException("This test requires the '%s' engine to be installed." % (engine_name))
+            self.skip("This test requires the '%s' engine to be installed." % (engine_name))
 
     def activate_ibus(self, widget):
         """Activate IBus, and wait till it's actived on 'widget'"""
@@ -93,6 +93,10 @@
         ('disk_management', {'input': 'cipan guanli ', 'result': u'\u78c1\u76d8\u7ba1\u7406'}),
     ]
 
+    def setUp(self):
+        super(IBusTestsPinyin, self).setUp()
+        self.activate_input_engine_or_skip(self.engine_name)
+
     def test_simple_input_dash(self):
         self.do_dash_test_with_engine()
 
@@ -111,6 +115,10 @@
         ('document', {'input': 'anstj ', 'result': u'\ubb38\uc11c '}),
         ]
 
+    def setUp(self):
+        super(IBusTestsHangul, self).setUp()
+        self.activate_input_engine_or_skip(self.engine_name)
+
     def test_simple_input_dash(self):
         self.do_dash_test_with_engine()
 
@@ -135,6 +143,10 @@
         ]
         )
 
+    def setUp(self):
+        super(IBusTestsAnthy, self).setUp()
+        self.activate_input_engine_or_skip(self.engine_name)
+
     def test_simple_input_dash(self):
         self.do_dash_test_with_engine()
 
@@ -147,6 +159,10 @@
 
     engine_name = "pinyin"
 
+    def setUp(self):
+        super(IBusTestsPinyinIgnore, self).setUp()
+        self.activate_input_engine_or_skip(self.engine_name)
+
     def test_ignore_key_events_on_dash(self):
         self.dash.ensure_visible()
         self.addCleanup(self.dash.ensure_hidden)
@@ -177,6 +193,10 @@
 
     engine_name = "anthy"
 
+    def setUp(self):
+        super(IBusTestsAnthyIgnore, self).setUp()
+        self.activate_input_engine_or_skip(self.engine_name)
+
     def test_ignore_key_events_on_dash(self):
         self.dash.ensure_visible()
         self.addCleanup(self.dash.ensure_hidden)