diff options
| author | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-01-12 17:56:00 -0200 |
|---|---|---|
| committer | Tayane Fernandes <tayane.rmf@gmail.com> | 2017-01-12 17:56:00 -0200 |
| commit | 6a4545a33cb62abf32bf46422759778a88f96097 (patch) | |
| tree | 65bc462859d5b9b0240d4cd5e18045e7057666f1 | |
| parent | d2aabc8c514cb520d968e8241ec15c93bae2a0fe (diff) | |
Re-raise the exception after closing the session
We were trying to setup services even after closing the session. We fixed it
and added unit test.
Related with: #815
| -rw-r--r-- | service/pixelated/config/sessions.py | 1 | ||||
| -rw-r--r-- | service/test/unit/config/test_sessions.py | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/service/pixelated/config/sessions.py b/service/pixelated/config/sessions.py index 73c366c7..439ca9b3 100644 --- a/service/pixelated/config/sessions.py +++ b/service/pixelated/config/sessions.py @@ -161,6 +161,7 @@ class LeapSession(object): except UploadKeyError as e: logger.warn('{0}: {1}. Closing session for user: {2}'.format(e.__class__.__name__, e, self.account_email())) self.close() + raise yield self._create_account(self.soledad, self.user_auth.uuid) self.incoming_mail_fetcher = yield self._create_incoming_mail_fetcher( diff --git a/service/test/unit/config/test_sessions.py b/service/test/unit/config/test_sessions.py index a7e62c7a..8ae66015 100644 --- a/service/test/unit/config/test_sessions.py +++ b/service/test/unit/config/test_sessions.py @@ -17,9 +17,11 @@ import os from mock import patch from mock import MagicMock +from mockito import when from twisted.internet import defer from twisted.trial import unittest from pixelated.config.sessions import LeapSession, SessionCache +from pixelated.bitmask_libraries.keymanager import UploadKeyError from test.unit.bitmask_libraries.test_abstract_leap import AbstractLeapTest from leap.common.events.catalog import KEYMANAGER_FINISHED_KEY_GENERATION @@ -42,6 +44,16 @@ class SessionTest(AbstractLeapTest): yield session.first_required_sync() mail_fetcher_mock.startService.assert_called_once() + @defer.inlineCallbacks + def test_upload_key_error_closes_the_session(self): + when(self.keymanager).generate_openpgp_key().thenRaise(UploadKeyError('Could not upload key')) + session = self._create_session() + session.close = MagicMock() + + with self.assertRaises(UploadKeyError): + yield session.finish_bootstrap() + session.close.assert_called_once() + @patch('pixelated.config.sessions.register') @patch('pixelated.config.sessions.unregister') @patch('pixelated.config.sessions.Account') |