Merge branch 'master' into signup

2 files changed, 21 insertions, 1 deletions

diff --git a/service/test/unit/adapter/services/test_mail_sender.py b/service/test/unit/adapter/services/test_mail_sender.py
index 4daa7f24..23951214 100644
--- a/service/test/unit/adapter/services/test_mail_sender.py
+++ b/service/test/unit/adapter/services/test_mail_sender.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from leap.bitmask.mail.outgoing.service import OutgoingMail
+from mock import patch
 from twisted.mail.smtp import User
 from twisted.trial import unittest
 
@@ -104,6 +105,25 @@ class MailSenderTest(unittest.TestCase):
                 self.assertTrue(recipient in e.email_error_map)
 
     @defer.inlineCallbacks
+    def test_keymanager_encrypt_problem_raises_exception(self):
+        input_mail = InputMail.from_dict(mail_dict(), from_address='pixelated@org')
+
+        when(OutgoingMail)._maybe_attach_key(any(), any(), any()).thenReturn(
+            defer.succeed(None))
+        when(OutgoingMail)._fix_headers(any(), any(), any()).thenReturn(
+            defer.succeed((None, mock())))
+        when(self._keymanager_mock).encrypt(any(), any(), sign=any(),
+                                            fetch_remote=any()).thenReturn(defer.fail(Exception('pretend key expired')))
+
+        with patch('leap.bitmask.mail.outgoing.service.emit_async'):
+            try:
+                yield self.sender.sendmail(input_mail)
+                self.fail('Exception expected!')
+            except MailSenderException, e:
+                for recipient in flatten([input_mail.to, input_mail.cc, input_mail.bcc]):
+                    self.assertTrue(recipient in e.email_error_map)
+
+    @defer.inlineCallbacks
     def test_iterates_over_recipients_and_send_whitout_bcc_field(self):
         input_mail = InputMail.from_dict(mail_dict(), from_address='pixelated@org')
         bccs = input_mail.bcc
diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py
index fcf76f5a..1161acc4 100644
--- a/service/test/unit/resources/test_login_resource.py
+++ b/service/test/unit/resources/test_login_resource.py
@@ -219,7 +219,7 @@ class TestLoginPOST(unittest.TestCase):
             mock_authenticate.assert_called_once_with(self.username, self.password)
             self.assertEqual(401, self.request.responseCode)
             written_response = ''.join(self.request.written)
-            self.assertIn('Invalid credentials', written_response)
+            self.assertIn('Invalid username or password', written_response)
             self.assertFalse(mock_user_bootstrap_setup.called)
             self.assertFalse(self.resource.get_session(self.request).is_logged_in())