Merge lp:~ted/ubuntu-app-launch/check-appid-tag into lp:ubuntu-app-launch/15.04

[Ted Gould]

Fallback to looking for the AppID tag if the source is missing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-i386-ci/2

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

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/check-appid-tag]

197. By Ted Gould on 2015-06-03

A test for the upgrade path

[Alejandro J. Cura (alecu)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-15.04-vivid-i386-ci/3

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

review: Approve (continuous-integration)

=== modified file 'desktop-hook.c'
--- desktop-hook.c	2015-04-08 20:42:55 +0000
+++ desktop-hook.c	2015-06-03 20:49:03 +0000
@@ -151,9 +151,10 @@
 		NULL); /* No error */
 
 	if (!g_key_file_has_key(keyfile, DESKTOP_GROUP, SOURCE_FILE_KEY, NULL)) {
+		gboolean hasappid = g_key_file_has_key(keyfile, DESKTOP_GROUP, APP_ID_KEY, NULL);
 		g_free(desktopfile);
 		g_key_file_free(keyfile);
-		return FALSE;
+		return hasappid;
 	}
 
 	/* At this point we know the key exists, so if we can't find the source

=== added directory 'tests/click-root-dir/.click/users/test-user-4'
=== added symlink 'tests/click-root-dir/.click/users/test-user-4/com.test.good'
=== target is u'../../../com.test.good/1.2.4/'
=== added directory 'tests/click-root-dir/.click/users/test-user-5'
=== added symlink 'tests/click-root-dir/.click/users/test-user-5/com.test.good'
=== target is u'../../../com.test.good/1.2.5/'
=== added directory 'tests/click-root-dir/com.test.good/1.2.4'
=== added directory 'tests/click-root-dir/com.test.good/1.2.4/.click'
=== added directory 'tests/click-root-dir/com.test.good/1.2.4/.click/info'
=== added file 'tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest'
--- tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest	1970-01-01 00:00:00 +0000
+++ tests/click-root-dir/com.test.good/1.2.4/.click/info/com.test.good.manifest	2015-06-03 20:49:03 +0000
@@ -0,0 +1,8 @@
+{
+	"version": "1.2.4",
+	"hooks": {
+		"application": {
+			"desktop": "application.desktop"
+		}
+	}
+}

=== added symlink 'tests/click-root-dir/com.test.good/1.2.4/application.desktop'
=== target is u'../../../click-app-dir/application.desktop'
=== added directory 'tests/click-root-dir/com.test.good/1.2.5'
=== added directory 'tests/click-root-dir/com.test.good/1.2.5/.click'
=== added directory 'tests/click-root-dir/com.test.good/1.2.5/.click/info'
=== added file 'tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest'
--- tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest	1970-01-01 00:00:00 +0000
+++ tests/click-root-dir/com.test.good/1.2.5/.click/info/com.test.good.manifest	2015-06-03 20:49:03 +0000
@@ -0,0 +1,8 @@
+{
+	"version": "1.2.5",
+	"hooks": {
+		"application": {
+			"desktop": "application.desktop"
+		}
+	}
+}

=== added symlink 'tests/click-root-dir/com.test.good/1.2.5/application.desktop'
=== target is u'../../../click-app-dir/application.desktop'
=== modified file 'tests/desktop-hook-test.sh.in'
--- tests/desktop-hook-test.sh.in	2015-04-06 21:47:57 +0000
+++ tests/desktop-hook-test.sh.in	2015-06-03 20:49:03 +0000
@@ -89,3 +89,41 @@
 
 grep "^X-Ubuntu-UAL-Source-Desktop=@CMAKE_CURRENT_SOURCE_DIR@/click-root-dir" ${APPS_DIR}/com.test.good_application_1.2.3.desktop > /dev/null 
 
+# Upgrade the good application
+
+mv ${CLICK_DIR}/com.test.good_application_1.2.3.desktop ${CLICK_DIR}/com.test.good_application_1.2.4.desktop
+export TEST_CLICK_USER=test-user-4
+
+@CMAKE_BINARY_DIR@/desktop-hook
+
+if [ -e ${APPS_DIR}/com.test.good_application_1.2.3.desktop ] ; then
+	echo "Desktop file not removed for: com.test.good_application_1.2.3"
+	exit 1
+fi
+
+if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.4.desktop ] ; then
+	echo "Desktop file not created for: com.test.good_application_1.2.4"
+	exit 1
+fi
+
+# Upgrade the good application, but don't have a Source line like in an upgrade scenario
+
+mv ${CLICK_DIR}/com.test.good_application_1.2.4.desktop ${CLICK_DIR}/com.test.good_application_1.2.5.desktop
+cat ${APPS_DIR}/com.test.good_application_1.2.4.desktop | grep -v "^X-Ubuntu-UAL-Source-Desktop" > ${APPS_DIR}/com.test.good_application_1.2.4.desktop.tmp
+rm ${APPS_DIR}/com.test.good_application_1.2.4.desktop
+mv ${APPS_DIR}/com.test.good_application_1.2.4.desktop.tmp ${APPS_DIR}/com.test.good_application_1.2.4.desktop
+
+export TEST_CLICK_USER=test-user-5
+
+
+@CMAKE_BINARY_DIR@/desktop-hook
+
+if [ -e ${APPS_DIR}/com.test.good_application_1.2.4.desktop ] ; then
+	echo "Desktop file not removed for: com.test.good_application_1.2.4"
+	exit 1
+fi
+
+if [ ! -e ${APPS_DIR}/com.test.good_application_1.2.5.desktop ] ; then
+	echo "Desktop file not created for: com.test.good_application_1.2.5"
+	exit 1
+fi