#14 WIP: Update ibus-desktop-testing-runner not to fail CI
Closed 4 years ago by fujiwara. Opened 4 years ago by fujiwara.
rpms/ fujiwara/ibus tests2  into  master

file modified
+37
@@ -15271,3 +15271,40 @@ 

  -- 

  2.21.0

  

+ From 28c10d64d282fa9fbc35a7bc44a096f6137d5e46 Mon Sep 17 00:00:00 2001

+ From: fujiwarat <takao.fujiwara1@gmail.com>

+ Date: Tue, 13 Aug 2019 20:06:51 +0900

+ Subject: [PATCH] src/tests: Set XDG_SESSION_TYPE in

+  ibus-desktop-testing-runner

+ 

+ mutter 3.33.90 or later exits the session without loginctl.

+ Now ibus-desktop-testing-runner has XDG_SESSION_TYPE forcibly

+ not to exit gnome-shell.

+ ---

+  src/tests/ibus-desktop-testing-runner.in | 3 +++

+  1 file changed, 3 insertions(+)

+ 

+ diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in

+ index 3045d601..141e9b5b 100755

+ --- a/src/tests/ibus-desktop-testing-runner.in

+ +++ b/src/tests/ibus-desktop-testing-runner.in

+ @@ -157,6 +157,8 @@ _EOF

+              echo "$XDG_LANG_NEW" > $XDG_LOCALE_FILE

+          fi

+      fi

+ +    # `su` command does not run loginctl

+ +    export XDG_SESSION_TYPE='x11'

+  }

+  

+  run_dbus_daemon()

+ @@ -175,6 +177,7 @@ run_desktop()

+      PID_XORG=$!

+      sleep 1

+      export DISPLAY=$DISPLAY

+ +    echo "Running $DESKTOP_COMMAND with $USER in `tty`"

+      $DESKTOP_COMMAND &

+      PID_GNOME_SESSION=$!

+      sleep 30

+ -- 

+ 2.21.0

+ 

file modified
+4 -1
@@ -35,7 +35,7 @@ 

  

  Name:           ibus

  Version:        1.5.20

- Release:        9%{?dist}

+ Release:        10%{?dist}

  Summary:        Intelligent Input Bus for Linux OS

  License:        LGPLv2+

  URL:            https://github.com/ibus/%name/wiki
@@ -464,6 +464,9 @@ 

  %{_datadir}/installed-tests/ibus

  

  %changelog

+ * Tue Aug 13 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-10

+ - Update ibus-desktop-testing-runner not to fail CI.

+ 

  * Tue Aug 06 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.20-9

  - ibus-daemon always will exits with parent's death.