1
=== modified file 'tests/autopilot/reminders/credentials.py'
2
--- tests/autopilot/reminders/credentials.py	2014-10-01 11:38:52 +0000
3
+++ tests/autopilot/reminders/credentials.py	2014-10-16 02:50:19 +0000
4
@@ -46,7 +46,7 @@
5
46
    def _join_main_loop(self):
46
    def _join_main_loop(self):
6
47
        self._main_loop_thread.join()
47
        self._main_loop_thread.join()
7
48
        if self.error is not None:
48
        if self.error is not None:
9
49
            raise CredentialsException(self.error.message)
49
            raise CredentialsException(self.error)
10
50
50
11
51
    def add_evernote_account(self, user_name, password, oauth_token):
51
    def add_evernote_account(self, user_name, password, oauth_token):
12
52
        """Add an evernote account.
52
        """Add an evernote account.
13
@@ -60,6 +60,11 @@
14
60
        self._start_main_loop()
60
        self._start_main_loop()
15
61
61
16
62
        account = self._create_account()
62
        account = self._create_account()
17
63
        logger.debug('account %s' % account.get_settings_dict())
18
64
19
65
        if not account.get_settings_dict():
20
66
            self._delete_account_on_error(account)
21
67
            self._quit_main_loop_on_error('account is blank', 'add account')
22
63
68
23
64
        info = self._get_identity_info(user_name, password)
69
        info = self._get_identity_info(user_name, password)
24
65
70
25
@@ -67,6 +72,9 @@
26
67
        identity.store_credentials_with_info(
72
        identity.store_credentials_with_info(
27
68
            info, self._set_credentials_id_to_account,
73
            info, self._set_credentials_id_to_account,
28
69
            {'account': account, 'oauth_token': oauth_token})
74
            {'account': account, 'oauth_token': oauth_token})
29
75
        logger.debug('identity %s' % identity.list_properties())
30
76
31
77
        logger.debug('Joining loop')
32
70
78
33
71
        self._join_main_loop()
79
        self._join_main_loop()
34
72
80
35
@@ -91,10 +99,21 @@
36
91
        if error:
99
        if error:
37
92
            self._quit_main_loop_on_error(error, 'storing account')
100
            self._quit_main_loop_on_error(error, 'storing account')
38
93
101
39
102
    def _delete_account_on_error(self, account):
40
103
        # attempt to clean up after ourselves, since normal
41
104
        # addCleanups will not run in this case
42
105
        try:
43
106
            logger.debug('Cleaning up account %s' % account.id)
44
107
            account.delete()
45
108
            account.store(self._on_account_deleted, None)
46
109
        except:
47
110
            logger.warn('Failed to cleanup account')
48
111
49
94
    def _quit_main_loop_on_error(self, error, step):
112
    def _quit_main_loop_on_error(self, error, step):
50
95
        logger.error('Error {}.'.format(step))
113
        logger.error('Error {}.'.format(step))
51
96
        self.error = error
114
        self.error = error
52
97
        self._main_loop.quit()
115
        self._main_loop.quit()
53
116
        raise CredentialsException(error)
54
98
117
55
99
    def _get_identity_info(self, user_name, password):
118
    def _get_identity_info(self, user_name, password):
56
100
        info = Signon.IdentityInfo.new()
119
        info = Signon.IdentityInfo.new()
57
@@ -114,6 +133,7 @@
58
114
        oauth_token = account_dict.get('oauth_token')
133
        oauth_token = account_dict.get('oauth_token')
59
115
        account.set_variant('CredentialsId', GLib.Variant('u', id_))
134
        account.set_variant('CredentialsId', GLib.Variant('u', id_))
60
116
        account.store(self._process_session, oauth_token)
135
        account.store(self._process_session, oauth_token)
61
136
        logger.debug('Account stored')
62
117
137
63
118
    def _process_session(self, account, error, oauth_token):
138
    def _process_session(self, account, error, oauth_token):
64
119
        if error:
139
        if error:
65
@@ -122,18 +142,28 @@
66
122
142
67
123
        logger.debug('Processing session.')
143
        logger.debug('Processing session.')
68
124
        account_service = Accounts.AccountService.new(account, None)
144
        account_service = Accounts.AccountService.new(account, None)
69
145
        logger.debug('account_service %s' % account_service.list_properties())
70
125
        auth_data = account_service.get_auth_data()
146
        auth_data = account_service.get_auth_data()
71
147
        logger.debug('auth_data %s' % auth_data.get_parameters())
72
126
        identity = auth_data.get_credentials_id()
148
        identity = auth_data.get_credentials_id()
73
127
        method = auth_data.get_method()
149
        method = auth_data.get_method()
74
150
        if method is None:
75
151
            self._delete_account_on_error(account)
76
152
            self._quit_main_loop_on_error('Method is none',
77
153
                                          'processing auth data')
78
128
        mechanism = auth_data.get_mechanism()
154
        mechanism = auth_data.get_mechanism()
79
129
        session_data = auth_data.get_parameters()
155
        session_data = auth_data.get_parameters()
80
130
        session_data['ProvidedTokens'] = GLib.Variant('a{sv}', {
156
        session_data['ProvidedTokens'] = GLib.Variant('a{sv}', {
81
131
            'TokenSecret': GLib.Variant('s', 'dummy'),
157
            'TokenSecret': GLib.Variant('s', 'dummy'),
82
132
            'AccessToken': GLib.Variant('s', oauth_token),
158
            'AccessToken': GLib.Variant('s', oauth_token),
83
133
        })
159
        })
84
160
        logger.debug('session_data %s' % session_data)
85
161
        logger.debug('Authenticating session %s, %s' % (identity, method))
86
134
        session = Signon.AuthSession.new(identity, method)
162
        session = Signon.AuthSession.new(identity, method)
87
163
        logger.debug('Send session %s' % session)
88
135
        session.process(
164
        session.process(
89
136
            session_data, mechanism, self._on_login_processed, None)
165
            session_data, mechanism, self._on_login_processed, None)
90
166
        logger.debug('Session processed')
91
137
167
92
138
    def _on_login_processed(self, session, reply, error, userdata):
168
    def _on_login_processed(self, session, reply, error, userdata):
93
139
        if error:
169
        if error:
Reviewer	Review Type	Date Requested	Status
Leo Arias (community)			Approve on 2014-10-16
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-10-16
Ubuntu Notes app developers		2014-10-16	Pending
Review via email: mp+238519@code.launchpad.net