From 24e488817a8ab6b10f5fe5fa7d005ac02bfbb3bb Mon Sep 17 00:00:00 2001
From: glasseyes <dglassey@gmail.com>
Date: Thu, 13 Dec 2018 11:53:56 +0700
Subject: [PATCH] set xkb kb to us before test

---
 linux/ibus-keyman/test/runtests.sh         | 24 ++++++++++++++++++++++
 linux/ibus-keyman/test/test_ibus_keyman.py | 12 +++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/linux/ibus-keyman/test/runtests.sh b/linux/ibus-keyman/test/runtests.sh
index 63013e321c..141a70b1db 100755
--- a/linux/ibus-keyman/test/runtests.sh
+++ b/linux/ibus-keyman/test/runtests.sh
@@ -29,6 +29,21 @@ tests=(
 
 #for test in ${tests}; do echo "$test"; done
 
+model=`setxkbmap -query|grep model|cut -d ':' -f 2|tr -d ' '`
+layout=`setxkbmap -query|grep layout|cut -d ':' -f 2|tr -d ' '`
+rules=`setxkbmap -query|grep rules|cut -d ':' -f 2|tr -d ' '`
+variant=`setxkbmap -query|grep variant|cut -d ':' -f 2|tr -d ' '`
+
+echo "System xkb keyboard"
+echo "model:$model"
+echo "layout:$layout"
+echo "rules:$rules"
+echo "variant:$variant"
+
+echo "Setting keyboard to us"
+setxkbmap us
+setxkbmap -query
+
 count=0
 passed=0
 failed=0
@@ -48,7 +63,16 @@ do
 	count=$(( $count + 1 ))
 done
 
+echo "Setting xkb keyboard back to system one"
+if [ "x$variant" == "x" ]; then
+	setxkbmap -model $model -layout $layout -rules $rules
+else
+	setxkbmap -model $model -layout $layout -rules $rules -variant $variant
+fi
+setxkbmap -query
+
 echo "-----------------------------------------------------"
 echo "Tests run : ${count}"
 echo "Passed    : ${passed}"
 echo "Failed    : ${failed}"
+
diff --git a/linux/ibus-keyman/test/test_ibus_keyman.py b/linux/ibus-keyman/test/test_ibus_keyman.py
index 2408941bc5..5084584161 100644
--- a/linux/ibus-keyman/test/test_ibus_keyman.py
+++ b/linux/ibus-keyman/test/test_ibus_keyman.py
@@ -8,6 +8,12 @@ import time
 
 from pynput.keyboard import Key, Controller
 
+try:
+    from xkbgroup import XKeyboard
+    has_xkbgroup = True
+except:
+    has_xkbgroup = False
+
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
 from gi.repository import Gtk, Gdk, Gio
@@ -20,12 +26,11 @@ class TestView(Gtk.Window):
 
     def __init__(self, test_name):
         Gtk.Window.__init__(self, title=test_name)
-
         self.known_modifiers = { "SHIFT" : Key.shift,
             "LCTRL" : Key.ctrl_l,
             "RCTRL" : Key.ctrl_r,
             "LALT" : Key.alt,
-            "RALT" : Key.alt_gr }
+            "RALT" : Key.alt_r }
         self.known_keys = { "K_A" : "a",
             "K_B" : "b",
             "K_C" : "c",
@@ -76,6 +81,9 @@ class TestView(Gtk.Window):
 
     def do_keypresses(self, args, data):
         if self.keys and not self.haspressedkeys:
+            if has_xkbgroup:
+                with XKeyboard() as xkb:
+                    logging.info("xkb %d:%s:%s", xkb.group_num, xkb.group_symbol, xkb.group_name)
             localkeyboard = Controller()
             keys = self.keys.split("]")
             # print(keys)