Merge lp:~elopio/u1-test-utils/fix1197028-localmail_SMTPClient into lp:u1-test-utils

[Leo Arias]

Updated localmail to version 36, and pinned it.

[Corey Goldberg (coreygoldberg)]

lgtm.

review: Approve

=== modified file 'fabfile/development.py'
--- fabfile/development.py	2013-04-09 19:06:01 +0000
+++ fabfile/development.py	2013-07-02 16:56:07 +0000
@@ -15,6 +15,8 @@
 import os
 import unittest
 
+from fabric import api
+
 
 def test(suites=None):
     """Run tests.
@@ -46,6 +48,8 @@
     res = runner.run(suite)
     print 'Totals: ran({0}), skipped({1}), errors({2}), failures({3})'.format(
         res.testsRun, len(res.skipped), len(res.errors), len(res.failures))
+    if not res.wasSuccessful():
+        api.abort('Tests failed.')
 
 
 def _load_static_tests(suite):

=== modified file 'requirements.txt'
--- requirements.txt	2013-05-02 20:55:10 +0000
+++ requirements.txt	2013-07-02 16:56:07 +0000
@@ -5,7 +5,7 @@
 pep8
 pyflakes
 Twisted
-bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk
+bzr+ssh://bazaar.launchpad.net/~bloodearnest/localmail/trunk@36
 bzr+http://bazaar.launchpad.net/~ubuntuone-hackers/payclient/trunk@4
 bzr+http://bazaar.launchpad.net/~canonical-isd-qa/selenium-simple-test/trunk@377
 bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/ssoclient@3

=== modified file 'u1testutils/selftests/unit/test_mail.py'
--- u1testutils/selftests/unit/test_mail.py	2013-05-22 13:13:01 +0000
+++ u1testutils/selftests/unit/test_mail.py	2013-07-02 16:56:07 +0000
@@ -18,6 +18,7 @@
 import threading
 import time
 import unittest
+from email.mime import text as mime_text
 
 import localmail
 import localmail.tests.helpers
@@ -56,15 +57,15 @@
         localmail.shutdown_thread(class_.localmail_thread)
 
     def test_get_latest_email(self):
-        from_ = '[e-mail]'
-        to = '[e-mail]'
-        subject = 'Test Subject'
-        body = 'Test body'
-        with localmail.tests.helpers.SMTPHelper(port=self.SMTP_PORT) as smtp:
-            smtp.login()
-            smtp.send(from_, to, subject, body)
+        message = mime_text.MIMEText('Test body')
+        message['Subject'] = 'Test Subject'
+        message['From'] = '[e-mail]'
+        message['To'] = '[e-mail]'
+        with localmail.tests.helpers.SMTPClient(port=self.SMTP_PORT) as smtp:
+            smtp.send(message)
         latest_email = mail.get_latest_email_sent_to('[e-mail]')
-        self.assertEquals(latest_email['From'], from_)
-        self.assertEquals(latest_email['To'], to)
-        self.assertEquals(latest_email['Subject'], subject)
-        self.assertEquals(latest_email.get_payload(), body + '\n')
+        self.assertEquals(latest_email['From'], message['From'])
+        self.assertEquals(latest_email['To'], message['To'])
+        self.assertEquals(latest_email['Subject'], message['Subject'])
+        self.assertEquals(
+            latest_email.get_payload(), message.get_payload() + '\n')