Merge lp:~ted/ubuntu-app-launch/reenable-only-show-in into lp:ubuntu-app-launch/16.10

[Ted Gould]

Reenable OnlyShowIn checking for Desktop files

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/51/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/54/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:231
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/3/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/111/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/118/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/3/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:231
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/113/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/120
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/72
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/72
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/72
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/55/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/55/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/55/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/55/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/55
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/55/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/55
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/55/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/55/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/55/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/55/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:232
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/22/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/283/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/289
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/223
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/223
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/223
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/152/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/152
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/152/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/152
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/152/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/152/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/152/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/152/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/152/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/152
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/152/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/152
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/152/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[Larry Price (larryprice)]

hooray! looks good to me

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:233
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/103/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/674/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/680/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/103/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

You need to split the XDG_CURRENT_DESKTOP value on ":" and look at each part separately, I'm afraid.

See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html "OnlyShowIn".

review: Needs Fixing

[lp:~ted/ubuntu-app-launch/reenable-only-show-in]

234. By Ted Gould on 2017-01-12

Merge trunk

235. By Ted Gould on 2017-01-12

Update to new Desktop object

236. By Ted Gould on 2017-01-12

Try to split out CURRENT_DESKTOP

237. By Ted Gould on 2017-01-12

First pass doing set comparisons of the lists

238. By Ted Gould on 2017-01-12

Switch to find_first_of

239. By Ted Gould on 2017-01-12

Typo on name

240. By Ted Gould on 2017-01-12

Fix variable name

241. By Ted Gould on 2017-01-13

Add some more tests for sets

Unmerged revisions

241. By Ted Gould on 2017-01-13

Add some more tests for sets

240. By Ted Gould on 2017-01-12

Fix variable name

239. By Ted Gould on 2017-01-12

Typo on name

238. By Ted Gould on 2017-01-12

Switch to find_first_of

237. By Ted Gould on 2017-01-12

First pass doing set comparisons of the lists

236. By Ted Gould on 2017-01-12

Try to split out CURRENT_DESKTOP

235. By Ted Gould on 2017-01-12

Update to new Desktop object

234. By Ted Gould on 2017-01-12

Merge trunk

233. By Ted Gould on 2016-09-14

Updating to trunk

232. By Ted Gould on 2016-08-04

Updating to trunk

=== modified file 'libubuntu-app-launch/application-info-desktop.cpp'
--- libubuntu-app-launch/application-info-desktop.cpp	2016-08-17 15:24:30 +0000
+++ libubuntu-app-launch/application-info-desktop.cpp	2016-09-14 19:39:05 +0000
@@ -213,8 +213,7 @@
                 !stringlistFromKeyfileContains(keyfile, "OnlyShowIn", xdg_current_desktop, true))
             {
                 g_warning("Application is not shown in Unity");
-                // Exception removed for OTA11 as a temporary fix
-                // throw std::runtime_error("Application is not shown in Unity");
+                throw std::runtime_error("Application is not shown in Unity");
             }
         }
 

=== modified file 'tests/application-info-desktop.cpp'
--- tests/application-info-desktop.cpp	2016-08-09 19:57:47 +0000
+++ tests/application-info-desktop.cpp	2016-09-14 19:39:05 +0000
@@ -113,8 +113,6 @@
     g_key_file_set_string(hidden.get(), DESKTOP, "Hidden", "true");
     EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(hidden, "/"), std::runtime_error);
 
-	/* Disabling for OTA11 */
-#if 0
     // not shown in Unity
     auto notshowin = defaultKeyfile();
     g_key_file_set_string(notshowin.get(), DESKTOP, "NotShowIn", ("Gnome;" + test_dekstop_env + ";").c_str());
@@ -124,7 +122,6 @@
     auto onlyshowin = defaultKeyfile();
     g_key_file_set_string(onlyshowin.get(), DESKTOP, "OnlyShowIn", "KDE;Gnome;");
     EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(onlyshowin, "/"), std::runtime_error);
-#endif
 }
 
 TEST_F(ApplicationInfoDesktop, KeyfileDefaultDepartment)