Merge lp:~mzanetti/ubuntu-system-settings/update-reset-launcher into lp:ubuntu-system-settings

[Michael Zanetti]

update code to reset launcher after launcher backend implementation was reworked

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1031
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1514/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5052/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3689/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3998/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1514/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1031
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1551/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3761/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4072/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1551/rebuild

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Is this binding necessary? A QML gsettings binding already exists, with he capability to reset a key IIRC.

review: Needs Information

[Michael Zanetti (mzanetti)]

I guess it could also be implemented in qml only... I just updated the existing code to make it work again. Not sure if the rest of the settings application prefers sticking to qml as much as possible. IMO its really a matter of taste/guidelines/consistency.

[Iain Lane (laney)]

On Fri, Sep 26, 2014 at 11:14:08AM -0000, Michael Zanetti wrote:
> I guess it could also be implemented in qml only... I just updated the existing code to make it work again. Not sure if the rest of the settings application prefers sticking to qml as much as possible. IMO its really a matter of taste/guidelines/consistency.

We tend to use QML APIs where they exist, so I think that (assuming
Jonas is right, I didn't double-check gsettings-qt, but I think he is)
this should be in QML.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Michael Zanetti (mzanetti)]

> We tend to use QML APIs where they exist, so I think that (assuming
> Jonas is right, I didn't double-check gsettings-qt, but I think he is)
> this should be in QML.

ok. updated

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1032
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1580/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3843/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/772/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4156/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1580/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1095
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1581/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5319
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/773
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6571
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13924
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4158
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4158/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1581/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Please take this over... The code should be fine, but I'm not able to update autopilot to something meaningful...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1096
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1587/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5372
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/779
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5086
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14000
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3251
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4184/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1587/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1098
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1590/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/782
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6636
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6636/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14015
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4189
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4189/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1590/rebuild

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'plugins/reset/ResetLauncherHome.qml'
--- plugins/reset/ResetLauncherHome.qml	2014-08-07 10:21:37 +0000
+++ plugins/reset/ResetLauncherHome.qml	2014-10-01 15:08:44 +0000
@@ -46,7 +46,7 @@
             onClicked: {
                 dialog.state = "clicked";
                 unitySettings.schema.reset("favorites");
-                resetBackend.resetLauncher();
+                unitySettings.schema.reset("items");
                 root.done();
             }
         }

=== modified file 'plugins/reset/reset.cpp'
--- plugins/reset/reset.cpp	2014-09-23 18:57:58 +0000
+++ plugins/reset/reset.cpp	2014-10-01 15:08:44 +0000
@@ -19,40 +19,14 @@
 */
 
 #include "reset.h"
-#include <QEvent>
+
+#include <QDBusInterface>
 #include <QDBusReply>
 #include <QDebug>
-#include <unistd.h>
-#include <QDBusMetaType>
-
-typedef QList<QVariantMap> resetLauncherItemsArg;
-Q_DECLARE_METATYPE(resetLauncherItemsArg)
 
 Reset::Reset(QObject *parent)
     : QObject(parent)
 {
-    static bool isRegistered = false;
-    if(!isRegistered) {
-        qDBusRegisterMetaType<resetLauncherItemsArg>();
-        isRegistered = true;
-    }
-}
-
-bool Reset::resetLauncher()
-{
-    QList<QVariantMap> items;
-    QVariantMap defaults;
-    defaults.insert("defaults", true);
-    items << defaults;
-    QVariant answer = m_accountsService.setUserProperty(
-                "com.canonical.unity.AccountsService",
-                "launcher-items",
-                QVariant::fromValue(items));
-
-    if (answer.isValid())
-        return true;
-
-    return false;
 }
 
 bool Reset::factoryReset()

=== modified file 'plugins/reset/reset.h'
--- plugins/reset/reset.h	2014-09-23 18:47:03 +0000
+++ plugins/reset/reset.h	2014-10-01 15:08:44 +0000
@@ -21,13 +21,7 @@
 #ifndef RESET_H
 #define RESET_H
 
-#include "accountsservice.h"
-
-#include <QDBusInterface>
-#include <QDBusServiceWatcher>
 #include <QObject>
-#include <QProcess>
-#include <QUrl>
 
 class Reset : public QObject
 {
@@ -36,11 +30,7 @@
 public:
     explicit Reset(QObject *parent = 0);
     ~Reset();
-    Q_INVOKABLE bool resetLauncher(void);
     Q_INVOKABLE bool factoryReset(void);
-
-private:
-    AccountsService m_accountsService;
 };
 
 #endif // RESET_H

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-09-18 14:33:27 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-10-01 15:08:44 +0000
@@ -623,32 +623,6 @@
                         dbusmock.DBusTestCase):
     """ Base class for reset settings tests"""
 
-    def mock_for_launcher_reset(self):
-        user_obj = '/user/foo'
-        # start dbus system bus
-        self.mock_server = self.spawn_server(ACCOUNTS_IFACE, ACCOUNTS_OBJ,
-                                             ACCOUNTS_IFACE, system_bus=True,
-                                             stdout=subprocess.PIPE)
-
-        # spawn_server does not wait properly
-        # Reported as bug here: http://pad.lv/1350833
-        sleep(2)
-        self.acc_proxy = dbus.Interface(self.dbus_con.get_object(
-            ACCOUNTS_IFACE, ACCOUNTS_OBJ), dbusmock.MOCK_IFACE)
-
-        self.acc_proxy.AddMethod(ACCOUNTS_IFACE, 'FindUserById', 'x', 'o',
-                                 'ret = "%s"' % user_obj)
-
-        self.acc_proxy.AddObject(
-            user_obj, ACCOUNTS_USER_IFACE, {}, [])
-
-        self.user_mock = dbus.Interface(self.dbus_con.get_object(
-            ACCOUNTS_IFACE, user_obj),
-            dbusmock.MOCK_IFACE)
-
-        self.user_mock.AddMethod(
-            'org.freedesktop.DBus.Properties', 'Set', 'ssaa{sv}', '', '')
-
     def mock_for_factory_reset(self):
         self.mock_server = self.spawn_server(SYSTEM_IFACE, SYSTEM_SERVICE_OBJ,
                                              SYSTEM_IFACE, system_bus=True,
@@ -667,9 +641,7 @@
         klass.dbus_con = klass.get_dbus(True)
 
     def setUp(self):
-        self.mock_for_launcher_reset()
         self.mock_for_factory_reset()
-
         super(ResetBaseTestCase, self).setUp()
         self.reset_page = self.system_settings.main_view.go_to_reset_phone()
 

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_reset.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-07-31 23:12:24 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_reset.py	2014-10-01 15:08:44 +0000
@@ -10,7 +10,7 @@
 from time import sleep
 
 from autopilot.matchers import Eventually
-from gi.repository import Gio
+from gi.repository import Gio, GLib
 from testtools.matchers import Contains, Equals
 
 from ubuntu_system_settings.tests import ResetBaseTestCase
@@ -20,8 +20,8 @@
 class ResetTestCase(ResetBaseTestCase):
     """Tests for Reset Page"""
 
-    def set_unity_launcher_favorites(self, gsettings, favorites):
-        gsettings.set_value('favorites', favorites)
+    def set_unity_launcher(self, gsettings, key, value):
+        gsettings.set_value(key, value)
         # wait for gsettings
         sleep(1)
 
@@ -33,15 +33,28 @@
 
     def test_reset_launcher(self):
         gsettings = Gio.Settings.new('com.canonical.Unity.Launcher')
+
         favorites = gsettings.get_value('favorites')
-        self.addCleanup(
-            self.set_unity_launcher_favorites, gsettings, favorites)
+        gsettings.set_value(
+            'favorites',
+            GLib.Variant('as', ['application://nautilus.desktop']))
+        self.addCleanup(
+            self.set_unity_launcher, gsettings, 'favorites', favorites)
+
+        items = gsettings.get_value('items')
+        gsettings.set_value(
+            'items', GLib.Variant('as', ['application:///dialer-app.desktop']))
+        self.addCleanup(
+            self.set_unity_launcher, gsettings, 'items', items)
 
         self.reset_page.reset_launcher()
+        self.assertThat(
+            lambda: gsettings.get_value('favorites'),
+            Eventually(Equals(gsettings.get_default_value('favorites'))))
 
         self.assertThat(
-            lambda: str(self.user_mock.GetCalls()),
-            Eventually(Contains('com.canonical.unity.AccountsService')))
+            lambda: gsettings.get_value('items'),
+            Eventually(Equals(gsettings.get_default_value('items'))))
 
     def test_factory_reset(self):
         self.reset_page.erase_and_reset_everything()