luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix desktop-app-info test

Browse Source 
g_desktop_app_info_load_from_keyfile() refuses to load .desktop files
where the executable doesn't exist. Therefore whether or not the .desktop
file added in commit 148995544 is actually considered during tests depends
on /usr/bin/flatpak being installed. This isn't a safe assumption to make,
so use /bin/sh to test filtering of "prefix" commands.

https://bugzilla.gnome.org/show_bug.cgi?id=795488
This commit is contained in:
Florian Müllner 2018-04-24 15:21:06 +02:00
parent 1e2579da2c
commit 6343555605
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/tests/desktop-app-info.c
View File

@ -667,10 +667,10 @@ test_search (void)
assert_search ("image viewer", "", FALSE, TRUE, NULL, NULL);
assert_search ("image viewer", "", TRUE, TRUE, NULL, NULL);
/* There're flatpak apps installed as well - they should *not* match
* the "flatpak" command in the Exec= line though.
/* There're "flatpak" apps (clocks) installed as well - they should *not*
* match the prefix command ("/bin/sh") in the Exec= line though.
*/
assert_search ("flatpak", "", TRUE, FALSE, NULL, NULL);
assert_search ("sh", "gnome-terminal.desktop\n", TRUE, FALSE, NULL, NULL);
/* Obvious multi-word search */
assert_search ("gno hel", "yelp.desktop\n", TRUE, TRUE, NULL, NULL);

5
gio/tests/desktop-files/usr/applications/org.gnome.clocks.desktop
View File

@ -342,7 +342,10 @@ Keywords[zh_HK]=time;timer;alarm;world clock;stopwatch;time zone;時間;計時
Keywords[zh_TW]=time;timer;alarm;world clock;stopwatch;time zone;時間;倒數;計時器;鬧鐘;鬧鈴;世界時鐘;碼表;時區;
Keywords[ug]=time;timer;alarm;world clock;stopwatch;time zone;ۋاقىت;ئۆلچىگۈچ;قوڭغۇراق;دۇنيا سائىتى;ۋاقىت رايونى;
Keywords=time;timer;alarm;world clock;stopwatch;time zone;
Exec=/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=gnome-clocks org.gnome.clocks
# GDesktopAppInfo requires that the command exists, so use /bin/sh
# rather than /usr/bin/flatpak, since that's guaranteed to exist on
# all test systems (in particular CI machines).
Exec=/bin/sh run --branch=stable --arch=x86_64 --command=gnome-clocks org.gnome.clocks
Icon=org.gnome.clocks
Terminal=false
Type=Application