|
 |
b67caa |
diff -ru ibus-table-1.9.18.orig/tests/test_0_gtk.py ibus-table-1.9.18/tests/test_0_gtk.py
|
|
|
b67caa |
--- ibus-table-1.9.18.orig/tests/test_0_gtk.py 2020-07-27 09:41:25.799087549 +0200
|
|
|
b67caa |
+++ ibus-table-1.9.18/tests/test_0_gtk.py 2020-07-28 12:23:43.127130148 +0200
|
|
|
b67caa |
@@ -68,6 +68,7 @@
|
|
|
b67caa |
|
|
|
b67caa |
DONE_EXIT = True
|
|
|
b67caa |
ENGINE_NAME = 'wubi-jidian86'
|
|
|
b67caa |
+CONFIG_SECTION = 'engine/table/%s' % ENGINE_NAME
|
|
|
b67caa |
|
|
|
b67caa |
from gtkcases import TestCases
|
|
|
b67caa |
|
|
|
b67caa |
@@ -96,16 +97,18 @@
|
|
|
b67caa |
class SimpleGtkTestCase(unittest.TestCase):
|
|
|
b67caa |
global DONE_EXIT
|
|
|
b67caa |
global ENGINE_NAME
|
|
|
b67caa |
+ global CONFIG_SECTION
|
|
|
b67caa |
ENGINE_PATH = '/com/redhat/IBus/engines/table/Test/Engine'
|
|
|
b67caa |
|
|
|
b67caa |
@classmethod
|
|
|
b67caa |
def setUpClass(cls):
|
|
|
b67caa |
cls._flag = False
|
|
|
b67caa |
IBus.init()
|
|
|
b67caa |
- cls._gsettings = Gio.Settings(
|
|
|
b67caa |
- schema='org.freedesktop.ibus.engine.table',
|
|
|
b67caa |
- path='/org/freedesktop/ibus/engine/table/%s/' % ENGINE_NAME)
|
|
|
b67caa |
- cls._orig_chinesemode = cls._gsettings.get_int('chinesemode')
|
|
|
b67caa |
+ cls.__bus = IBus.Bus()
|
|
|
b67caa |
+ cls._config = cls.__bus.get_config()
|
|
|
b67caa |
+ cls._orig_chinesemode = table.variant_to_value(
|
|
|
b67caa |
+ cls._config.get_value(
|
|
|
b67caa |
+ CONFIG_SECTION, 'chinesemode'))
|
|
|
b67caa |
signums = [getattr(signal, s, None) for s in
|
|
|
b67caa |
'SIGINT SIGTERM SIGHUP'.split()]
|
|
|
b67caa |
for signum in filter(None, signums):
|
|
|
b67caa |
@@ -116,7 +119,11 @@
|
|
|
b67caa |
(signum, original_handler))
|
|
|
b67caa |
@classmethod
|
|
|
b67caa |
def tearDownClass(cls):
|
|
|
b67caa |
- cls._gsettings.set_int('chinesemode', cls._orig_chinesemode)
|
|
|
b67caa |
+ if cls._orig_chinesemode:
|
|
|
b67caa |
+ cls._config.set_value(
|
|
|
b67caa |
+ CONFIG_SECTION,
|
|
|
b67caa |
+ 'chinesemode',
|
|
|
b67caa |
+ GLib.Variant.new_int32(cls._orig_chinesemode))
|
|
|
b67caa |
|
|
|
b67caa |
@classmethod
|
|
|
b67caa |
def signal_handler(cls, user_data):
|
|
|
b67caa |
@@ -136,10 +142,12 @@
|
|
|
b67caa |
self.__inserted_text = ''
|
|
|
b67caa |
self.__commit_done = False
|
|
|
b67caa |
self.__reset_coming = False
|
|
|
b67caa |
- self._gsettings.set_int('chinesemode', 4)
|
|
|
b67caa |
+ self._config.set_value(
|
|
|
b67caa |
+ CONFIG_SECTION,
|
|
|
b67caa |
+ 'chinesemode',
|
|
|
b67caa |
+ GLib.Variant.new_int32(4))
|
|
|
b67caa |
|
|
|
b67caa |
def register_ibus_engine(self):
|
|
|
b67caa |
- self.__bus = IBus.Bus()
|
|
|
b67caa |
if not self.__bus.is_connected():
|
|
|
b67caa |
self.fail('ibus-daemon is not running')
|
|
|
b67caa |
return False
|