Merge lp:~bloodearnest/u1-test-utils/new-email-parsing into lp:u1-test-utils

[Simon Davy]

Change SSO email parsing logic to cope with both old and new emails

Change SSO email parsing logic to cope with both old and new emails

[lp:~bloodearnest/u1-test-utils/new-email-parsing]

28. By Simon Davy on 2013-02-04

clean up

=== modified file 'u1testutils/sst/sso/selftests/unit/test_sso_mail.py'
--- u1testutils/sst/sso/selftests/unit/test_sso_mail.py	2013-01-30 22:09:48 +0000
+++ u1testutils/sst/sso/selftests/unit/test_sso_mail.py	2013-02-04 15:16:19 +0000
@@ -74,8 +74,8 @@
     def setUp(self):
         super(SSOMailTestCase, self).setUp()
         patcher = mock.patch('u1testutils.mail')
-        mock_mail = patcher.start()
-        mock_mail.get_latest_email_sent_to.return_value = \
+        self.mock_mail = patcher.start()
+        self.mock_mail.get_latest_email_sent_to.return_value = \
             self.verification_email
         self.addCleanup(patcher.stop)
 
@@ -97,3 +97,25 @@
         self.assertEquals(
             invalidation_link,
             'https://login.ubuntu.com/invalidate-email/42FcJG/[e-mail]')
+
+    def test_no_code(self):
+        mock_email = mock.MagicMock()
+        mock_email.get_payload.return_value = 'XXXXXX'
+        self.mock_mail.get_latest_email_sent_to.return_value = mock_email
+        with self.assertRaises(AssertionError):
+            mail.get_verification_code_for_address('[e-mail]')
+
+    def test_token_regex(self):
+        urls = [
+            r'/%s/+new_account',
+            r'/invalidate-email/%s/[e-mail]',
+            r'/confirm-account/%s/[e-mail]',
+            r'/token/%s/+resetpassword/[e-mail]',
+            r'/token/%s/+newemail/[e-mail]',
+        ]
+        token = 'T0Kenz'
+        for pattern in urls:
+            for host in ('http://localhost:8000', 'https://login.ubuntu.com'):
+                url = host + pattern % token
+                m = mail.TOKEN_REGEX.search(url)
+                self.assertEqual(m.group(1), token)
 
=== modified file 'u1testutils/sst/sso/utils/mail.py'
--- u1testutils/sst/sso/utils/mail.py	2013-01-30 19:00:26 +0000
+++ u1testutils/sst/sso/utils/mail.py	2013-02-04 15:16:19 +0000
@@ -19,6 +19,8 @@
 
 import u1testutils.mail
 
+TOKEN_REGEX = re.compile(r'/([A-Za-z0-9]{6})/', re.S)
+
 
 def _get_verification_data_for_address(email_address):
     """A private helper for public helpers below.
@@ -35,20 +37,24 @@
         # line longer than a certain length.  Decode now to not have
         # to worry about it in the regexen.
         body = quopri.decodestring(email_msg.get_payload())
-        match = re.search(
-            'Here is your confirmation code:(.*)(Enter|If you made)',
-            body, re.S)
-        if match:
-            vcode = match.group(1).strip()
-        else:
-            raise AssertionError("No verification code found in email.")
+
         links = map(str.strip, re.findall('^(http.*)$', body, re.MULTILINE))
         if len(links) > 0:
             validation_link = links[0]
             if len(links) > 1:
                 invalidation_link = links[1]
+            match = TOKEN_REGEX.search(links[0])
+            if match:
+                vcode = match.group(1).strip()
         else:
-            msg = "No verification link found in email. Email is:\n%r."
+            match = re.search(
+                'Here is your confirmation code:(.*)(Enter|If you made)',
+                body, re.S)
+            if match:
+                vcode = match.group(1).strip()
+
+        if not vcode:
+            msg = "No verification code found in email. Email is:\n%r."
             raise AssertionError(msg % body)
 
     return vcode, validation_link, invalidation_link