diff options
| author | Duda Dornelles <ddornell@thoughtworks.com> | 2015-02-18 13:40:41 -0200 |
|---|---|---|
| committer | Duda Dornelles <ddornell@thoughtworks.com> | 2015-02-18 13:40:49 -0200 |
| commit | dd63db87fdbb9667c1027edd700b4047b6983d1f (patch) | |
| tree | 85c7a2875f535412760dc7d87c7550777f265814 /service/test/unit/bitmask_libraries | |
| parent | 4a8217744e1d1ca60d158c3497a09b92f857a7fd (diff) | |
#294 - not failing service startup if smtp fails to start
Diffstat (limited to 'service/test/unit/bitmask_libraries')
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_session.py | 3 | ||||
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_smtp.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/service/test/unit/bitmask_libraries/test_session.py b/service/test/unit/bitmask_libraries/test_session.py index 67722557..0bfd59f2 100644 --- a/service/test/unit/bitmask_libraries/test_session.py +++ b/service/test/unit/bitmask_libraries/test_session.py @@ -24,6 +24,7 @@ class SessionTest(AbstractLeapTest): def setUp(self): self.mail_fetcher_mock = MagicMock() + self.smtp_mock = MagicMock() def tearDown(self): self.mail_fetcher_mock = MagicMock() @@ -65,7 +66,7 @@ class SessionTest(AbstractLeapTest): def _create_session(self): return LeapSession(self.provider, self.srp_session, self.soledad_session, self.nicknym, self.soledad_account, - self.mail_fetcher_mock) + self.mail_fetcher_mock, self.smtp_mock) def _execute_func(func): diff --git a/service/test/unit/bitmask_libraries/test_smtp.py b/service/test/unit/bitmask_libraries/test_smtp.py index 4087cbf5..c0e30573 100644 --- a/service/test/unit/bitmask_libraries/test_smtp.py +++ b/service/test/unit/bitmask_libraries/test_smtp.py @@ -71,7 +71,7 @@ class LeapSmtpTest(AbstractLeapTest): smtp.TWISTED_PORT = port gateway_mock.return_value = (None, None) with HTTMock(ca_cert_mock, not_found_mock): - smtp.start() + smtp.ensure_running() cert_path = self._client_cert_path() gateway_mock.assert_called_with(keymanager=self.keymanager, smtp_cert=cert_path, smtp_key=cert_path, userid='test_user@some-server.test', smtp_port='1234', encrypted_only=False, smtp_host='smtp.some-sever.test', port=port) @@ -91,7 +91,7 @@ class LeapSmtpTest(AbstractLeapTest): gateway_mock.return_value = (smtp_service, smtp_port) with HTTMock(ca_cert_mock, not_found_mock): - smtp.start() + smtp.ensure_running() smtp.stop() smtp_port.stopListening.assert_called_with() |