1
=== modified file 'tests/autopilot/reminders/credentials.py'
2
--- tests/autopilot/reminders/credentials.py	2014-06-25 23:31:11 +0000
3
+++ tests/autopilot/reminders/credentials.py	2014-06-25 23:31:11 +0000
4
@@ -14,12 +14,16 @@
5
14
# You should have received a copy of the GNU General Public License
14
# You should have received a copy of the GNU General Public License
6
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
7
16
16
9
17
17
import logging
10
18
import time
11
18
import threading
19
import threading
12
19
20
13
20
from gi.repository import Accounts, GLib, Signon
21
from gi.repository import Accounts, GLib, Signon
14
21
22
15
22
23
16
24
logger = logging.getLogger(__name__)
17
25
18
26
19
23
class CredentialsException(Exception):
27
class CredentialsException(Exception):
20
24
28
21
25
    """Exception for credentials problems."""
29
    """Exception for credentials problems."""
22
@@ -52,6 +56,7 @@
23
52
        :param oauth_token: The oauth token of the account.
56
        :param oauth_token: The oauth token of the account.
24
53
57
25
54
        """
58
        """
26
59
        logger.debug('Add an evernote account.')
27
55
        self._start_main_loop()
60
        self._start_main_loop()
28
56
61
29
57
        account = self._create_account()
62
        account = self._create_account()
30
@@ -65,11 +70,17 @@
31
65
70
32
66
        self._join_main_loop()
71
        self._join_main_loop()
33
67
72
34
73
        # XXX Sometimes, the account fails to be enabled. This sleep seems to
35
74
        # fix it but we haven't yet found the reason. --elopio - 2014-06-25
36
75
        time.sleep(10)
37
68
        self._enable_evernote_service(account)
76
        self._enable_evernote_service(account)
38
69
77
39
78
        logger.info('Created the account with id: {}.'.format(account.id))
40
79
        self._log_accounts_info()
41
70
        return account
80
        return account
42
71
81
43
72
    def _create_account(self):
82
    def _create_account(self):
44
83
        logger.debug('Creating the Evernote account.')
45
73
        account = self._manager.create_account('evernote')
84
        account = self._manager.create_account('evernote')
46
74
        account.set_enabled(True)
85
        account.set_enabled(True)
47
75
        account.store(self._on_account_created, None)
86
        account.store(self._on_account_created, None)
48
@@ -77,8 +88,12 @@
49
77
88
50
78
    def _on_account_created(self, account, error, _):
89
    def _on_account_created(self, account, error, _):
51
79
        if error:
90
        if error:
54
80
            self.error = error
91
            self._quit_main_loop_on_error(error, 'storing account')
55
81
            self._main_loop.quit()
92
56
93
    def _quit_main_loop_on_error(self, error, step):
57
94
        logger.error('Error {}.'.format(step))
58
95
        self.error = error
59
96
        self._main_loop.quit()
60
82
97
61
83
    def _get_identity_info(self, user_name, password):
98
    def _get_identity_info(self, user_name, password):
62
84
        info = Signon.IdentityInfo.new()
99
        info = Signon.IdentityInfo.new()
63
@@ -90,9 +105,10 @@
64
90
    def _set_credentials_id_to_account(
105
    def _set_credentials_id_to_account(
65
91
            self, identity, id_, error, account_dict):
106
            self, identity, id_, error, account_dict):
66
92
        if error:
107
        if error:
69
93
            self.error = error
108
            self._quit_main_loop_on_error(
70
94
            self._main_loop.quit()
109
                error, 'storing credentials with info')
71
95
110
72
111
        logger.debug('Setting credentials to account.')
73
96
        account = account_dict.get('account')
112
        account = account_dict.get('account')
74
97
        oauth_token = account_dict.get('oauth_token')
113
        oauth_token = account_dict.get('oauth_token')
75
98
        account.set_variant('CredentialsId', GLib.Variant('u', id_))
114
        account.set_variant('CredentialsId', GLib.Variant('u', id_))
76
@@ -100,9 +116,10 @@
77
100
116
78
101
    def _process_session(self, account, error, oauth_token):
117
    def _process_session(self, account, error, oauth_token):
79
102
        if error:
118
        if error:
82
103
            self.error = error
119
            self._quit_main_loop_on_error(
83
104
            self._main_loop.quit()
120
                error, 'setting credentials id to account')
84
105
121
85
122
        logger.debug('Processing session.')
86
106
        account_service = Accounts.AccountService.new(account, None)
123
        account_service = Accounts.AccountService.new(account, None)
87
107
        auth_data = account_service.get_auth_data()
124
        auth_data = account_service.get_auth_data()
88
108
        identity = auth_data.get_credentials_id()
125
        identity = auth_data.get_credentials_id()
89
@@ -119,15 +136,39 @@
90
119
136
91
120
    def _on_login_processed(self, session, reply, error, userdata):
137
    def _on_login_processed(self, session, reply, error, userdata):
92
121
        if error:
138
        if error:
94
122
            self.error = error
139
            self._quit_main_loop_on_error(error, 'processing session')
95
123
140
97
124
        self._main_loop.quit()
141
        else:
98
142
            self._main_loop.quit()
99
125
143
100
126
    def _enable_evernote_service(self, account):
144
    def _enable_evernote_service(self, account):
101
145
        logger.debug('Enabling evernote service.')
102
127
        service = self._manager.get_service('evernote')
146
        service = self._manager.get_service('evernote')
103
128
        account.select_service(service)
147
        account.select_service(service)
104
129
        account.set_enabled(True)
148
        account.set_enabled(True)
106
130
        account.store(self._on_account_created, None)
149
        account.store(self._on_service_enabled, None)
107
150
108
151
    def _on_service_enabled(self, account, error, _):
109
152
        if error:
110
153
            self._quit_main_loop_on_error(error, 'enabling service')
111
154
112
155
    def _log_accounts_info(self):
113
156
        account_ids = self._manager.list()
114
157
        logger.debug('Existing accounts: {}.'.format(account_ids))
115
158
        for id_ in account_ids:
116
159
            account = self._manager.get_account(id_)
117
160
            self._log_account_info(account)
118
161
119
162
    def _log_account_info(self, account):
120
163
        logger.debug('Account info:')
121
164
        logger.debug('id: {}'.format(account.id))
122
165
        logger.debug('provider: {}'.format(account.get_provider_name()))
123
166
        logger.debug('enabled: {}'.format(account.get_enabled()))
124
167
        logger.debug('Account services:')
125
168
        for service in account.list_services():
126
169
            logger.debug('name: {}'.format(service.get_name()))
127
170
            account_service = Accounts.AccountService.new(account, service)
128
171
            logger.debug('enabled: {}'.format(account_service.get_enabled()))
129
131
172
130
132
    def delete_account(self, account):
173
    def delete_account(self, account):
131
133
        """Delete an account.
174
        """Delete an account.
132
@@ -135,13 +176,14 @@
133
135
        :param account: The account to delete.
176
        :param account: The account to delete.
134
136
177
135
137
        """
178
        """
136
179
        logger.info('Deleting the account with id {}.'.format(account.id))
137
138
        self._start_main_loop()
180
        self._start_main_loop()
138
139
        account.delete()
181
        account.delete()
139
140
        account.store(self._on_account_deleted, None)
182
        account.store(self._on_account_deleted, None)
140
141
        self._join_main_loop()
183
        self._join_main_loop()
141
142
184
143
143
    def _on_account_deleted(self, account, error, userdata):
185
    def _on_account_deleted(self, account, error, _):
144
144
        if error:
186
        if error:
148
145
            self.error = error
187
            self._quit_main_loop_on_error(error, 'deleting account')
149
146
188
        else:
150
147
        self._main_loop.quit()
189
            self._main_loop.quit()
151
148
190
152
=== modified file 'tests/autopilot/reminders/tests/__init__.py'
153
--- tests/autopilot/reminders/tests/__init__.py	2014-06-25 23:31:11 +0000
154
+++ tests/autopilot/reminders/tests/__init__.py	2014-06-25 23:31:11 +0000
155
@@ -16,14 +16,13 @@
156
16
16
157
17
"""Reminders app autopilot tests."""
17
"""Reminders app autopilot tests."""
158
18
18
159
19
import logging
160
19
import os
20
import os
161
20
import shutil
21
import shutil
163
21
import logging
22
import subprocess
164
22
23
165
23
import fixtures
24
import fixtures
166
24
from autopilot import logging as autopilot_logging
25
from autopilot import logging as autopilot_logging
167
25
from autopilot.input import Mouse, Touch, Pointer
168
26
from autopilot.platform import model
169
27
from autopilot.testcase import AutopilotTestCase
26
from autopilot.testcase import AutopilotTestCase
170
28
from ubuntuuitoolkit import (
27
from ubuntuuitoolkit import (
171
29
    emulators as toolkit_emulators,
28
    emulators as toolkit_emulators,
172
@@ -35,15 +34,13 @@
173
35
logger = logging.getLogger(__name__)
34
logger = logging.getLogger(__name__)
174
36
35
175
37
36
185
38
class RemindersAppTestCase(AutopilotTestCase):
37
class BaseTestCaseWithTempHome(AutopilotTestCase):
186
39
38
187
40
    """A common test case class that provides several useful methods for
39
    """Base test case that patches the home directory.
188
41
       reminders-app tests."""
40
189
42
41
    That way we start the tests with a clean environment.
190
43
    if model() == 'Desktop':
42
191
44
        scenarios = [('with mouse', dict(input_device_class=Mouse))]
43
    """
183
45
    else:
184
46
        scenarios = [('with touch', dict(input_device_class=Touch))]
192
47
44
193
48
    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
45
    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
194
49
46
195
@@ -53,7 +50,20 @@
196
53
    installed_location_binary = '/usr/bin/reminders'
50
    installed_location_binary = '/usr/bin/reminders'
197
54
    installed_location_qml = '/usr/share/reminders/qml/reminders.qml'
51
    installed_location_qml = '/usr/share/reminders/qml/reminders.qml'
198
55
52
200
56
    def get_launcher_and_type(self):
53
    def setUp(self):
201
54
        self.kill_signond()
202
55
        self.addCleanup(self.kill_signond)
203
56
        super(BaseTestCaseWithTempHome, self).setUp()
204
57
        _, test_type = self.get_launcher_method_and_type()
205
58
        self.home_dir = self._patch_home(test_type)
206
59
207
60
    def kill_signond(self):
208
61
        # We kill signond so it's restarted using the temporary HOME. Otherwise
209
62
        # it will remain running until it has 5 seconds of inactivity, keeping
210
63
        # reference to other directories.
211
64
        subprocess.call(['pkill', '-9', 'signond'])
212
65
213
66
    def get_launcher_method_and_type(self):
214
57
        if os.path.exists(self.local_location_binary):
67
        if os.path.exists(self.local_location_binary):
215
58
            launcher = self.launch_test_local
68
            launcher = self.launch_test_local
216
59
            test_type = 'local'
69
            test_type = 'local'
217
@@ -65,27 +75,34 @@
218
65
            test_type = 'click'
75
            test_type = 'click'
219
66
        return launcher, test_type
76
        return launcher, test_type
220
67
77
238
68
    def setUp(self):
78
    @autopilot_logging.log_action(logger.info)
239
69
        launcher, test_type = self.get_launcher_and_type()
79
    def launch_test_local(self):
240
70
        self.home_dir = self._patch_home(test_type)
80
        self.useFixture(fixtures.EnvironmentVariable(
241
71
        self.pointing_device = Pointer(self.input_device_class.create())
81
            'QML2_IMPORT_PATH',
242
72
        super(RemindersAppTestCase, self).setUp()
82
            newvalue=os.path.join(self.local_location, 'src/plugin')))
243
73
83
        return self.launch_test_application(
244
74
        self.app = reminders.RemindersApp(launcher())
84
            self.local_location_binary,
245
75
85
            '-q', self.local_location_qml,
246
76
    def _copy_xauthority_file(self, directory):
86
            app_type='qt',
247
77
        """ Copy .Xauthority file to directory, if it exists in /home
87
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
248
78
        """
88
249
79
        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
89
    @autopilot_logging.log_action(logger.info)
250
80
        if os.path.isfile(xauth):
90
    def launch_test_installed(self):
251
81
            logger.debug("Copying .Xauthority to " + directory)
91
        return self.launch_test_application(
252
82
            shutil.copyfile(
92
            self.installed_location_binary,
253
83
                os.path.expanduser(os.path.join('~', '.Xauthority')),
93
            '-q ' + self.installed_location_qml,
254
84
                os.path.join(directory, '.Xauthority'))
94
            '--desktop_file_hint=/usr/share/applications/'
255
95
            'reminders.desktop',
256
96
            app_type='qt',
257
97
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
258
98
259
99
    @autopilot_logging.log_action(logger.info)
260
100
    def launch_test_click(self):
261
101
        return self.launch_click_package(
262
102
            'com.ubuntu.reminders',
263
103
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
264
85
104
265
86
    def _patch_home(self, test_type):
105
    def _patch_home(self, test_type):
266
87
        """ mock /home for testing purposes to preserve user data
267
88
        """
268
89
        temp_dir_fixture = fixtures.TempDir()
106
        temp_dir_fixture = fixtures.TempDir()
269
90
        self.useFixture(temp_dir_fixture)
107
        self.useFixture(temp_dir_fixture)
270
91
        temp_dir = temp_dir_fixture.path
108
        temp_dir = temp_dir_fixture.path
271
@@ -114,29 +131,21 @@
272
114
131
273
115
        return temp_dir
132
        return temp_dir
274
116
133
301
117
    @autopilot_logging.log_action(logger.info)
134
    def _copy_xauthority_file(self, directory):
302
118
    def launch_test_local(self):
135
        """Copy .Xauthority file to directory, if it exists in /home."""
303
119
        self.useFixture(fixtures.EnvironmentVariable(
136
        xauth = os.path.expanduser(os.path.join('~', '.Xauthority'))
304
120
            'QML2_IMPORT_PATH',
137
        if os.path.isfile(xauth):
305
121
            newvalue=os.path.join(self.local_location, 'src/plugin')))
138
            logger.debug("Copying .Xauthority to " + directory)
306
122
        return self.launch_test_application(
139
            shutil.copyfile(
307
123
            self.local_location_binary,
140
                os.path.expanduser(os.path.join('~', '.Xauthority')),
308
124
            '-q', self.local_location_qml,
141
                os.path.join(directory, '.Xauthority'))
309
125
            app_type='qt',
142
310
126
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
143
311
127
144
class RemindersAppTestCase(BaseTestCaseWithTempHome):
312
128
    @autopilot_logging.log_action(logger.info)
145
313
129
    def launch_test_installed(self):
146
    """Base test case that launches the reminders-app."""
314
130
        return self.launch_test_application(
147
315
131
            self.installed_location_binary,
148
    def setUp(self):
316
132
            '-q ' + self.installed_location_qml,
149
        super(RemindersAppTestCase, self).setUp()
317
133
            '--desktop_file_hint=/usr/share/applications/'
150
        launcher_method, _ = self.get_launcher_method_and_type()
318
134
            'reminders.desktop',
151
        self.app = reminders.RemindersApp(launcher_method())
293
135
            app_type='qt',
294
136
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
295
137
296
138
    @autopilot_logging.log_action(logger.info)
297
139
    def launch_test_click(self):
298
140
        return self.launch_click_package(
299
141
            'com.ubuntu.reminders',
300
142
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
319
143
152
320
=== added file 'tests/autopilot/reminders/tests/test_credentials.py'
321
--- tests/autopilot/reminders/tests/test_credentials.py	1970-01-01 00:00:00 +0000
322
+++ tests/autopilot/reminders/tests/test_credentials.py	2014-06-25 23:31:11 +0000
323
@@ -0,0 +1,70 @@
324
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
325
2
#
326
3
# Copyright (C) 2014 Canonical Ltd
327
4
#
328
5
# This program is free software: you can redistribute it and/or modify
329
6
# it under the terms of the GNU General Public License version 3 as
330
7
# published by the Free Software Foundation.
331
8
#
332
9
# This program is distributed in the hope that it will be useful,
333
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
334
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
335
12
# GNU General Public License for more details.
336
13
#
337
14
# You should have received a copy of the GNU General Public License
338
15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
339
16
340
17
import logging
341
18
342
19
from gi.repository import Accounts
343
20
from testtools.matchers import HasLength
344
21
345
22
from reminders import credentials, evernote, tests
346
23
347
24
348
25
logger = logging.getLogger(__name__)
349
26
350
27
351
28
class EvernoteCredentialsTestCase(tests.BaseTestCaseWithTempHome):
352
29
353
30
    def setUp(self):
354
31
        super(EvernoteCredentialsTestCase, self).setUp()
355
32
        self.account_manager = credentials.AccountManager()
356
33
357
34
    def add_evernote_account(self):
358
35
        account = self.account_manager.add_evernote_account(
359
36
            'dummy', 'dummy', evernote.TEST_OAUTH_TOKEN)
360
37
        self.addCleanup(self.delete_account_and_manager, account)
361
38
        return account
362
39
363
40
    def delete_account_and_manager(self, account):
364
41
        if account.id in self.account_manager._manager.list():
365
42
            self.account_manager.delete_account(account)
366
43
        del self.account_manager._manager
367
44
        del self.account_manager
368
45
369
46
    def test_add_evernote_account_must_enable_it(self):
370
47
        account = self.add_evernote_account()
371
48
372
49
        self.assertTrue(account.get_enabled())
373
50
374
51
    def test_add_evernote_account_must_set_provider(self):
375
52
        account = self.add_evernote_account()
376
53
377
54
        self.assertEqual(account.get_provider_name(), 'evernote')
378
55
379
56
    def test_add_evernote_account_must_enable_evernote_service(self):
380
57
        account = self.add_evernote_account()
381
58
        services = account.list_services()
382
59
383
60
        self.assertThat(services, HasLength(1))
384
61
        self.assertEqual(services[0].get_name(), 'evernote')
385
62
        service = Accounts.AccountService.new(account, services[0])
386
63
        self.assertTrue(service.get_enabled())
387
64
388
65
    def test_delete_evernote_account_must_remove_it(self):
389
66
        account = self.add_evernote_account()
390
67
        self.assertThat(self.account_manager._manager.list(), HasLength(1))
391
68
392
69
        self.account_manager.delete_account(account)
393
70
        self.assertThat(self.account_manager._manager.list(), HasLength(0))
394
0
71
395
=== modified file 'tests/autopilot/reminders/tests/test_reminders.py'
396
--- tests/autopilot/reminders/tests/test_reminders.py	2014-06-25 23:31:11 +0000
397
+++ tests/autopilot/reminders/tests/test_reminders.py	2014-06-25 23:31:11 +0000
398
@@ -66,6 +66,7 @@
399
66
        super(RemindersTestCaseWithAccount, self).setUp()
66
        super(RemindersTestCaseWithAccount, self).setUp()
400
67
        no_account_dialog = self.app.main_view.no_account_dialog
67
        no_account_dialog = self.app.main_view.no_account_dialog
401
68
        self.add_evernote_account()
68
        self.add_evernote_account()
402
69
        logger.info('Waiting for the Evernote account to be created.')
403
69
        no_account_dialog.wait_until_destroyed()
70
        no_account_dialog.wait_until_destroyed()
404
70
        self.evernote_client = evernote.SandboxEvernoteClient()
71
        self.evernote_client = evernote.SandboxEvernoteClient()
405
71
72
406
@@ -93,15 +94,9 @@
407
93
        notebooks_page.add_notebook(test_notebook_title)
94
        notebooks_page.add_notebook(test_notebook_title)
408
94
95
409
95
        last_notebook = notebooks_page.get_notebooks()[-1]
96
        last_notebook = notebooks_page.get_notebooks()[-1]
419
96
        # TODO there's a bug with the last updated value: http://pad.lv/1318751
97
        self.assertEqual(
420
97
        # so we can't check the full tuple. Uncomment this as soon as the bug
98
            last_notebook,
421
98
        # is fixed. --elopio - 2014-05-12
99
            (test_notebook_title, 'Last edited today', 'Private', 0))
413
99
        # self.assertEqual(
414
100
        #    last_notebook,
415
101
        #    (test_notebook_title, 'Last edited today', 'Private', 0))
416
102
        self.assertEqual(last_notebook[0], test_notebook_title)
417
103
        self.assertEqual(last_notebook[2], 'Private')
418
104
        self.assertEqual(last_notebook[3], 0)
422
105
100
423
106
    def test_add_notebook_must_create_it_in_server(self):
101
    def test_add_notebook_must_create_it_in_server(self):
424
107
        """Test that an added notebook will be created on the server."""
102
        """Test that an added notebook will be created on the server."""
Status:	Merged
Approved by:	Nicholas Skaggs on 2014-07-02
Approved revision:	189
Merged at revision:	168
Proposed branch:	lp:~elopio/reminders-app/fix_with_account
Merge into:	lp:reminders-app
Prerequisite:	lp:~nskaggs/reminders-app/fix-new-pep8
Diff against target:	424 lines (+197/-81) 4 files modified tests/autopilot/reminders/credentials.py (+56/-14) tests/autopilot/reminders/tests/__init__.py (+67/-58) tests/autopilot/reminders/tests/test_credentials.py (+70/-0) tests/autopilot/reminders/tests/test_reminders.py (+4/-9)
To merge this branch:	bzr merge lp:~elopio/reminders-app/fix_with_account
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	2014-06-25	Approve on 2014-07-02
David Planella			Approve on 2014-06-26
Nicholas Skaggs		2014-06-25	Pending
Review via email: mp+224539@code.launchpad.net