Merge lp:~jonas-drange/ubuntu-system-settings/mock-accountsservice into lp:ubuntu-system-settings

[Jonas G. Drange]

Mock AccountsService backend using a dbusmock template and assert in the language test that the backend changed.

Mock AccountsService backend using a dbusmock template and assert in the language test that the backend changed.

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
No
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
No
 * Has your component "TestPlan” been executed successfully on emulator, N4?
Waiting for debs…
 * Has a 5 minute exploratory testing run been executed on N4?
No
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
N/A
 * What components might get impacted by your changes?
Just the test_language autopilot test.
 * Have you requested review by the teams of these owning components?
N/A

[lp:~jonas-drange/ubuntu-system-settings/mock-accountsservice]

1510. By Jonas G. Drange on 2015-08-25

fix bad comment, change the default vendor ext to be unity's accse

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1509
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2348/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/532
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22813

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1510
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2353/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/537
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3854
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22822

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1510
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2373/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/557
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3898
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3898/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22900

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1510. By Jonas G. Drange on 2015-08-25

fix bad comment, change the default vendor ext to be unity's accse

1509. By Jonas G. Drange on 2015-08-25

allow for vendor extensions

1508. By Jonas G. Drange on 2015-08-25

also confirm that the dbus backend was majiggered

1507. By Jonas G. Drange on 2015-08-25

add mock, use mock

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-08-06 20:05:56 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-08-25 14:39:55 +0000
@@ -873,6 +873,8 @@
                            dbusmock.DBusTestCase):
     """ Base class for language settings tests"""
 
+    accountsservice_parameters = {}
+
     def mock_loginmanager(self):
         self.mock_server = self.spawn_server(LM_SERVICE, LM_PATH,
                                              LM_IFACE, system_bus=True,
@@ -885,6 +887,24 @@
 
         self.session_mock.AddMethod(LM_IFACE, 'Reboot', 'b', '', '')
 
+    def mock_accountsservice(self):
+        template = os.path.join(
+            os.path.dirname(__file__), 'accountsservice.py'
+        )
+        (self.as_mock, self.as_obj) = self.spawn_server_template(
+            template, parameters=self.accountsservice_parameters,
+            stdout=subprocess.PIPE)
+        self.phablet_mock = dbus.Interface(self.dbus_con.get_object(
+            'org.freedesktop.Accounts',
+            '/org/freedesktop/Accounts/User32011'), dbusmock.MOCK_IFACE)
+
+        self.phablet_props = dbus.Interface(
+            self.dbus_con.get_object(
+                'org.freedesktop.Accounts',
+                '/org/freedesktop/Accounts/User32011'),
+            'org.freedesktop.DBus.Properties'
+        )
+
     @classmethod
     def setUpClass(klass):
         klass.start_system_bus()
@@ -892,6 +912,7 @@
 
     def setUp(self):
         self.mock_loginmanager()
+        self.mock_accountsservice()
 
         super(LanguageBaseTestCase, self).setUp()
         self.language_page = self.main_view.go_to_language_page()
@@ -899,6 +920,8 @@
     def tearDown(self):
         self.mock_server.terminate()
         self.mock_server.wait()
+        self.as_mock.terminate()
+        self.as_mock.wait()
         super(LanguageBaseTestCase, self).tearDown()
 
 

=== added file 'tests/autopilot/ubuntu_system_settings/tests/accountsservice.py'
--- tests/autopilot/ubuntu_system_settings/tests/accountsservice.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/accountsservice.py	2015-08-25 14:39:55 +0000
@@ -0,0 +1,283 @@
+'''accountsservice D-BUS mock template'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+import dbus
+import dbusmock
+
+__author__ = 'Jonas G. Drange'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2015 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+BUS_NAME = 'org.freedesktop.Accounts'
+MAIN_IFACE = 'org.freedesktop.Accounts'
+MAIN_OBJ = '/org/freedesktop/Accounts'
+SYSTEM_BUS = True
+
+USER_IFACE = 'org.freedesktop.Accounts.User'
+USER_OBJ_TMPL = '/org/freedesktop/Accounts/User%d'
+
+NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
+    "org.ofono.Error.NotImplemented")'''
+
+_parameters = {}
+
+
+def load(mock, parameters):
+    global _parameters
+    _parameters = parameters
+
+    # Pin the returned user from FindUserById and FindUserByName to phablet.
+    # Defaults to False.
+    mock.always_return_phablet = _parameters.get(
+        'always_return_phablet', False
+    )
+
+    mock.vendor_extensions = _parameters.get('vendor_extensions', [
+        {
+            'interface': 'com.canonical.unity.AccountsService',
+            'properties': {
+                'LauncherItems': [{'defaults': True}],
+                'demo-edges': False
+            }
+        }
+    ])
+
+    mock.users = _parameters.get('users', [
+        {
+            'Uid': dbus.UInt64(32011),
+            'UserName': 'phablet',
+            'RealName': 'phablet',
+            'AccountType': 1,
+            'HomeDirectory': '/home/phablet',
+            'Shell': '/bin/bash',
+            'Email': '',
+            'Language': 'en_GB',
+            'FormatsLocale': 'en_GB.UTF-8',
+            'InputSources': dbus.Array([], signature='a{ss}'),
+            'XSession': '',
+            'Location': '',
+            'LoginFrequency': 47,
+            'LoginTime': dbus.Int64(1440492317),
+            'XHasMessages': False,
+            'XKeyboardLayouts': dbus.Array([], signature='s'),
+            'BackgroundFile':
+            '/usr/share/unity8/graphics/phone_background.jpg',
+            'IconFile': '/home/phablet/.face',
+            'Locked': False,
+            'PasswordMode': 0,
+            'PasswordHint': '',
+            'AutomaticLogin': False,
+            'SystemAccount': False,
+            'LocalAccount': False
+        }
+    ])
+
+    for user in mock.users:
+        path = USER_OBJ_TMPL % int(user['Uid'])
+        mock.AddObject(path, USER_IFACE, user, [])
+        obj = dbusmock.get_object(path)
+
+        for ext in mock.vendor_extensions:
+            obj.AddProperties(ext['interface'], ext['properties'])
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='', out_signature='ao')
+def ListCachedUsers(self):
+    return [USER_OBJ_TMPL % u['Uid'] for u in self.users]
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='x', out_signature='o')
+def FindUserById(self, uid):
+    if self.always_return_phablet:
+        return USER_OBJ_TMPL % 32011
+    else:
+        for u in self.users:
+            if u['Uid'] == uid:
+                return USER_OBJ_TMPL % uid
+        return ''
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='s', out_signature='o')
+def FindUserByName(self, name):
+    if self.always_return_phablet:
+        return USER_OBJ_TMPL % 32011
+    else:
+        for u in self.users:
+            if u['UserName'] == name:
+                return USER_OBJ_TMPL % u['Uid']
+        return ''
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='ssi', out_signature='o')
+def CreateUser(self, name, fullname, accountType):
+    pass
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='xb', out_signature='')
+def DeleteUser(self, id, removeFiles):
+    pass
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetUserName(self, name):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'UserName', name)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetRealName(self, name):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'RealName', name)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetEmail(self, email):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'Email', email)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetFormatsLocale(self, formats_locale):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'FormatsLocale', formats_locale)
+
+
[e-mail](USER_IFACE,
+                     in_signature='aa{ss}', out_signature='')
+def SetInputSources(self, sources):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'InputSources', sources)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetXSession(self, x_session):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'XSession', x_session)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetLocation(self, location):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'Location', location)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetHomeDirectory(self, homedir):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'HomeDirectory', homedir)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetShell(self, shell):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'Shell', shell)
+
+
[e-mail](USER_IFACE,
+                     in_signature='b', out_signature='')
+def SetXHasMessages(self, has_messages):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'XHasMessages', has_messages)
+
+
[e-mail](USER_IFACE,
+                     in_signature='as', out_signature='')
+def SetXKeyboardLayouts(self, layouts):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'XKeyboardLayouts', layouts)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetBackgroundFile(self, filename):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'BackgroundFile', filename)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetIconFile(self, filename):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'IconFile', filename)
+
+
[e-mail](USER_IFACE,
+                     in_signature='b', out_signature='')
+def SetLocked(self, locked):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'Locked', locked)
+
+
[e-mail](USER_IFACE,
+                     in_signature='i', out_signature='')
+def SetAccountType(self, accountType):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'AccountType', accountType)
+
+
[e-mail](USER_IFACE,
+                     in_signature='i', out_signature='')
+def SetPasswordMode(self, mode):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'PasswordMode', mode)
+
+
[e-mail](USER_IFACE,
+                     in_signature='ss', out_signature='')
+def SetPassword(self, password, hint):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'Password', password)
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'PasswordHint', hint)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def BeginSetPassword(self, data):
+    pass
+
+
[e-mail](USER_IFACE,
+                     in_signature='a(us)', out_signature='')
+def ContinueSetPassword(self, passwords):
+    pass
+
+
[e-mail](USER_IFACE,
+                     in_signature='b', out_signature='')
+def SetAutomaticLogin(self, enabled):
+    self.SetProperty(self.__dbus_object_path__,
+                     USER_IFACE, 'AutomaticLogin', enabled)
+
+
[e-mail](USER_IFACE,
+                     in_signature='s', out_signature='')
+def SetLanguage(self, language):
+    self.SetProperty(
+        self.__dbus_object_path__, USER_IFACE, 'Language', language)
+
+
[e-mail](dbusmock.MOCK_IFACE,
+                     in_signature='sssv', out_signature='')
+def SetProperty(self, path, iface, name, value):
+    obj = dbusmock.get_object(path)
+    obj.Set(iface, name, value)
+    obj.EmitSignal(iface, 'PropertiesChanged', 'a{sv}', [{name: value}])

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_language.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_language.py	2014-09-03 22:01:57 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_language.py	2015-08-25 14:39:55 +0000
@@ -8,7 +8,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Contains, Equals
+from testtools.matchers import Contains, Equals, NotEquals
 from ubuntu_system_settings.tests import LanguageBaseTestCase
 from ubuntu_system_settings.utils.i18n import ugettext as _
 
@@ -16,6 +16,10 @@
 class LanguageTestCase(LanguageBaseTestCase):
     """Tests for Language Page"""
 
+    accountsservice_parameters = {
+        'always_return_phablet': True
+    }
+
     def test_language_page_title_is_correct(self):
         """Checks whether Language page is available"""
         self.assertThat(
@@ -23,17 +27,33 @@
             Equals(_('Language & Text')))
 
     def test_change_language(self):
+        current_dbus_language = self.phablet_props.Get(
+            'org.freedesktop.Accounts.User', 'Language'
+        )
+        current_dbus_formats_loc = self.phablet_props.Get(
+            'org.freedesktop.Accounts.User', 'FormatsLocale'
+        )
         current_language = self.language_page.get_current_language()
         target_language = current_language + 1
         self.language_page.change_display_language(target_language)
 
         self.assertThat(
-            lambda:
-                self.language_page.get_current_language(),
+            lambda: self.language_page.get_current_language(),
             Eventually(Equals(target_language)))
 
-        self.addCleanup(
-            self.language_page.change_display_language, current_language)
+        self.assertThat(
+            lambda: self.phablet_props.Get(
+                'org.freedesktop.Accounts.User', 'Language'
+            ),
+            Eventually(NotEquals(current_dbus_language))
+        )
+
+        self.assertThat(
+            lambda: self.phablet_props.Get(
+                'org.freedesktop.Accounts.User', 'FormatsLocale'
+            ),
+            Eventually(NotEquals(current_dbus_formats_loc))
+        )
 
         self.assertThat(
             lambda: str(self.session_mock.GetCalls()),