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

[Leo Arias]

Added logging messages and tests to the credentials autopilot tests helpers.

Added logging messages and tests to the credentials autopilot tests helpers.

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

PASSED: Continuous integration, rev:165
http://91.189.93.70:8080/job/reminders-app-ci/390/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/604
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/604/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/85

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:165
http://91.189.93.70:8080/job/reminders-app-ci/392/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/606
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/87

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This still fails on the desktop for me.. no account created :-(

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

FAILED: Continuous integration, rev:168
http://91.189.93.70:8080/job/reminders-app-ci/395/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/613
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/90

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/reminders-app-ci/396/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/614
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/614/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/91

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/reminders-app-ci/397/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/615
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/92

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:169
http://91.189.93.70:8080/job/reminders-app-ci/398/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/616
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/93

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/reminders-app-autolanding/163/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/628/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-autolanding/55

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:171
http://91.189.93.70:8080/job/reminders-app-ci/403/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/632/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/98/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:172
http://91.189.93.70:8080/job/reminders-app-ci/404/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/634
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/634/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/99

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:175
http://91.189.93.70:8080/job/reminders-app-ci/407/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/639
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/639/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/102

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:179
http://91.189.93.70:8080/job/reminders-app-ci/409/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/642
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/104

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

These greatly improves things, though still has some interesting behaviours that can be observed running the tests.

review: Approve

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

PASSED: Continuous integration, rev:185
http://91.189.93.70:8080/job/reminders-app-ci/411/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/645
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/645/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/106

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

review: Approve (continuous-integration)

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

188. By Leo Arias on 2014-06-25

Reverted manifest.json change.

189. By Leo Arias on 2014-06-25

Fixed comments.

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

PASSED: Continuous integration, rev:186
http://91.189.93.70:8080/job/reminders-app-ci/412/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/650
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/107

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:189
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/reminders-app/fix_with_account/+merge/224539/+edit-commit-message

http://91.189.93.70:8080/job/reminders-app-ci/414/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/652
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/109

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Looks good to me and it passes tests, but I'd like to have some more context from either Leo or Nick before top-approving.

review: Approve

[Nicholas Skaggs (nskaggs)]

dpm, at the moment everything passes, but the credentials tests behave oddly. It seems the isolation isn't working well. In addition, on the phone we are unable to isolate properly. If we do so the app fails to launch currently.

[David Planella (dpm)]

I've tested this on the emulator, having installed both plugin packages built from this branch [1].

First I tested it with running the app, and then simply starting Ubuntu System Settings and trying to add a regular Evernote account. So if I go to System Settings and choose the Evernote account, it then shows me the login page. After entering my credentials, it seems to work (Evernote asks me if I want to re-authorize the app to access this account). However, after hitting the button to re-authorize, it then hangs forever like this: http://i.imgur.com/TZi6P4u.png

This is the full debug output [2] of Online Accounts, but the most interesting part are the last few lines:

qml: Account created!
EvernoteConnection not set up completely. You need to set a hostname and a token. Cannot execute job. ( FetchUsernameJob )
Error fetching username: "Token or hostname not set."

The "Account created!" debug message I simply added it to the plugin's Main.qml file, so it's not in this branch. In any case, it seems that fetching the user name does not work for some reason, and that's presumably causing UOA to hang.

[1] https://launchpad.net/~dpm/+archive/ppa/+packages?field.name_filter=&field.status_filter=&field.series_filter=utopic
[2] http://pastebin.ubuntu.com/7706895/

[David Planella (dpm)]

Ah well... please ignore the comment, I pasted it into the wrong browser tab and thus into the wrong MP... at least it was for the right app!

Sorry for the noise.

[Nicholas Skaggs (nskaggs)]

Landing this to keep things moving forward. The credentials weirdness will live on for now.

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/reminders/credentials.py'
--- tests/autopilot/reminders/credentials.py	2014-06-25 23:31:11 +0000
+++ tests/autopilot/reminders/credentials.py	2014-06-25 23:31:11 +0000
@@ -14,12 +14,16 @@
 # 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 logging
+import time
 import threading
 
 from gi.repository import Accounts, GLib, Signon
 
 
+logger = logging.getLogger(__name__)
+
+
 class CredentialsException(Exception):
 
     """Exception for credentials problems."""
@@ -52,6 +56,7 @@
         :param oauth_token: The oauth token of the account.
 
         """
+        logger.debug('Add an evernote account.')
         self._start_main_loop()
 
         account = self._create_account()
@@ -65,11 +70,17 @@
 
         self._join_main_loop()
 
+        # XXX Sometimes, the account fails to be enabled. This sleep seems to
+        # fix it but we haven't yet found the reason. --elopio - 2014-06-25
+        time.sleep(10)
         self._enable_evernote_service(account)
 
+        logger.info('Created the account with id: {}.'.format(account.id))
+        self._log_accounts_info()
         return account
 
     def _create_account(self):
+        logger.debug('Creating the Evernote account.')
         account = self._manager.create_account('evernote')
         account.set_enabled(True)
         account.store(self._on_account_created, None)
@@ -77,8 +88,12 @@
 
     def _on_account_created(self, account, error, _):
         if error:
-            self.error = error
-            self._main_loop.quit()
+            self._quit_main_loop_on_error(error, 'storing account')
+
+    def _quit_main_loop_on_error(self, error, step):
+        logger.error('Error {}.'.format(step))
+        self.error = error
+        self._main_loop.quit()
 
     def _get_identity_info(self, user_name, password):
         info = Signon.IdentityInfo.new()
@@ -90,9 +105,10 @@
     def _set_credentials_id_to_account(
             self, identity, id_, error, account_dict):
         if error:
-            self.error = error
-            self._main_loop.quit()
+            self._quit_main_loop_on_error(
+                error, 'storing credentials with info')
 
+        logger.debug('Setting credentials to account.')
         account = account_dict.get('account')
         oauth_token = account_dict.get('oauth_token')
         account.set_variant('CredentialsId', GLib.Variant('u', id_))
@@ -100,9 +116,10 @@
 
     def _process_session(self, account, error, oauth_token):
         if error:
-            self.error = error
-            self._main_loop.quit()
+            self._quit_main_loop_on_error(
+                error, 'setting credentials id to account')
 
+        logger.debug('Processing session.')
         account_service = Accounts.AccountService.new(account, None)
         auth_data = account_service.get_auth_data()
         identity = auth_data.get_credentials_id()
@@ -119,15 +136,39 @@
 
     def _on_login_processed(self, session, reply, error, userdata):
         if error:
-            self.error = error
+            self._quit_main_loop_on_error(error, 'processing session')
 
-        self._main_loop.quit()
+        else:
+            self._main_loop.quit()
 
     def _enable_evernote_service(self, account):
+        logger.debug('Enabling evernote service.')
         service = self._manager.get_service('evernote')
         account.select_service(service)
         account.set_enabled(True)
-        account.store(self._on_account_created, None)
+        account.store(self._on_service_enabled, None)
+
+    def _on_service_enabled(self, account, error, _):
+        if error:
+            self._quit_main_loop_on_error(error, 'enabling service')
+
+    def _log_accounts_info(self):
+        account_ids = self._manager.list()
+        logger.debug('Existing accounts: {}.'.format(account_ids))
+        for id_ in account_ids:
+            account = self._manager.get_account(id_)
+            self._log_account_info(account)
+
+    def _log_account_info(self, account):
+        logger.debug('Account info:')
+        logger.debug('id: {}'.format(account.id))
+        logger.debug('provider: {}'.format(account.get_provider_name()))
+        logger.debug('enabled: {}'.format(account.get_enabled()))
+        logger.debug('Account services:')
+        for service in account.list_services():
+            logger.debug('name: {}'.format(service.get_name()))
+            account_service = Accounts.AccountService.new(account, service)
+            logger.debug('enabled: {}'.format(account_service.get_enabled()))
 
     def delete_account(self, account):
         """Delete an account.
@@ -135,13 +176,14 @@
         :param account: The account to delete.
 
         """
+        logger.info('Deleting the account with id {}.'.format(account.id))
         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):
+    def _on_account_deleted(self, account, error, _):
         if error:
-            self.error = error
-
-        self._main_loop.quit()
+            self._quit_main_loop_on_error(error, 'deleting account')
+        else:
+            self._main_loop.quit()

=== modified file 'tests/autopilot/reminders/tests/__init__.py'
--- tests/autopilot/reminders/tests/__init__.py	2014-06-25 23:31:11 +0000
+++ tests/autopilot/reminders/tests/__init__.py	2014-06-25 23:31:11 +0000
@@ -16,14 +16,13 @@
 
 """Reminders app autopilot tests."""
 
+import logging
 import os
 import shutil
-import logging
+import subprocess
 
 import fixtures
 from autopilot import logging as autopilot_logging
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 from ubuntuuitoolkit import (
     emulators as toolkit_emulators,
@@ -35,15 +34,13 @@
 logger = logging.getLogger(__name__)
 
 
-class RemindersAppTestCase(AutopilotTestCase):
-
-    """A common test case class that provides several useful methods for
-       reminders-app tests."""
-
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
+class BaseTestCaseWithTempHome(AutopilotTestCase):
+
+    """Base test case that patches the home directory.
+
+    That way we start the tests with a clean environment.
+
+    """
 
     local_location = os.path.dirname(os.path.dirname(os.getcwd()))
 
@@ -53,7 +50,20 @@
     installed_location_binary = '/usr/bin/reminders'
     installed_location_qml = '/usr/share/reminders/qml/reminders.qml'
 
-    def get_launcher_and_type(self):
+    def setUp(self):
+        self.kill_signond()
+        self.addCleanup(self.kill_signond)
+        super(BaseTestCaseWithTempHome, self).setUp()
+        _, test_type = self.get_launcher_method_and_type()
+        self.home_dir = self._patch_home(test_type)
+
+    def kill_signond(self):
+        # We kill signond so it's restarted using the temporary HOME. Otherwise
+        # it will remain running until it has 5 seconds of inactivity, keeping
+        # reference to other directories.
+        subprocess.call(['pkill', '-9', 'signond'])
+
+    def get_launcher_method_and_type(self):
         if os.path.exists(self.local_location_binary):
             launcher = self.launch_test_local
             test_type = 'local'
@@ -65,27 +75,34 @@
             test_type = 'click'
         return launcher, test_type
 
-    def setUp(self):
-        launcher, test_type = self.get_launcher_and_type()
-        self.home_dir = self._patch_home(test_type)
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(RemindersAppTestCase, self).setUp()
-
-        self.app = reminders.RemindersApp(launcher())
-
-    def _copy_xauthority_file(self, directory):
-        """ Copy .Xauthority file to directory, if it exists in /home
-        """
-        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
-        if os.path.isfile(xauth):
-            logger.debug("Copying .Xauthority to " + directory)
-            shutil.copyfile(
-                os.path.expanduser(os.path.join('~', '.Xauthority')),
-                os.path.join(directory, '.Xauthority'))
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        self.useFixture(fixtures.EnvironmentVariable(
+            'QML2_IMPORT_PATH',
+            newvalue=os.path.join(self.local_location, 'src/plugin')))
+        return self.launch_test_application(
+            self.local_location_binary,
+            '-q', self.local_location_qml,
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_installed(self):
+        return self.launch_test_application(
+            self.installed_location_binary,
+            '-q ' + self.installed_location_qml,
+            '--desktop_file_hint=/usr/share/applications/'
+            'reminders.desktop',
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_click(self):
+        return self.launch_click_package(
+            'com.ubuntu.reminders',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def _patch_home(self, test_type):
-        """ mock /home for testing purposes to preserve user data
-        """
         temp_dir_fixture = fixtures.TempDir()
         self.useFixture(temp_dir_fixture)
         temp_dir = temp_dir_fixture.path
@@ -114,29 +131,21 @@
 
         return temp_dir
 
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_local(self):
-        self.useFixture(fixtures.EnvironmentVariable(
-            'QML2_IMPORT_PATH',
-            newvalue=os.path.join(self.local_location, 'src/plugin')))
-        return self.launch_test_application(
-            self.local_location_binary,
-            '-q', self.local_location_qml,
-            app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_installed(self):
-        return self.launch_test_application(
-            self.installed_location_binary,
-            '-q ' + self.installed_location_qml,
-            '--desktop_file_hint=/usr/share/applications/'
-            'reminders.desktop',
-            app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
-
-    @autopilot_logging.log_action(logger.info)
-    def launch_test_click(self):
-        return self.launch_click_package(
-            'com.ubuntu.reminders',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+    def _copy_xauthority_file(self, directory):
+        """Copy .Xauthority file to directory, if it exists in /home."""
+        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
+        if os.path.isfile(xauth):
+            logger.debug("Copying .Xauthority to " + directory)
+            shutil.copyfile(
+                os.path.expanduser(os.path.join('~', '.Xauthority')),
+                os.path.join(directory, '.Xauthority'))
+
+
+class RemindersAppTestCase(BaseTestCaseWithTempHome):
+
+    """Base test case that launches the reminders-app."""
+
+    def setUp(self):
+        super(RemindersAppTestCase, self).setUp()
+        launcher_method, _ = self.get_launcher_method_and_type()
+        self.app = reminders.RemindersApp(launcher_method())

=== added file 'tests/autopilot/reminders/tests/test_credentials.py'
--- tests/autopilot/reminders/tests/test_credentials.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/reminders/tests/test_credentials.py	2014-06-25 23:31:11 +0000
@@ -0,0 +1,70 @@
+# -*- 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 logging
+
+from gi.repository import Accounts
+from testtools.matchers import HasLength
+
+from reminders import credentials, evernote, tests
+
+
+logger = logging.getLogger(__name__)
+
+
+class EvernoteCredentialsTestCase(tests.BaseTestCaseWithTempHome):
+
+    def setUp(self):
+        super(EvernoteCredentialsTestCase, self).setUp()
+        self.account_manager = credentials.AccountManager()
+
+    def add_evernote_account(self):
+        account = self.account_manager.add_evernote_account(
+            'dummy', 'dummy', evernote.TEST_OAUTH_TOKEN)
+        self.addCleanup(self.delete_account_and_manager, account)
+        return account
+
+    def delete_account_and_manager(self, account):
+        if account.id in self.account_manager._manager.list():
+            self.account_manager.delete_account(account)
+        del self.account_manager._manager
+        del self.account_manager
+
+    def test_add_evernote_account_must_enable_it(self):
+        account = self.add_evernote_account()
+
+        self.assertTrue(account.get_enabled())
+
+    def test_add_evernote_account_must_set_provider(self):
+        account = self.add_evernote_account()
+
+        self.assertEqual(account.get_provider_name(), 'evernote')
+
+    def test_add_evernote_account_must_enable_evernote_service(self):
+        account = self.add_evernote_account()
+        services = account.list_services()
+
+        self.assertThat(services, HasLength(1))
+        self.assertEqual(services[0].get_name(), 'evernote')
+        service = Accounts.AccountService.new(account, services[0])
+        self.assertTrue(service.get_enabled())
+
+    def test_delete_evernote_account_must_remove_it(self):
+        account = self.add_evernote_account()
+        self.assertThat(self.account_manager._manager.list(), HasLength(1))
+
+        self.account_manager.delete_account(account)
+        self.assertThat(self.account_manager._manager.list(), HasLength(0))

=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
--- tests/autopilot/reminders/tests/test_reminders.py	2014-06-25 23:31:11 +0000
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-06-25 23:31:11 +0000
@@ -66,6 +66,7 @@
         super(RemindersTestCaseWithAccount, self).setUp()
         no_account_dialog = self.app.main_view.no_account_dialog
         self.add_evernote_account()
+        logger.info('Waiting for the Evernote account to be created.')
         no_account_dialog.wait_until_destroyed()
         self.evernote_client = evernote.SandboxEvernoteClient()
 
@@ -93,15 +94,9 @@
         notebooks_page.add_notebook(test_notebook_title)
 
         last_notebook = notebooks_page.get_notebooks()[-1]
-        # TODO there's a bug with the last updated value: http://pad.lv/1318751
-        # so we can't check the full tuple. Uncomment this as soon as the bug
-        # is fixed. --elopio - 2014-05-12
-        # self.assertEqual(
-        #    last_notebook,
-        #    (test_notebook_title, 'Last edited today', 'Private', 0))
-        self.assertEqual(last_notebook[0], test_notebook_title)
-        self.assertEqual(last_notebook[2], 'Private')
-        self.assertEqual(last_notebook[3], 0)
+        self.assertEqual(
+            last_notebook,
+            (test_notebook_title, 'Last edited today', 'Private', 0))
 
     def test_add_notebook_must_create_it_in_server(self):
         """Test that an added notebook will be created on the server."""