Merge lp:~bigkevmcd/offspring/fix-notification-emails into lp:offspring

[Kevin McDermott]

This catches errors parsing the build name, and allows the email to send, including the troublesome name in the subject.

[David Murphy (schwuk)]

review: Approve

=== modified file 'lib/offspring/master/notifications.py'
--- lib/offspring/master/notifications.py	2013-03-05 11:32:52 +0000
+++ lib/offspring/master/notifications.py	2013-09-18 09:59:48 +0000
@@ -113,7 +113,10 @@
     project = build_result.project
     builder = build_result.builder
 
-    build_date, build_id = build_result.name.rsplit("-", 1)
+    try:
+        build_date, build_id = build_result.name.rsplit("-", 1)
+    except ValueError:
+        build_date, build_id = "ERROR", build_result.name
     build_url = "%s/%s/%s/%s" % (
         config.get("web", "build_results_uri"), project.name, build_date,
         build_id)

=== modified file 'lib/offspring/master/tests/test_notifications.py'
--- lib/offspring/master/tests/test_notifications.py	2013-03-04 13:45:12 +0000
+++ lib/offspring/master/tests/test_notifications.py	2013-09-18 09:59:48 +0000
@@ -181,3 +181,16 @@
         """
         notify_buildresult(self.build_result, self.config, self.mailer.mail)
         self.assertEqual([], self.mailer.mails)
+
+    def test_notify_buildresult_with_invalid_build_result_name(self):
+        """
+        Send an email users subscribed to a Project with details of the
+        build result.
+        """
+        self.build_result.name = u"ERRORMESSAGE"
+        self.subscribe_to_project(self.user, self.project)
+        notify_buildresult(self.build_result, self.config, self.mailer.mail)
+        self.assertEqual(self.user.email, self.mailer.mails[0][1])
+        self.assertIn(
+            "Subject: test-project (ERRORMESSAGE) build None",
+            self.mailer.mails[0][2])