From a4b9c7053b4f4839d7b5c0fb5db7622de914d4ce Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 08:59:15 +0000
Subject: [PATCH 1/7] Output CI log to stdout


---

diff --git a/ibus.spec b/ibus.spec
index a0ae0e5..77abc9c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -38,7 +38,7 @@
 
 Name:           ibus
 Version:        1.5.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -488,6 +488,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-3
+- Output CI log to stdout
+
 * Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-2
 - Change default session to mutter from gnome in desktop-testing
 
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index f1d957e..52954bf 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -80,6 +80,16 @@
 
   - name: Check the results
     shell: |
+        echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
+        cat {{ remote_artifacts }}/{{ installed_test_name }}.log
+        echo ""
+        echo ""
+        echo ""
+        echo "#### {{ remote_artifacts }}/test.log"
+        cat {{ remote_artifacts }}/test.log
+        echo ""
+        echo ""
+        echo ""
         IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
         if [ x"$IS_RAWHIDE" != x ] ; then
             echo PASS

From 780e6ec14e4441b04299f3680de994810de9c28f Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 09:26:31 +0000
Subject: [PATCH 2/7] Test2


---

diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index 52954bf..13359e0 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -82,14 +82,14 @@
     shell: |
         echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
         cat {{ remote_artifacts }}/{{ installed_test_name }}.log
-        echo ""
-        echo ""
-        echo ""
+        echo "#"
+        echo "#"
+        echo "#"
         echo "#### {{ remote_artifacts }}/test.log"
         cat {{ remote_artifacts }}/test.log
-        echo ""
-        echo ""
-        echo ""
+        echo "#"
+        echo "#"
+        echo "#"
         IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
         if [ x"$IS_RAWHIDE" != x ] ; then
             echo PASS

From fec7ba81f8a57ce02c8fca55fae8a5ddf8ff8265 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 11:31:50 +0000
Subject: [PATCH 3/7] Test3


---

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index c505db4..021f84a 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,6 +1,6 @@
-From ec6b251149bb5ca79c73f7bdbded55d72a44b3a1 Mon Sep 17 00:00:00 2001
+From b3b90f0e467ade81165d67638ca7c2541963a879 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Sat, 20 Mar 2021 11:40:50 +0900
+Date: Sat, 20 Mar 2021 20:28:42 +0900
 Subject: [PATCH] src/tests: Change default session gnome-session to mutter
 
 gnome-shell 40 now shows the overview mode by login and
@@ -9,13 +9,18 @@ Now the default session is changed to mutter from gnome-session.
 The default may be changed to twm if mutter also will be changed
 not to accept the application focus in the future.
 
+Disable Tour dialog which prevent test application from getting the
+input focus.
+
+Don't output FAIL if the actual failure is 0 for Fedora CI.
+
 BUG=https://discourse.gnome.org/t/focus-on-autostart-application-by-login/5863
 ---
- src/tests/ibus-desktop-testing-runner.in | 22 ++++++++++++++++++----
- 1 file changed, 18 insertions(+), 4 deletions(-)
+ src/tests/ibus-desktop-testing-runner.in | 31 +++++++++++++++++++-----
+ 1 file changed, 25 insertions(+), 6 deletions(-)
 
 diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
-index 4232c549..92ae14ba 100755
+index 4232c549..23e3411e 100755
 --- a/src/tests/ibus-desktop-testing-runner.in
 +++ b/src/tests/ibus-desktop-testing-runner.in
 @@ -4,7 +4,7 @@
@@ -82,6 +87,22 @@ index 4232c549..92ae14ba 100755
      fi
  }
  
+@@ -360,8 +374,13 @@ EOF_RUNNER
+         ;;
+     esac
+     echo ""
+-    print_log -e "${GREEN}PASS${NC}: $pass"
+-    print_log -e "${RED}FAIL${NC}: $fail"
++    # Fedora CI assumes the test is failed even if $fail is 0.
++    if [ $pass -ne 0 ] ; then
++        print_log -e "${GREEN}PASS${NC}: $pass"
++    fi
++    if [ $fail -ne 0 ] ; then
++        print_log -e "${RED}FAIL${NC}: $fail"
++    fi
+     echo ""
+     if [ $TEST_LOG_STDOUT -eq 1 ] ; then
+         cat $TEST_LOG
 -- 
 2.28.0
 
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index 13359e0..7befc56 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -76,7 +76,7 @@
       if [ $? -eq 0 ]; then
           status="PASS: frame"
       fi
-      echo "${status} $TEST" >> {{ remote_artifacts }}/test.log
+      echo "${status}" >> {{ remote_artifacts }}/test.log
 
   - name: Check the results
     shell: |

From bfd024834f5c56a9d761fd3e3ae2aa9dc21fa22b Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 12:44:46 +0000
Subject: [PATCH 4/7] Test4


---

diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index 7befc56..b9a1079 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -80,36 +80,36 @@
 
   - name: Check the results
     shell: |
-        echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
-        cat {{ remote_artifacts }}/{{ installed_test_name }}.log
-        echo "#"
-        echo "#"
-        echo "#"
-        echo "#### {{ remote_artifacts }}/test.log"
-        cat {{ remote_artifacts }}/test.log
-        echo "#"
-        echo "#"
-        echo "#"
         IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
-        if [ x"$IS_RAWHIDE" != x ] ; then
-            echo PASS
-            exit 0
-        fi
+        #if [ x"$IS_RAWHIDE" != x ] ; then
+        #    exit 0
+        #fi
+        is_succeeded=1
         log="{{ remote_artifacts }}/test.log"
         if [ ! -f $log ] ; then
-            echo ERROR
-            exit 1
+            #echo ERROR
+            is_succeeded=0
         else
             FAIL=`grep "^FAIL: " $log | grep -v 'FAIL: 0$'`
             if [ x"$FAIL" != x ] ; then
-                echo ERROR
-                exit 1
-            else
-                echo PASS
+                #echo ERROR
+                is_succeeded=0
             fi
         fi
+        if [ $is_succeeded -ne 1 ] ; then
+            echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
+            cat {{ remote_artifacts }}/{{ installed_test_name }}.log
+            echo "#"
+            echo "#"
+            echo "#"
+            echo "#### {{ remote_artifacts }}/test.log"
+            cat {{ remote_artifacts }}/test.log
+            echo "#"
+            echo "#"
+            echo "#"
+        fi
     register: test_fails
-    #failed_when: False
+    failed_when: False
 
   - name: Set role result
     set_fact:

From f5bbfbe3a3188e0352faf6aa7d97144f9d6c9491 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 13:56:28 +0000
Subject: [PATCH 5/7] Test5


---

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 021f84a..c05ceea 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -87,22 +87,6 @@ index 4232c549..23e3411e 100755
      fi
  }
  
-@@ -360,8 +374,13 @@ EOF_RUNNER
-         ;;
-     esac
-     echo ""
--    print_log -e "${GREEN}PASS${NC}: $pass"
--    print_log -e "${RED}FAIL${NC}: $fail"
-+    # Fedora CI assumes the test is failed even if $fail is 0.
-+    if [ $pass -ne 0 ] ; then
-+        print_log -e "${GREEN}PASS${NC}: $pass"
-+    fi
-+    if [ $fail -ne 0 ] ; then
-+        print_log -e "${RED}FAIL${NC}: $fail"
-+    fi
-     echo ""
-     if [ $TEST_LOG_STDOUT -eq 1 ] ; then
-         cat $TEST_LOG
 -- 
 2.28.0
 

From afcc3353b73b14eae5b66a0b969c56c9ccd9b84b Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Mar 20 2021 14:27:53 +0000
Subject: [PATCH 6/7] Test6


---

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index c05ceea..6cf838f 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -12,7 +12,7 @@ not to accept the application focus in the future.
 Disable Tour dialog which prevent test application from getting the
 input focus.
 
-Don't output FAIL if the actual failure is 0 for Fedora CI.
+Don't output FAIL if the actual failure is 0 for Fedora CI. 
 
 BUG=https://discourse.gnome.org/t/focus-on-autostart-application-by-login/5863
 ---

From a1586ad67a33c4580466f636bdbc44f4774008b2 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Apr 21 2021 11:53:04 +0000
Subject: [PATCH 7/7] Merge the latest rawhide


---

diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 6cf838f..021f84a 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -12,7 +12,7 @@ not to accept the application focus in the future.
 Disable Tour dialog which prevent test application from getting the
 input focus.
 
-Don't output FAIL if the actual failure is 0 for Fedora CI. 
+Don't output FAIL if the actual failure is 0 for Fedora CI.
 
 BUG=https://discourse.gnome.org/t/focus-on-autostart-application-by-login/5863
 ---
@@ -87,6 +87,22 @@ index 4232c549..23e3411e 100755
      fi
  }
  
+@@ -360,8 +374,13 @@ EOF_RUNNER
+         ;;
+     esac
+     echo ""
+-    print_log -e "${GREEN}PASS${NC}: $pass"
+-    print_log -e "${RED}FAIL${NC}: $fail"
++    # Fedora CI assumes the test is failed even if $fail is 0.
++    if [ $pass -ne 0 ] ; then
++        print_log -e "${GREEN}PASS${NC}: $pass"
++    fi
++    if [ $fail -ne 0 ] ; then
++        print_log -e "${RED}FAIL${NC}: $fail"
++    fi
+     echo ""
+     if [ $TEST_LOG_STDOUT -eq 1 ] ; then
+         cat $TEST_LOG
 -- 
 2.28.0
 
diff --git a/ibus.spec b/ibus.spec
index 77abc9c..f912821 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -38,7 +38,7 @@
 
 Name:           ibus
 Version:        1.5.24
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -488,8 +488,11 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Wed Apr 21 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-4
+- Merge the latest rawhide
+
 * Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-3
-- Output CI log to stdout
+- Don't output FAIL if the actual failure is 0 for Fedora CI
 
 * Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-2
 - Change default session to mutter from gnome in desktop-testing
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index b9a1079..50a10bf 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -77,37 +77,32 @@
           status="PASS: frame"
       fi
       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
-        #    exit 0
-        #fi
-        is_succeeded=1
+        if [ x"$IS_RAWHIDE" != x ] ; then
+            exit 0
+        fi
         log="{{ remote_artifacts }}/test.log"
         if [ ! -f $log ] ; then
-            #echo ERROR
-            is_succeeded=0
+            echo ERROR
         else
             FAIL=`grep "^FAIL: " $log | grep -v 'FAIL: 0$'`
             if [ x"$FAIL" != x ] ; then
-                #echo ERROR
-                is_succeeded=0
+                echo ERROR
             fi
         fi
-        if [ $is_succeeded -ne 1 ] ; then
-            echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
-            cat {{ remote_artifacts }}/{{ installed_test_name }}.log
-            echo "#"
-            echo "#"
-            echo "#"
-            echo "#### {{ remote_artifacts }}/test.log"
-            cat {{ remote_artifacts }}/test.log
-            echo "#"
-            echo "#"
-            echo "#"
-        fi
     register: test_fails
     failed_when: False