Merge lp:~alextu/savilerow/6-pinned-apps into lp:savilerow

[Alex Tu]

1. add the key com/canonical/unity/clickscope/core-apps as an example to set 6 pinned apps on Apps scop.
2. add a test script for check if the setting of 6 pinned apps in Apps scope is correct.
  Currently it tests
  1. If the key and value has been set in custom.key, and it must been set.
  2. If the value have 6 items, it must have 6 items.

[Chris Wayne (cwayne)]

Why is there a whole new test script added? It looks very similar to the current test_dconf test, which should in fact pick up this change anyway without needing to add any tests

review: Needs Fixing

[lp:~alextu/savilerow/6-pinned-apps]

15. By Alex Tu on 2014-07-29

merged the operation for pinned apps setting to test_dconf.py.

[Alex Tu (alextu)]

> Why is there a whole new test script added? It looks very similar to the
> current test_dconf test, which should in fact pick up this change anyway
> without needing to add any tests

I have merged the operations for pinned apps setting to test_dconf.py.
And verified on Nexus 4.
It will assert in two case:
  1. If the key(com.canonical.unity.clickscope.core-apps) and value has been set in custom.key,it must been set.
  2. If the value have 6 items(split by ','),it must have 6 items.

review: Needs Resubmitting

[lp:~alextu/savilerow/6-pinned-apps]

16. By Alex Tu on 2014-07-29

removed comment code.

[Alex Tu (alextu)]

review: Approve

[Chris Wayne (cwayne)]

One thing we may want to investigate is whether or not we can use the short app-id instead of the full one, so that it won't blow up when a different version of the app is shipped.

[Chris Wayne (cwayne)]

So I just pinged pstolowski (who implemented this) and he said:

(04:36:30 PM) pstolowski: cwayne, no version numbers

So we should just have 'com.ubuntu.gallery_gallery', 'com.ubuntu.music_music' and so on. This is also much more future-proof (sorry, I know I was the one that first told you to include the version numbers, but I was wrong :) )

review: Needs Fixing

[Alex Tu (alextu)]

It's ok, I'll modify it soon. :)

[lp:~alextu/savilerow/6-pinned-apps]

17. By Alex Tu on 2014-08-06

remove the version for pinned apps, it doesn't need version information.

[Alex Tu (alextu)]

Already removed the version string and verified on image version 157 of devel-proposed channel on Nexus 4, and it passed.

Thanks.

[Chris Wayne (cwayne)]

LGTM, thanks for retesting

review: Approve

=== modified file 'src/system/custom/etc/dconf_source/db/custom.d/custom.key'
--- src/system/custom/etc/dconf_source/db/custom.d/custom.key	2014-05-07 22:36:50 +0000
+++ src/system/custom/etc/dconf_source/db/custom.d/custom.key	2014-08-06 10:14:38 +0000
@@ -12,3 +12,8 @@
 [com/canonical/UserMetrics]
 theme='custom'
 
+# This used for set the 6 pinned apps in Apps scop.
+# The installed apps could refer to /home/phablet/.cache/ubuntu-app-launch/desktop on device.
+[com/canonical/unity/clickscope]
+core-apps=['com.ubuntu.gallery_gallery', 'com.ubuntu.music_music', 'com.ubuntu.calculator_calculator', 'com.ubuntu.clock_clock', 'com.ubuntu.weather_weather', 'com.ubuntu.camera_camera']
+

=== modified file 'tests/api/test_dconf.py'
--- tests/api/test_dconf.py	2014-04-15 16:30:38 +0000
+++ tests/api/test_dconf.py	2014-08-06 10:14:38 +0000
@@ -6,6 +6,9 @@
 #: Path to pre-seeded custom dconf database
 custom_dconf_key = '/custom/etc/dconf/db/custom.d/custom.key'
 
+# For 6-pinned apps: key we would like to verify and The apps number we should set. 
+pinned_apps_key = '/com/canonical/unity/clickscope/core-apps'
+expect_pinned_apps_num = 6
 
 class DconfVerificationTests(AutopilotTestCase):
 
@@ -41,3 +44,13 @@
             # `dconf read`
             dval = subprocess.check_output(['dconf', 'read', key]).decode().strip()
             self.assertEqual(dval, value)
+
+        # For 6-pinned apps: check if the apps has been set in custom.key. 
+        pinned_apps = dconf_keys.get(pinned_apps_key,0)
+        if (pinned_apps == 0) or (pinned_apps == ''):
+            print("core-apps value not preset in %s" %(custom_dconf_key))
+            self.assertTrue(0);        
+        # check if there have 6 item in value.
+        word_list=pinned_apps.split(',');
+        self.assertTrue(len(word_list) == expect_pinned_apps_num, "incorrect number of pinned apps been set!");
+