Merge lp:~elopio/u1-test-utils/sso_improvements into lp:u1-test-utils

[Leo Arias]

Copied nessita's mail change from SSO.

Copied nessita's mail change from SSO.

[Natalia Bidart (nataliabidart)]

Sounds about right!

review: Approve

=== modified file 'u1testutils/sst/sso/utils/mail.py'
--- u1testutils/sst/sso/utils/mail.py	2013-01-16 15:16:50 +0000
+++ u1testutils/sst/sso/utils/mail.py	2013-01-17 21:36:26 +0000
@@ -42,13 +42,12 @@
             vcode = match.group(1).strip()
         else:
             raise AssertionError("No verification code found in email.")
-        match = re.search(
-            'confirm your (?:account|email address|reset):(.*)If',
-            body, re.S)
-        if match:
-            link = match.group(1).strip()
+        links = map(str.strip, re.findall('^(http.*)$', body, re.MULTILINE))
+        if links:
+            link = links[0]
         else:
-            raise AssertionError("No verification link found in email.")
+            msg = "No verification link found in email. Email is:\n%r."
+            raise AssertionError(msg % body)
     return vcode, link