Merge lp:~bigkevmcd/offspring/bug-1226686-improve-notifications into lp:offspring

Proposed by Kevin McDermott
Status: Merged
Approved by: David Murphy
Approved revision: 178
Merged at revision: 178
Proposed branch: lp:~bigkevmcd/offspring/bug-1226686-improve-notifications
Merge into: lp:offspring
Diff against target: 27 lines (+5/-1)
2 files modified
lib/offspring/master/master.py (+3/-1)
lib/offspring/master/tests/test_master.py (+2/-0)
To merge this branch: bzr merge lp:~bigkevmcd/offspring/bug-1226686-improve-notifications
Reviewer Review Type Date Requested Status
David Murphy (community) Approve
Review via email: mp+189782@code.launchpad.net

Description of the change

Fairly trivial branch which adds the current build's project name the notification email to help with debugging.

To post a comment you must log in.
Revision history for this message
David Murphy (schwuk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/offspring/master/master.py'
2--- lib/offspring/master/master.py 2013-08-24 05:12:24 +0000
3+++ lib/offspring/master/master.py 2013-10-08 08:28:34 +0000
4@@ -140,7 +140,9 @@
5 try:
6 notifications.notify_problem(
7 "Lexbuilder Master (Build Queue Dispatcher)",
8- "unable to send build result notification",
9+ "unable to send build result notification "
10+ "for project %s" %
11+ builder.current_job.project.name,
12 self.config,
13 mailer=self.mailer)
14 except:
15
16=== modified file 'lib/offspring/master/tests/test_master.py'
17--- lib/offspring/master/tests/test_master.py 2013-08-16 16:07:34 +0000
18+++ lib/offspring/master/tests/test_master.py 2013-10-08 08:28:34 +0000
19@@ -230,6 +230,8 @@
20 self.assertTrue(
21 "Subject: Lexbuilder Master (Build Queue Dispatcher)" in
22 message, "Incorrect subject for notification email")
23+ self.assertTrue(
24+ self.project.name in message, "Project name not in message")
25
26 def test_scan_slaves_with_communication_error(self):
27 """

Subscribers

People subscribed via source and target branches