Merge lp:~elopio/reminders-app/test_with_account into lp:reminders-app

[Leo Arias]

Added helpers to create an evernote account in autopilot tests.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:122
http://91.189.93.70:8080/job/reminders-app-ci/298/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2477
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/298
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/298

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/298/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Looks good!

review: Approve

[Nicholas Skaggs (nskaggs)]

Successfully run on flo device!

[Nicholas Skaggs (nskaggs)]

My desktop seems to fail in a similar way as to jenkins?

http://paste.ubuntu.com/7410848/

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:122
http://91.189.93.70:8080/job/reminders-app-ci/301/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2485
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/301
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/301

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/301/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

It helps if you install the plugin. Works great locally here now.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:122
http://91.189.93.70:8080/job/reminders-app-ci/302/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2488
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/302
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/302

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/302/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:122
http://91.189.93.70:8080/job/reminders-app-ci/303/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2489
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2489/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/303
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/303

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/303/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Running with the generated debs above on my local box works properly..

[Víctor R. Ruiz (vrruiz)]

Add docstrings, please :)

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

We should also setup the environment properly. I'll try and propose a branch if I finish up some things before you get to it :-)

https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1316746

review: Needs Fixing

[lp:~elopio/reminders-app/test_with_account]

123. By Leo Arias on 2014-05-08

Refactor and add docstrings.

[Leo Arias (elopio)]

> Add docstrings, please :)

I have added some more.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:122
http://91.189.93.70:8080/job/reminders-app-ci/316/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2529
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2529/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/65
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/317
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/11

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/316/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:123
http://91.189.93.70:8080/job/reminders-app-ci/317/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2531
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2531/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/67
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/67/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/318
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/12

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/317/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/reminders-app/test_with_account]

124. By Leo Arias on 2014-05-08

Merged with trunk. Moved the home patch before creating the account.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:124
http://91.189.93.70:8080/job/reminders-app-ci/322/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2551
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2551/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/87
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/323
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/17

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/322/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Just confirming I'm happy with the merge, as soon as Jenkins is ;-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:124
http://91.189.93.70:8080/job/reminders-app-ci/326/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2565
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2565/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/101
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/101/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/327
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/21

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/326/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:124
http://91.189.93.70:8080/job/reminders-app-ci/332/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2583
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2583/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/122/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/333
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/27

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/332/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:124
http://91.189.93.70:8080/job/reminders-app-ci/341/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2604
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2604/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/143
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/342
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/36

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/341/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== added file 'tests/autopilot/reminders/credentials.py'
--- tests/autopilot/reminders/credentials.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/reminders/credentials.py	2014-05-08 23:52:52 +0000
@@ -0,0 +1,145 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+import threading
+
+from gi.repository import Accounts, GLib, Signon
+
+
+class CredentialsException(Exception):
+    """Exception for credentials problems."""
+
+
+class AccountManager(object):
+    """Manager for online accounts."""
+
+    def __init__(self):
+        self._manager = Accounts.Manager()
+
+    def _start_main_loop(self):
+        self.error = None
+        self._main_loop = GLib.MainLoop()
+        self._main_loop_thread = threading.Thread(
+            target=self._main_loop.run)
+        self._main_loop_thread.start()
+
+    def _join_main_loop(self):
+        self._main_loop_thread.join()
+        if self.error is not None:
+            raise CredentialsException(self.error.message)
+
+    def add_evernote_account(self, user_name, password, oauth_token):
+        """Add an evernote account.
+
+        :param user_name: The user name of the account.
+        :param password: The password of the account.
+        :param oauth_token: The oauth token of the account.
+
+        """
+        self._start_main_loop()
+
+        account = self._create_account()
+
+        info = self._get_identity_info(user_name, password)
+
+        identity = Signon.Identity.new()
+        identity.store_credentials_with_info(
+            info, self._set_credentials_id_to_account,
+            {'account': account, 'oauth_token': oauth_token})
+
+        self._join_main_loop()
+
+        self._enable_evernote_service(account)
+
+        return account
+
+    def _create_account(self):
+        account = self._manager.create_account('evernote')
+        account.set_enabled(True)
+        account.store(self._on_account_created, None)
+        return account
+
+    def _on_account_created(self, account, error, _):
+        if error:
+            self.error = error
+            self._main_loop.quit()
+
+    def _get_identity_info(self, user_name, password):
+        info = Signon.IdentityInfo.new()
+        info.set_username(user_name)
+        info.set_caption(user_name)
+        info.set_secret(password, True)
+        return info
+
+    def _set_credentials_id_to_account(
+            self, identity, id_, error, account_dict):
+        if error:
+            self.error = error
+            self._main_loop.quit()
+
+        account = account_dict.get('account')
+        oauth_token = account_dict.get('oauth_token')
+        account.set_variant('CredentialsId', GLib.Variant('u', id_))
+        account.store(self._process_session, oauth_token)
+
+    def _process_session(self, account, error, oauth_token):
+        if error:
+            self.error = error
+            self._main_loop.quit()
+
+        account_service = Accounts.AccountService.new(account, None)
+        auth_data = account_service.get_auth_data()
+        identity = auth_data.get_credentials_id()
+        method = auth_data.get_method()
+        mechanism = auth_data.get_mechanism()
+        session_data = auth_data.get_parameters()
+        session_data['ProvidedTokens'] = GLib.Variant('a{sv}', {
+            'TokenSecret': GLib.Variant('s', 'dummy'),
+            'AccessToken': GLib.Variant('s', oauth_token),
+        })
+        session = Signon.AuthSession.new(identity, method)
+        session.process(
+            session_data, mechanism, self._on_login_processed, None)
+
+    def _on_login_processed(self, session, reply, error, userdata):
+        if error:
+            self.error = error
+
+        self._main_loop.quit()
+
+    def _enable_evernote_service(self, account):
+        service = self._manager.get_service('evernote')
+        account.select_service(service)
+        account.set_enabled(True)
+        account.store(self._on_account_created, None)
+
+    def delete_account(self, account):
+        """Delete an account.
+
+        :param account: The account to delete.
+
+        """
+        self._start_main_loop()
+        account.delete()
+        account.store(self._on_account_deleted, None)
+        self._join_main_loop()
+
+    def _on_account_deleted(self, account, error, userdata):
+        if error:
+            self.error = error
+
+        self._main_loop.quit()

=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py	2014-05-08 21:09:52 +0000
+++ tests/autopilot/reminders/tests/__init__.py	2014-05-08 23:52:52 +0000
@@ -50,6 +50,8 @@
     installed_location_binary = '/usr/bin/reminders'
     installed_location_qml = '/usr/share/reminders/qml/reminders.qml'
 
+    home_dir = None
+
     def get_launcher_and_type(self):
         if os.path.exists(self.local_location_binary):
             launcher = self.launch_test_local
@@ -63,8 +65,9 @@
         return launcher, test_type
 
     def setUp(self):
-        launcher, self.test_type = self.get_launcher_and_type()
-        self.home_dir = self._patch_home()
+        launcher, test_type = self.get_launcher_and_type()
+        if self.home_dir is None:
+            self.home_dir = self._patch_home(test_type)
         self.pointing_device = Pointer(self.input_device_class.create())
         super(RemindersAppTestCase, self).setUp()
 
@@ -80,7 +83,7 @@
                 os.path.expanduser(os.path.join('~', '.Xauthority')),
                 os.path.join(directory, '.Xauthority'))
 
-    def _patch_home(self):
+    def _patch_home(self, test_type):
         """ mock /home for testing purposes to preserve user data
         """
         temp_dir_fixture = fixtures.TempDir()
@@ -95,7 +98,7 @@
 
         #click requires using initctl env (upstart), but the desktop can set
         #an environment variable instead
-        if self.test_type == 'click':
+        if test_type == 'click':
             self.useFixture(toolkit_fixtures.InitctlEnvironmentVariable(
                             HOME=temp_dir))
         else:

=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
--- tests/autopilot/reminders/tests/test_reminders.py	2014-04-24 19:33:26 +0000
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-05-08 23:52:52 +0000
@@ -23,9 +23,10 @@
 from autopilot import platform
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals
+from testtools import ExpectedException
 
 import reminders
-from reminders import fixture_setup, tests
+from reminders import credentials, fixture_setup, tests
 
 
 logger = logging.getLogger(__name__)
@@ -40,7 +41,7 @@
     def test_go_to_account_settings(self):
         """Test that the Go to account settings button calls url-dispatcher."""
         if platform.model() == 'Desktop':
-             self.skipTest("URL dispatcher doesn't work on the desktop.")
+            self.skipTest("URL dispatcher doesn't work on the desktop.")
         url_dispatcher = fixture_setup.FakeURLDispatcher()
         self.useFixture(url_dispatcher)
 
@@ -56,3 +57,28 @@
         self.assertThat(
             get_last_dispatch_url_call_parameter,
             Eventually(Equals('settings:///system/online-accounts')))
+
+
+class RemindersTestCaseWithAccount(tests.RemindersAppTestCase):
+
+    def setUp(self):
+        # We need to change the home dir before adding the account, otherwise
+        # the account will not be found when the app is opened.
+        _, test_type = self.get_launcher_and_type()
+        self.home_dir = self._patch_home(test_type)
+        self.add_evernote_account()
+        super(RemindersTestCaseWithAccount, self).setUp()
+
+    def add_evernote_account(self):
+        account_manager = credentials.AccountManager()
+        oauth_token = (
+            'S=s1:U=8e6bf:E=14d08e375ff:C=145b1324a03:P=1cd:A=en-devtoken:'
+            'V=2:H=79b946c32b4515ee52b387f7b68baa69')
+        account = account_manager.add_evernote_account(
+            'dummy', 'dummy', oauth_token)
+        self.addCleanup(account_manager.delete_account, account)
+
+    def test_open_application_with_account(self):
+        """Test that the No account dialog is not visible."""
+        with ExpectedException(reminders.RemindersAppException):
+            self.app.main_view.no_account_dialog