From 6a885af5a6b3e7cd53e1e1befd85689acac1df08 Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Mon, 19 Jul 2021 15:08:38 +0800
Subject: [PATCH] Clean up ibus write-cache in scriptlet

Resolves: #1974626
---
 gating.yaml                                   |  7 ++++++
 ibus-hangul.spec                              | 14 ++++-------
 .../ibus-desktop-testing-role/tasks/main.yml  | 23 ++++++++++++-------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 gating.yaml

diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..b540738
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  # this is the testcase identifier, which OSCI pipeline uses
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 71d809c..0e1c926 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -3,7 +3,7 @@
 
 Name:       ibus-hangul
 Version:    1.5.4
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 URL:        https://github.com/libhangul/ibus-hangul
@@ -73,14 +73,6 @@ make check \
     DISABLE_GUI_TESTS="ibus-hangul" \
     VERBOSE=1
 
-%post
-[ -x %{_bindir}/ibus ] && \
-  %{_bindir}/ibus write-cache --system &>/dev/null || :
-
-%postun
-[ -x %{_bindir}/ibus ] && \
-  %{_bindir}/ibus write-cache --system &>/dev/null || :
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_libexecdir}/ibus-engine-hangul
@@ -99,6 +91,10 @@ make check \
 %{_datadir}/installed-tests/ibus-hangul
 
 %changelog
+* Mon Jul 19 2021 Peng Wu <pwu@redhat.com> - 1.5.4-6
+- Clean up ibus write-cache in scriptlet
+- Resolves: #1974626
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.4-5
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index c506c86..af39205 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -54,15 +54,17 @@
     ANSIBLE: 1
     TMPDIR: '{{ remote_artifacts }}'
     G_MESSAGES_DEBUG: 'all'
+    LANG: 'C.UTF-8'
   block:
   - name: Execute IBus hangul tests
     shell: |
       set -e
+      # Delete LC_CTYPE=C.UTF-8
+      export -n LC_CTYPE
       status="FAIL: frame"
       ibus-desktop-testing-runner \
           --no-graphics \
           --runner=gnome \
-          --timeout=1200 \
           --tests='{{ installed_test_name }}' \
           --output='{{ remote_artifacts }}/{{ installed_test_name }}.log' \
           --result='{{ remote_artifacts }}/test.log' \
@@ -70,30 +72,35 @@
       if [ $? -eq 0 ]; then
           status="PASS: frame"
       fi
-      echo "${status} $TEST" >> {{ remote_artifacts }}/test.log
+      echo "${status}" >> {{ remote_artifacts }}/test.log
+      echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
+      if [ -f {{ remote_artifacts }}/{{ installed_test_name }}.log ] ; then
+          cat {{ remote_artifacts }}/{{ installed_test_name }}.log
+      fi
+      echo "#"
+      echo "#### {{ remote_artifacts }}/test.log"
+      if [ -f {{ remote_artifacts }}/test.log ] ; then
+          cat {{ remote_artifacts }}/test.log
+      fi
+      echo "#"
 
   - name: Check the results
     shell: |
         IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
         if [ x"$IS_RAWHIDE" != x ] ; then
-            echo PASS
             exit 0
         fi
         log="{{ remote_artifacts }}/test.log"
         if [ ! -f $log ] ; then
             echo ERROR
-            exit 1
         else
             FAIL=`grep "^FAIL: " $log | grep -v 'FAIL: 0$'`
             if [ x"$FAIL" != x ] ; then
                 echo ERROR
-                exit 1
-            else
-                echo PASS
             fi
         fi
     register: test_fails
-    #failed_when: False
+    failed_when: False
 
   - name: Set role result
     set_fact: