.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -27,4 +27,3 @@ ibus-anthy.png
 /ibus-anthy-1.5.14.tar.gz
 /ibus-anthy-1.5.15.tar.gz
 /ibus-anthy-1.5.16.tar.gz
-/ibus-anthy-1.5.17.tar.gz

ibus-anthy.spec

@@ -17,13 +17,12 @@
 %endif
 
 Name:           ibus-anthy
-Version:        1.5.17
+Version:        1.5.16
 Release:        %autorelease
 Summary:        The Anthy engine for IBus input platform
 License:        GPL-2.0-or-later
 URL:            https://github.com/ibus/ibus/wiki
-Source0:        https://github.com/ibus/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
-Source1:        https://github.com/ibus/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz.sum#/%{name}.tar.gz.sum
+Source0:        https://github.com/ibus/ibus-anthy/releases/download/%{version}/%{name}-%{version}.tar.gz
 
 # Upstreamed patches.
 # Patch0:         %%{name}-HEAD.patch
@@ -89,16 +88,10 @@ the functionality of the installed %{name} package.
 
 
 %prep
-SAVED_SUM=$(grep sha512sum %SOURCE1 | awk '{print $2}')
-MY_SUM=$(sha512sum %SOURCE0 | awk '{print $1}')
-if test x"$SAVED_SUM" != x"$MY_SUM" ; then
-    abort
-fi
 %autosetup -S git
 
 %build
 #autoreconf -f -i -v
-autoreconf -f -i -v
 %configure \
 %if %have_default_layout
   --with-layout='default' \
@@ -110,6 +103,7 @@ autoreconf -f -i -v
   --with-kasumi-exec=/usr/bin/kasumi-unicode \
 %endif
   --with-on-off-keys="'Zenkaku_Hankaku', 'Ctrl+space', 'Ctrl+J'" \
+  --with-python=python3 \
   --enable-installed-tests \
   --disable-static
 # make -C po update-gmo

ibus-anthy.tar.gz.sum

@@ -1,4 +0,0 @@
-cksum 1682900558 914700 ibus-anthy-1.5.17.tar.gz
-sha1sum 7935a5abc2a1cb4dd59ff9295d3582bdb1f0cc83 ibus-anthy-1.5.17.tar.gz
-sha256sum 9e1d28ad7da2be5e0d9c0eb0d8fb7557fc89770aa2237272debe197bd61abd40 ibus-anthy-1.5.17.tar.gz
-sha512sum 34775879ea4891d2f83c5f9aa341a59bac928332ad60ec4ba8d1475783b0c50c721229e48c7671f050066da3d4053531792c3fa5e5640db2c2e8bd1bc46105a1 ibus-anthy-1.5.17.tar.gz

plans/test.fmf

@@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (ibus-anthy-1.5.17.tar.gz) = 34775879ea4891d2f83c5f9aa341a59bac928332ad60ec4ba8d1475783b0c50c721229e48c7671f050066da3d4053531792c3fa5e5640db2c2e8bd1bc46105a1
+SHA512 (ibus-anthy-1.5.16.tar.gz) = d1a7b9da402d85af955f96fd8618189fb2e682763f57b5d6b54e7bcf052138ba300f4ba8130a4ac0e8e1e8821319e9b6360e57568c84c1f9845438174e51a959

tests/ibus-desktop-testing/install1-common/main.fmf

@@ -1,90 +0,0 @@
-summary: Install common GNOME desktop components
-description:
-    The listed packages are installed commonly between Fedora and
-    RHEL GNOME desktop components.
-require:
-    # IBus CI sets
-    - ibus
-    - ibus-desktop-testing
-    - dbus-x11
-    # https://pagure.io/fedora-comps/blob/main/f/comps-f41.xml.in
-    # dnf group info GNOME
-    # base-graphical mandatory
-    - mesa-dri-drivers
-    - mesa-vulkan-drivers
-    - plymouth-system-theme
-    # fonts default
-    - default-fonts-cjk-mono
-    - default-fonts-cjk-sans
-    - default-fonts-cjk-serif
-    - default-fonts-core-emoji
-    - default-fonts-core-math
-    - default-fonts-core-mono
-    - default-fonts-core-sans
-    - default-fonts-core-serif
-    - default-fonts-other-mono
-    - default-fonts-other-sans
-    - default-fonts-other-serif
-    # gnome-desktop mandatory
-    - dconf
-    - gdm
-    - gnome-connections
-    - gnome-control-center
-    - gnome-initial-setup
-    - gnome-session-wayland-session
-    - gnome-settings-daemon
-    - gnome-shell
-    - gnome-software
-    - gnome-text-editor
-    - nautilus
-    - polkit
-    - ptyxis
-    # gnome-desktop default
-    - avahi
-    - baobab
-    # Sometimes version mismatch with gnome-shell in rawhide
-    #- chrome-gnome-shell
-    - fprintd-pam
-    - glib-networking
-    - gnome-bluetooth
-    - gnome-browser-connector
-    - gnome-calculator
-    - gnome-calendar
-    - gnome-characters
-    - gnome-classic-session
-    - gnome-clocks
-    - gnome-color-manager
-    - gnome-disk-utility
-    - gnome-epub-thumbnailer
-    - gnome-font-viewer
-    - gnome-remote-desktop
-    - gnome-system-monitor
-    - gnome-user-docs
-    - gvfs-goa
-    - gvfs-mtp
-    - librsvg2
-    - libsane-hpaio
-    - loupe
-    - mesa-dri-drivers
-    - mesa-libEGL
-    - ModemManager
-    - NetworkManager-adsl
-    - NetworkManager-ppp
-    - NetworkManager-wwan
-    - PackageKit-command-not-found
-    - PackageKit-gtk3-module
-    - sane-backends-drivers-scanners
-    - snapshot
-    # Move systemd-oomd-defaults to Post-Installing section
-    - tracker
-    - tracker-miners
-    - xdg-desktop-portal
-    - xdg-desktop-portal-gnome
-    - xdg-desktop-portal-gtk
-    - xdg-user-dirs-gtk
-    # desktop-accessibility default
-    - at-spi2-atk
-    - at-spi2-core
-    - brltty
-    - orca
-    - speech-dispatcher

tests/ibus-desktop-testing/install2-fedora/main.fmf

@@ -1,39 +0,0 @@
-summary: Install Fedora specific GNOME desktop components
-description:
-    The listed packages are available in Fedora only.
-enabled: false
-adjust:
-    when: distro == fedora
-    enabled: true
-require:
-    - adobe-source-code-pro-fonts
-    - gnome-screenshot
-    - gnome-boxes
-    - yelp
-    - cheese
-    - eog
-    - evince
-    - evince-djvu
-    - gnome-backgrounds
-    - gnome-contacts
-    - gnome-logs
-    - gnome-maps
-    - gnome-photos
-    - gnome-themes-extra
-    - gnome-user-share
-    - gnome-weather
-    - gvfs-afc
-    - gvfs-afp
-    - gvfs-archive
-    - gvfs-fuse
-    - gvfs-gphoto2
-    - gvfs-smb
-    - NetworkManager-openconnect-gnome
-    - NetworkManager-openvpn-gnome
-    - NetworkManager-pptp-gnome
-    - NetworkManager-ssh-gnome
-    - NetworkManager-vpnc-gnome
-    - rygel
-    - simple-scan
-    - sushi
-    - totem

tests/ibus-desktop-testing/install3-rhel/main.fmf

@@ -1,7 +0,0 @@
-summary: Install RHEL specific GNOME desktop components
-description:
-    Currently no specific packages for RHEL.
-enabled: false
-adjust:
-    when: distro != fedora
-    enabled: true

tests/ibus-desktop-testing/install4-g-d-t/main.fmf

@@ -1,6 +0,0 @@
-summary: Install GNOME installed-tests testing harness
-description:
-    gnome-desktop-testing package is required by IBus CI(ibus-desktop-testing)
-    and it's available in Fedora only at present.
-require:
-    - gnome-desktop-testing

tests/ibus-desktop-testing/install5-tmt/main.fmf

@@ -1,5 +0,0 @@
-summary: Install TMT packages
-description:
-    The test script is calling the beakerlib script.
-require:
-    - beakerlib

tests/ibus-desktop-testing/install6-ibus-anthy/main.fmf

@@ -1,6 +0,0 @@
-summary: Install ibus-anthy specific packages
-description:
-    The listed packages are required by CI of ibus-anthy.
-require:
-    - ibus-anthy-tests
-    - glibc-langpack-ja

tests/ibus-desktop-testing/main.fmf

@@ -1,3 +0,0 @@
-summary: gnome-desktop-testing tests
-# common test for sub tests
-test: env

tests/ibus-desktop-testing/run/main.fmf

@@ -1,5 +0,0 @@
-summary: Run tests
-description:
-    Run CI with ibus-desktop-testing-runner in GNOME Wayland.
-duration: 15m
-test: ./test.sh

tests/ibus-desktop-testing/run/test.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartTest
-        rlRun -t "/usr/bin/ibus-desktop-testing-runner --runner gnome --tests ibus-anthy --no-graphics --lang ja_JP.UTF-8"
-    rlPhaseEnd
-    rlPhaseStartCleanup
-        rlRun "echo test-suite.log"
-        rlRun "cat test-suite.log"
-        rlRun "echo /export/home/itestuser/test-autostart.log"
-        rlRun "cat /export/home/itestuser/test-autostart.log"
-    rlPhaseEnd
-rlJournalEnd

tests/main.fmt

@@ -1 +0,0 @@
-contact: Takao Fujiwara <fujiwara@redhat.com>

tests/roles/ibus-desktop-testing-role/defaults/main.yml

@@ -0,0 +1,3 @@
+role_pkgs_req:
+  - rsync
+  - xorg-x11-server-Xvfb

tests/roles/ibus-desktop-testing-role/files/check-results.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+TEST_LOG="test.log"
+TEST_RUN_IN_RAWHIDE=1
+
+declare -i TEST_RUN_IN_RAWHIDE
+
+if [ $# -gt 0 ] ; then
+    TEST_LOG="$1"
+    TEST_RUN_IN_RAWHIDE=$2
+fi
+
+gen_results()
+{
+    TEST_RUNTIME="$1"
+    TEST_STATUS="$2"
+    TEST_STATUS_UPPER="$(echo "$TEST_STATUS" | tr '[:lower:]' '[:upper:]')"
+    cat > results.xml << _EOF
+results:
+- test: results
+  result: $TEST_STATUS
+  runtime: $TEST_RUNTIME
+  logs:
+  - ${TEST_STATUS_UPPER}-str_results.log
+
+_EOF
+
+    DIR=$(dirname "$TEST_LOG")
+    if [ x"$TEST_LOG" != x ] ; then
+       cp "$TEST_LOG" "$DIR/${TEST_STATUS_UPPER}-str_results.log"
+    else
+       touch "$DIR/${TEST_STATUS_UPPER}-str_results.log"
+    fi
+    if [ x"$DIR" != x. ] ; then
+        mv results.xml "$DIR"
+    fi
+}
+
+if [ $TEST_RUN_IN_RAWHIDE -eq 0 ] ; then
+    IS_RAWHIDE="$(grep -i rawhide /etc/fedora-release)"
+    if [ x"$IS_RAWHIDE" != x ] ; then
+        gen_results "0" "pass"
+        echo -n PASS
+        exit 0
+    fi
+fi
+if [ ! -f $TEST_LOG ] ; then
+    gen_results "0" "fail"
+    echo -n ERROR
+else
+    FAIL="$(grep "^FAIL: " $TEST_LOG | grep -v 'FAIL: 0$')"
+    RUNTIME_FAIL="$(grep -v 'frame' $TEST_LOG | grep "^FAIL: " | sed -e "s/FAIL: //")"
+    RUNTIME_PASS="$(grep -v 'frame' $TEST_LOG | grep "^PASS: " | sed -e "s/PASS: //")"
+    if [ x"$RUNTIME_FAIL" = x ] ; then
+        RUNTIME_FAIL="0"
+    fi
+    if [ x"$RUNTIME_PASS" = x ] ; then
+        RUNTIME_PASS="0"
+    fi
+    RUNTIME="$(expr $RUNTIME_FAIL + $RUNTIME_PASS)"
+    if [ x"$FAIL" != x ] ; then
+        gen_results "$RUNTIME" "fail"
+        echo -n ERROR
+    else
+        gen_results "$RUNTIME" "pass"
+        echo -n PASS
+    fi
+fi
+

tests/roles/ibus-desktop-testing-role/meta/main.yml

@@ -0,0 +1,4 @@
+---
+
+dependencies:
+    - role: str-common-init

tests/roles/ibus-desktop-testing-role/tasks/main.yml

@@ -0,0 +1,221 @@
+---
+- name: Check if Fedora desktop
+  register: fedora_desktop
+  stat:
+      path: "/etc/fedora-release"
+
+- name: Build and install GNOME installed-tests testing harness
+  block:
+    - name: Installing common GNOME desktop components
+      package:
+          name:
+            # IBus CI sets
+            - xorg-x11-server-Xvfb
+            - ibus
+            - ibus-desktop-testing
+            - dbus-x11
+            # https://pagure.io/fedora-comps/blob/main/f/comps-f38.xml.in
+            # dnf group info GNOME
+            # mandatory
+            - dconf
+            - gdm
+            - gnome-connections
+            - gnome-control-center
+            - gnome-initial-setup
+            - gnome-session-wayland-session
+            - gnome-session-xsession
+            - gnome-settings-daemon
+            - gnome-shell
+            - gnome-software
+            - gnome-terminal
+            - gnome-text-editor
+            - nautilus
+            - polkit
+            # default
+            - adobe-source-code-pro-fonts
+            - at-spi2-atk
+            - at-spi2-core
+            - avahi
+            - baobab
+            # Sometimes version mismatch with gnome-shell in rawhide
+            #- chrome-gnome-shell
+            - evince
+            - fprintd-pam
+            - glib-networking
+            - gnome-bluetooth
+            - gnome-calculator
+            - gnome-characters
+            - gnome-classic-session
+            - gnome-clocks
+            - gnome-color-manager
+            - gnome-disk-utility
+            - gnome-font-viewer
+            - gnome-logs
+            - gnome-remote-desktop
+            - gnome-system-monitor
+            - gnome-terminal-nautilus
+            - gnome-user-docs
+            - gvfs-fuse
+            - gvfs-goa
+            - gvfs-gphoto2
+            - gvfs-mtp
+            - gvfs-smb
+            - libcanberra-gtk3
+            - libproxy-duktape
+            - librsvg2
+            - libsane-hpaio
+            - mesa-dri-drivers
+            - mesa-libEGL
+            - ModemManager
+            - NetworkManager-adsl
+            - NetworkManager-ppp
+            - NetworkManager-wwan
+            - orca
+            - PackageKit-command-not-found
+            - PackageKit-gtk3-module
+            - sane-backends-drivers-scanners
+            - systemd-oomd-defaults
+            - tracker
+            - tracker-miners
+            - xdg-desktop-portal
+            - xdg-desktop-portal-gnome
+            - xdg-desktop-portal-gtk
+            - xdg-user-dirs-gtk
+    - name: Installing Fedora specific GNOME desktop components
+      when: fedora_desktop.stat.exists == true
+      package:
+          name:
+            - gnome-screenshot
+            - gnome-boxes
+            - yelp
+            - cheese
+            - eog
+            - evince-djvu
+            - gnome-backgrounds
+            - gnome-contacts
+            - gnome-maps
+            - gnome-photos
+            - gnome-themes-extra
+            - gnome-user-share
+            - gnome-weather
+            - gvfs-afc
+            - gvfs-afp
+            - gvfs-archive
+            - NetworkManager-openconnect-gnome
+            - NetworkManager-openvpn-gnome
+            - NetworkManager-pptp-gnome
+            - NetworkManager-ssh-gnome
+            - NetworkManager-vpnc-gnome
+            - rygel
+            - simple-scan
+            - sushi
+            - totem
+    - name: Installing GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == true
+      package:
+          name:
+            - gnome-desktop-testing
+    - name: Installing build environment
+      when: fedora_desktop.stat.exists == false
+      package:
+          name:
+            - autoconf
+            - automake
+            - make
+            - gcc
+            - git
+            - libtool
+
+    - name: Fetching GNOME installed-tests testing harness source from remote repository
+      when: fedora_desktop.stat.exists == false
+      git:
+          repo: 'https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git'
+          dest: gnome-desktop-testing
+          force: yes
+
+    - name: Checkout v2021.1 tag in GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
+      command: git checkout -b v2021.1 refs/tags/v2021.1
+      args:
+          chdir: gnome-desktop-testing
+
+    - name: Configure GNOME installed-tests testing harness build
+      when: fedora_desktop.stat.exists == false
+      command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+      args:
+          chdir: gnome-desktop-testing
+
+    - name: Build GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
+      command: make
+      args:
+          chdir: gnome-desktop-testing
+
+    - name: Install GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
+      command: make install
+      args:
+          chdir: gnome-desktop-testing
+
+- name: Start IBus installed-tests testing harness
+  environment:
+    ANSIBLE: 1
+    TMPDIR: '{{ remote_artifacts }}'
+    G_MESSAGES_DEBUG: 'all'
+    LANG: 'C.UTF-8'
+  block:
+  - name: Execute IBus tests
+    shell: |
+      set -e
+      # Delete LC_CTYPE=C.UTF-8
+      export -n LC_CTYPE
+      status="FAIL: frame"
+      if [ -f $HOME/.config/anthy/last-record2_default.utf8 ] ; then \
+          rm $HOME/.config/anthy/last-record2_default.utf8
+      fi
+      if [ -f $HOME/.anthy/last-record2_default.utf8 ] ; then \
+          rm $HOME/.anthy/last-record2_default.utf8
+      fi
+      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' \
+          null
+      if [ $? -eq 0 ]; then
+          status="PASS: frame"
+      fi
+      if [ -f /var/tmp/ibus-ci-autostart.log ] ; then
+          echo "#### /var/tmp/ibus-ci-autostart.log"
+          cat /var/tmp/ibus-ci-autostart.log
+          rm /var/tmp/ibus-ci-autostart.log
+          echo "#"
+      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
+    script: check-results.sh "{{ remote_artifacts }}/test.log" "0"
+    register: test_fails
+    failed_when: '"ERROR" in test_fails.stdout'
+
+  - name: Set role result
+    set_fact:
+      role_result: "{{ test_fails.stdout }}"
+      role_result_failed: "{{ (test_fails.stdout|d|length > 0) or (test_fails.stderr|d|length > 0) }}"
+      role_result_msg: "{{ test_fails.stdout|d('tests failed.') }}"
+
+  - include_role:
+      name: str-common-final
+

tests/tests.yml

@@ -0,0 +1,10 @@
+- hosts: localhost
+  roles:
+    - role: ibus-desktop-testing-role
+      installed_test_name: ibus-anthy
+      tags:
+      - classic
+      - gating
+      required_packages:
+      - ibus-anthy-tests
+