Merge lp:~sinzui/launchpad/question-email-3 into lp:launchpad

[Curtis Hovey]

Send question email asynchronously.

    Launchpad bug:
        https://bugs.launchpad.net/bugs/550954
        https://bugs.launchpad.net/bugs/608037
        https://bugs.launchpad.net/bugs/618390
    Pre-implementation: jcsackett, lifeless

Change QuestionNotification to queue emails instead of sending them.
This addresses four kinds of timeouts that happen when a question needs
email sent to many users.

--------------------------------------------------------------------

RULES

    * Replace QuestionNotification's send() method with a enqueue() method.
    * Remove unneeded methods and tests that were used to send email.
    * Update the notification doctests to to use questionemailjobs instead
      of sent email.

QA

    * Create a question on qastaging.
    * Ask an admin to run cronscripts/process-job-source-groups.py on
      qastaging
    * Verify the email arrives in the staging inbox.

LINT

    database/schema/security.cfg
    lib/lp/answers/notification.py
    lib/lp/answers/doc/notifications.txt
    lib/lp/answers/tests/test_question_notifications.py
    lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt
    lib/lp/coop/answersbugs/tests/notifications-linked-private-bug.txt

TEST

    ./bin/test -vv -t answers.*notification

IMPLEMENTATION

Gave all processes that could update a bug or question access to questionjob.
    database/schema/security.cfg

Added the enqueue() method and the recipient_set attribute.
Removes send(), getRecipients(), buildBody(), getFromAddress() methods.
    lib/lp/answers/notification.py
    lib/lp/answers/tests/test_question_notifications.py

/o\ More than 1000 lines of the diff is dedicated to updating the existing
doctests to check questionemailjob instead of sent emails. 900 lines are
just notifications.txt. For all three tests, I added a utility that behaves
like pop_notification, but questionemailjobs are not emails. I deleted all
tests for email addresses and reason footers, because those are provided by
recipientsets, which are already tested in question.txt and elsewhere. The
same is true the the two chunks about team email, I deleted them
since Question, not QuestionNotification, determines that. There were a few
cases where the counts of notifications changed. This is because notification
were implicitly created when the test question was created; the tests were
were somewhat wrong. Since the sort rules changed, email addresses versus
recipientset types, The order of question asker and subscriber changed.
    lib/lp/answers/doc/notifications.txt
    lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt
    lib/lp/coop/answersbugs/tests/notifications-linked-private-bug.txt

[Benji York (benji)]

Someone else is already lined up to do this review.

review: Abstain

[j.c.sackett (jcsackett)]

Curtis--

This mostly looks solid.

I have only one minor quibble. Names like
{{{
    class TestQuestionNotification(QuestionNotification)
}}}
strike me as somewhat confusing, since they follow our naming convention for testcases. I think something like FakeQuestionNotification or MockQuestionNotification would make it clearer. This is a nonblocker for approval, but something perhaps worth considering.

This (and the other branches in this set of work) are really great. Thanks for them.

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2011-05-03 12:52:05 +0000
+++ database/schema/security.cfg	2011-05-04 17:17:01 +0000
@@ -583,6 +583,7 @@
 public.productseries                    = SELECT
 public.project                          = SELECT, UPDATE
 public.question                         = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionbug                      = SELECT
 public.questionsubscription             = SELECT
 public.section                          = SELECT
@@ -599,56 +600,56 @@
 
 [branchscanner]
 groups=write, script
-public.account                          = SELECT, INSERT
-public.accountpassword                  = SELECT, INSERT
-public.branch                           = SELECT, UPDATE
-public.branchjob                        = SELECT, INSERT, UPDATE, DELETE
-public.branchmergeproposal              = SELECT, UPDATE
-public.branchmergeproposaljob           = SELECT, INSERT
-public.branchrevision                   = SELECT, INSERT, UPDATE, DELETE
-public.branchsubscription               = SELECT
-public.branchvisibilitypolicy           = SELECT
-public.bugactivity                      = SELECT, INSERT
-public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
-public.bugbranch                        = SELECT, INSERT, UPDATE
-public.bugnotification                  = SELECT, INSERT
-public.bugnotificationfilter            = SELECT, INSERT
-public.bugnotificationrecipient         = SELECT, INSERT
-public.bugsubscription                  = SELECT
-public.bugsubscriptionfilter            = SELECT
-public.bugsubscriptionfilterimportance  = SELECT
-public.bugsubscriptionfilterstatus      = SELECT
-public.bugsubscriptionfiltertag         = SELECT
-public.bugtag                           = SELECT
-public.codereviewmessage                = SELECT
-public.codereviewvote                   = SELECT
-public.diff                             = SELECT, INSERT, DELETE
-public.distribution                     = SELECT
-public.distributionsourcepackage        = SELECT, UPDATE
-public.distroseries                     = SELECT
-public.emailaddress                     = SELECT
-public.incrementaldiff                  = SELECT
-public.job                              = SELECT, INSERT, UPDATE, DELETE
-public.karma                            = SELECT, INSERT
-public.karmaaction                      = SELECT
-public.message                          = SELECT, INSERT
-public.messagechunk                     = SELECT, INSERT
-public.person                           = SELECT
-public.revision                         = SELECT, INSERT, UPDATE
-public.revisionauthor                   = SELECT, INSERT, UPDATE
-public.revisioncache                    = SELECT, INSERT
-public.revisionparent                   = SELECT, INSERT
-public.revisionproperty                 = SELECT, INSERT
-public.seriessourcepackagebranch        = SELECT
-public.sourcepackagename                = SELECT
-public.sourcepackagerecipe              = SELECT, UPDATE
-public.sourcepackagerecipedata          = SELECT
+public.account                            = SELECT, INSERT
+public.accountpassword                    = SELECT, INSERT
+public.branch                             = SELECT, UPDATE
+public.branchjob                          = SELECT, INSERT, UPDATE, DELETE
+public.branchmergeproposal                = SELECT, UPDATE
+public.branchmergeproposaljob             = SELECT, INSERT
+public.branchrevision                     = SELECT, INSERT, UPDATE, DELETE
+public.branchsubscription                 = SELECT
+public.branchvisibilitypolicy             = SELECT
+public.bugactivity                        = SELECT, INSERT
+public.bugaffectsperson                   = SELECT, INSERT, UPDATE, DELETE
+public.bugbranch                          = SELECT, INSERT, UPDATE
+public.bugnotification                    = SELECT, INSERT
+public.bugnotificationfilter              = SELECT, INSERT
+public.bugnotificationrecipient           = SELECT, INSERT
+public.bugsubscription                    = SELECT
+public.bugsubscriptionfilter              = SELECT
+public.bugsubscriptionfilterimportance    = SELECT
+public.bugsubscriptionfilterstatus        = SELECT
+public.bugsubscriptionfiltertag           = SELECT
+public.bugtag                             = SELECT
+public.codereviewmessage                  = SELECT
+public.codereviewvote                     = SELECT
+public.diff                               = SELECT, INSERT, DELETE
+public.distribution                       = SELECT
+public.distributionsourcepackage          = SELECT, UPDATE
+public.distroseries                       = SELECT
+public.emailaddress                       = SELECT
+public.incrementaldiff                    = SELECT
+public.job                                = SELECT, INSERT, UPDATE, DELETE
+public.karma                              = SELECT, INSERT
+public.karmaaction                        = SELECT
+public.message                            = SELECT, INSERT
+public.messagechunk                       = SELECT, INSERT
+public.person                             = SELECT
+public.revision                           = SELECT, INSERT, UPDATE
+public.revisionauthor                     = SELECT, INSERT, UPDATE
+public.revisioncache                      = SELECT, INSERT
+public.revisionparent                     = SELECT, INSERT
+public.revisionproperty                   = SELECT, INSERT
+public.seriessourcepackagebranch          = SELECT
+public.sourcepackagename                  = SELECT
+public.sourcepackagerecipe                = SELECT, UPDATE
+public.sourcepackagerecipedata            = SELECT
 public.sourcepackagerecipedatainstruction = SELECT
-public.staticdiff                       = SELECT, INSERT, DELETE
-public.structuralsubscription           = SELECT
-public.translationtemplatesbuild        = SELECT, INSERT
-public.validpersoncache                 = SELECT
-public.validpersonorteamcache           = SELECT
+public.staticdiff                         = SELECT, INSERT, DELETE
+public.structuralsubscription             = SELECT
+public.translationtemplatesbuild          = SELECT, INSERT
+public.validpersoncache                   = SELECT
+public.validpersonorteamcache             = SELECT
 type=user
 
 [branch-distro]
@@ -682,36 +683,36 @@
 
 [distributionmirror]
 groups=script
-public.account                                  = SELECT
-public.archive                                  = SELECT
-public.archivearch                              = SELECT
-public.binarypackagebuild                       = SELECT
-public.binarypackagefile                        = SELECT
-public.binarypackagename                        = SELECT
-public.binarypackagepublishinghistory           = SELECT
-public.binarypackagerelease                     = SELECT
-public.buildfarmjob                             = SELECT
-public.component                                = SELECT
-public.componentselection                       = SELECT
-public.distribution                             = SELECT
-public.distributionmirror                       = SELECT, UPDATE
-public.distroarchseries                         = SELECT
-public.distroseries                             = SELECT
-public.emailaddress                             = SELECT
-public.libraryfilealias                         = SELECT, INSERT
-public.libraryfilecontent                       = SELECT, INSERT
-public.mirrorcdimagedistroseries                = SELECT, INSERT, UPDATE, DELETE
-public.mirrordistroarchseries                   = SELECT, UPDATE, DELETE, INSERT
-public.mirrordistroseriessource                 = SELECT, UPDATE, DELETE, INSERT
-public.mirrorproberecord                        = SELECT, INSERT
-public.packagebuild                             = SELECT
-public.person                                   = SELECT
-public.processorfamily                          = SELECT
-public.sourcepackagename                        = SELECT
-public.sourcepackagepublishinghistory           = SELECT
-public.sourcepackagerelease                     = SELECT
-public.sourcepackagereleasefile                 = SELECT
-public.teammembership                           = SELECT
+public.account                                = SELECT
+public.archive                                = SELECT
+public.archivearch                            = SELECT
+public.binarypackagebuild                     = SELECT
+public.binarypackagefile                      = SELECT
+public.binarypackagename                      = SELECT
+public.binarypackagepublishinghistory         = SELECT
+public.binarypackagerelease                   = SELECT
+public.buildfarmjob                           = SELECT
+public.component                              = SELECT
+public.componentselection                     = SELECT
+public.distribution                           = SELECT
+public.distributionmirror                     = SELECT, UPDATE
+public.distroarchseries                       = SELECT
+public.distroseries                           = SELECT
+public.emailaddress                           = SELECT
+public.libraryfilealias                       = SELECT, INSERT
+public.libraryfilecontent                     = SELECT, INSERT
+public.mirrorcdimagedistroseries              = SELECT, INSERT, UPDATE, DELETE
+public.mirrordistroarchseries                 = SELECT, UPDATE, DELETE, INSERT
+public.mirrordistroseriessource               = SELECT, UPDATE, DELETE, INSERT
+public.mirrorproberecord                      = SELECT, INSERT
+public.packagebuild                           = SELECT
+public.person                                 = SELECT
+public.processorfamily                        = SELECT
+public.sourcepackagename                      = SELECT
+public.sourcepackagepublishinghistory         = SELECT
+public.sourcepackagerelease                   = SELECT
+public.sourcepackagereleasefile               = SELECT
+public.teammembership                         = SELECT
 type=user
 
 [teammembership]
@@ -726,16 +727,16 @@
 
 [karma]
 groups=script
-public.emailaddress                             = SELECT
-public.karma                                    = SELECT
-public.karmaaction                              = SELECT
-public.karmacache                               = SELECT, INSERT, UPDATE, DELETE
-public.karmacategory                            = SELECT
-public.karmatotalcache                          = SELECT, INSERT, UPDATE, DELETE
-public.person                                   = SELECT
-public.product                                  = SELECT
-public.validpersoncache                         = SELECT
-public.validpersonorteamcache                   = SELECT
+public.emailaddress                           = SELECT
+public.karma                                  = SELECT
+public.karmaaction                            = SELECT
+public.karmacache                             = SELECT, INSERT, UPDATE, DELETE
+public.karmacategory                          = SELECT
+public.karmatotalcache                        = SELECT, INSERT, UPDATE, DELETE
+public.person                                 = SELECT
+public.product                                = SELECT
+public.validpersoncache                       = SELECT
+public.validpersonorteamcache                 = SELECT
 type=user
 
 [request-daily-builds]
@@ -783,33 +784,33 @@
 
 [cve]
 groups=script
-public.cve                                      = SELECT, INSERT, UPDATE
-public.cvereference                             = SELECT, INSERT, UPDATE, DELETE
+public.cve                                    = SELECT, INSERT, UPDATE
+public.cvereference                           = SELECT, INSERT, UPDATE, DELETE
 type=user
 
 [gina]
 groups=write,script
-public.account                                  = SELECT, INSERT
-public.accountpassword                          = SELECT, INSERT
-public.archive                                  = SELECT, UPDATE
-public.archivearch                              = SELECT, UPDATE
-public.binarypackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
-public.distribution                             = SELECT
-public.distributionjob                          = SELECT, INSERT
-public.distributionsourcepackage                = SELECT, INSERT
-public.packagediff                              = SELECT, INSERT, UPDATE
-public.sourcepackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
+public.account                                = SELECT, INSERT
+public.accountpassword                        = SELECT, INSERT
+public.archive                                = SELECT, UPDATE
+public.archivearch                            = SELECT, UPDATE
+public.binarypackagepublishinghistory         = SELECT, INSERT, UPDATE, DELETE
+public.distribution                           = SELECT
+public.distributionjob                        = SELECT, INSERT
+public.distributionsourcepackage              = SELECT, INSERT
+public.packagediff                            = SELECT, INSERT, UPDATE
+public.sourcepackagepublishinghistory         = SELECT, INSERT, UPDATE, DELETE
 type=user
 
 [archivepublisher]
 groups=write,script
 public.answercontact                    = SELECT
-public.archive                                  = SELECT, UPDATE
-public.archivearch                              = SELECT
-public.archiveauthtoken                         = SELECT, UPDATE
-public.archivepermission                        = SELECT, INSERT
-public.archivesubscriber                        = SELECT, UPDATE
-public.binarypackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
+public.archive                          = SELECT, UPDATE
+public.archivearch                      = SELECT
+public.archiveauthtoken                 = SELECT, UPDATE
+public.archivepermission                = SELECT, INSERT
+public.archivesubscriber                = SELECT, UPDATE
+public.binarypackagepublishinghistory   = SELECT, INSERT, UPDATE, DELETE
 public.bug                              = SELECT, UPDATE
 public.bugactivity                      = SELECT, INSERT
 public.bugaffectsperson                 = SELECT, INSERT, UPDATE, DELETE
@@ -830,10 +831,11 @@
 public.bugtrackeralias                  = SELECT, INSERT
 public.bugwatch                         = SELECT, INSERT
 public.cve                              = SELECT, INSERT
-public.distributionjob                          = SELECT, INSERT, DELETE
-public.distributionsourcepackage                = SELECT, INSERT, UPDATE
-public.flatpackagesetinclusion                  = SELECT, INSERT, UPDATE, DELETE
-public.gpgkey                                   = SELECT, INSERT, UPDATE
+public.distributionjob                  = SELECT, INSERT, DELETE
+public.distributionsourcepackage        = SELECT, INSERT, UPDATE
+public.flatpackagesetinclusion          = SELECT, INSERT, UPDATE, DELETE
+public.gpgkey                           = SELECT, INSERT, UPDATE
+public.job                              = SELECT, INSERT, UPDATE
 public.karma                            = SELECT, INSERT
 public.karmaaction                      = SELECT
 public.language                         = SELECT
@@ -841,21 +843,22 @@
 public.messagechunk                     = SELECT, INSERT
 public.milestone                        = SELECT
 public.packagebugsupervisor             = SELECT
-public.packagecopyrequest                       = SELECT, INSERT, UPDATE
-public.packagediff                              = SELECT, INSERT, UPDATE
-public.packageset                               = SELECT, INSERT
-public.packagesetgroup                          = SELECT
-public.packagesetinclusion                      = SELECT, INSERT, UPDATE, DELETE
-public.packagesetsources                        = SELECT, INSERT, UPDATE, DELETE
+public.packagecopyrequest               = SELECT, INSERT, UPDATE
+public.packagediff                      = SELECT, INSERT, UPDATE
+public.packageset                       = SELECT, INSERT
+public.packagesetgroup                  = SELECT
+public.packagesetinclusion              = SELECT, INSERT, UPDATE, DELETE
+public.packagesetsources                = SELECT, INSERT, UPDATE, DELETE
 public.personlanguage                   = SELECT
 public.product                          = SELECT
 public.productseries                    = SELECT
 public.project                          = SELECT
-public.publisherconfig                          = SELECT, INSERT
+public.publisherconfig                  = SELECT, INSERT
 public.question                         = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionbug                      = SELECT
 public.questionsubscription             = SELECT
-public.sourcepackagepublishinghistory           = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagepublishinghistory   = SELECT, INSERT, UPDATE, DELETE
 public.structuralsubscription           = SELECT
 public.validpersoncache                 = SELECT
 public.validpersonorteamcache           = SELECT
@@ -863,58 +866,58 @@
 
 [fiera]
 groups=script,translations_approval
-public.account                                  = SELECT
-public.archive                                  = SELECT, UPDATE
-public.archivearch                              = SELECT, UPDATE
-public.archivedependency                        = SELECT
-public.binarypackagebuild                       = SELECT, INSERT, UPDATE
-public.binarypackagefile                        = SELECT
-public.binarypackagename                        = SELECT
-public.binarypackagepublishinghistory           = SELECT
-public.binarypackagerelease                     = SELECT
-public.branch                                   = SELECT
-public.branchjob                                = SELECT, DELETE
-public.builder                                  = SELECT, INSERT, UPDATE
-public.buildfarmjob                             = SELECT, INSERT, UPDATE
-public.buildpackagejob                          = SELECT, INSERT, UPDATE, DELETE
-public.buildqueue                               = SELECT, INSERT, UPDATE, DELETE
-public.component                                = SELECT
-public.distribution                             = SELECT, UPDATE
-public.distroarchseries                         = SELECT, UPDATE
-public.distroseries                             = SELECT, UPDATE
-public.emailaddress                             = SELECT
-public.flatpackagesetinclusion                  = SELECT
-public.gpgkey                                   = SELECT
-public.job                                      = SELECT, INSERT, UPDATE, DELETE
-public.libraryfilealias                         = SELECT, INSERT
-public.libraryfilecontent                       = SELECT, INSERT
-public.packagebuild                             = SELECT, INSERT, UPDATE
-public.packageset                               = SELECT
-public.packagesetgroup                          = SELECT
-public.packagesetinclusion                      = SELECT
-public.packagesetsources                        = SELECT
-public.person                                   = SELECT
-public.pocketchroot                             = SELECT, INSERT, UPDATE
-public.processor                                = SELECT
-public.processorfamily                          = SELECT
-public.product                                  = SELECT
-public.productseries                            = SELECT
-public.publisherconfig                          = SELECT
-public.section                                  = SELECT
-public.seriessourcepackagebranch                = SELECT
-public.sourcepackagename                        = SELECT
-public.sourcepackagepublishinghistory           = SELECT
-public.sourcepackagerecipe                      = SELECT
-public.sourcepackagerecipebuild                 = SELECT, UPDATE
-public.sourcepackagerecipebuildjob              = SELECT, INSERT, UPDATE, DELETE
-public.sourcepackagerecipedata                  = SELECT
-public.sourcepackagerecipedatainstruction       = SELECT
-public.sourcepackagerelease                     = SELECT
-public.sourcepackagereleasefile                 = SELECT
-public.teammembership                           = SELECT
-public.teamparticipation                        = SELECT
-public.translationimportqueueentry              = SELECT, INSERT, UPDATE
-public.translationtemplatesbuild                = SELECT, INSERT
+public.account                                = SELECT
+public.archive                                = SELECT, UPDATE
+public.archivearch                            = SELECT, UPDATE
+public.archivedependency                      = SELECT
+public.binarypackagebuild                     = SELECT, INSERT, UPDATE
+public.binarypackagefile                      = SELECT
+public.binarypackagename                      = SELECT
+public.binarypackagepublishinghistory         = SELECT
+public.binarypackagerelease                   = SELECT
+public.branch                                 = SELECT
+public.branchjob                              = SELECT, DELETE
+public.builder                                = SELECT, INSERT, UPDATE
+public.buildfarmjob                           = SELECT, INSERT, UPDATE
+public.buildpackagejob                        = SELECT, INSERT, UPDATE, DELETE
+public.buildqueue                             = SELECT, INSERT, UPDATE, DELETE
+public.component                              = SELECT
+public.distribution                           = SELECT, UPDATE
+public.distroarchseries                       = SELECT, UPDATE
+public.distroseries                           = SELECT, UPDATE
+public.emailaddress                           = SELECT
+public.flatpackagesetinclusion                = SELECT
+public.gpgkey                                 = SELECT
+public.job                                    = SELECT, INSERT, UPDATE, DELETE
+public.libraryfilealias                       = SELECT, INSERT
+public.libraryfilecontent                     = SELECT, INSERT
+public.packagebuild                           = SELECT, INSERT, UPDATE
+public.packageset                             = SELECT
+public.packagesetgroup                        = SELECT
+public.packagesetinclusion                    = SELECT
+public.packagesetsources                      = SELECT
+public.person                                 = SELECT
+public.pocketchroot                           = SELECT, INSERT, UPDATE
+public.processor                              = SELECT
+public.processorfamily                        = SELECT
+public.product                                = SELECT
+public.productseries                          = SELECT
+public.publisherconfig                        = SELECT
+public.section                                = SELECT
+public.seriessourcepackagebranch              = SELECT
+public.sourcepackagename                      = SELECT
+public.sourcepackagepublishinghistory         = SELECT
+public.sourcepackagerecipe                    = SELECT
+public.sourcepackagerecipebuild               = SELECT, UPDATE
+public.sourcepackagerecipebuildjob            = SELECT, INSERT, UPDATE, DELETE
+public.sourcepackagerecipedata                = SELECT
+public.sourcepackagerecipedatainstruction     = SELECT
+public.sourcepackagerelease                   = SELECT
+public.sourcepackagereleasefile               = SELECT
+public.teammembership                         = SELECT
+public.teamparticipation                      = SELECT
+public.translationimportqueueentry            = SELECT, INSERT, UPDATE
+public.translationtemplatesbuild              = SELECT, INSERT
 type=user
 
 [ppa-apache-log-parser]
@@ -973,45 +976,45 @@
 
 [sync_packages]
 groups=script
-public.archive                                  = SELECT
-public.archivepermission                        = SELECT, INSERT
-public.binarypackagebuild                       = SELECT, INSERT
-public.binarypackagefile                        = SELECT, INSERT
-public.binarypackagename                        = SELECT
-public.binarypackagepublishinghistory           = SELECT, INSERT
-public.binarypackagerelease                     = SELECT
-public.buildfarmjob                             = SELECT, INSERT
-public.buildpackagejob                          = SELECT, INSERT, UPDATE, DELETE
-public.buildqueue                               = SELECT, INSERT, UPDATE
-public.component                                = SELECT
-public.componentselection                       = SELECT, INSERT
-public.distribution                             = SELECT
-public.distributionjob                          = SELECT
-public.distroarchseries                         = SELECT, INSERT
-public.distroseries                             = SELECT, UPDATE
-public.flatpackagesetinclusion                  = SELECT, INSERT
-public.gpgkey                                   = SELECT
-public.job                                      = SELECT, INSERT, UPDATE, DELETE
-public.libraryfilealias                         = SELECT, INSERT, UPDATE, DELETE
-public.libraryfilecontent                       = SELECT, INSERT
-public.packagebuild                             = SELECT, INSERT
-public.packageset                               = SELECT, INSERT
-public.packagesetgroup                          = SELECT, INSERT
-public.packagesetinclusion                      = SELECT, INSERT
-public.packagesetsources                        = SELECT, INSERT
-public.packageupload                            = SELECT
-public.packaging                                = SELECT, INSERT
-public.person                                   = SELECT
-public.pocketchroot                             = SELECT
-public.processor                                = SELECT
-public.processorfamily                          = SELECT
-public.section                                  = SELECT
-public.sectionselection                         = SELECT, INSERT
-public.sourcepackageformatselection             = SELECT, INSERT
-public.sourcepackagename                        = SELECT
-public.sourcepackagepublishinghistory           = SELECT, INSERT
-public.sourcepackagerelease                     = SELECT
-public.sourcepackagereleasefile                 = SELECT, INSERT, UPDATE
+public.archive                                = SELECT
+public.archivepermission                      = SELECT, INSERT
+public.binarypackagebuild                     = SELECT, INSERT
+public.binarypackagefile                      = SELECT, INSERT
+public.binarypackagename                      = SELECT
+public.binarypackagepublishinghistory         = SELECT, INSERT
+public.binarypackagerelease                   = SELECT
+public.buildfarmjob                           = SELECT, INSERT
+public.buildpackagejob                        = SELECT, INSERT, UPDATE, DELETE
+public.buildqueue                             = SELECT, INSERT, UPDATE
+public.component                              = SELECT
+public.componentselection                     = SELECT, INSERT
+public.distribution                           = SELECT
+public.distributionjob                        = SELECT
+public.distroarchseries                       = SELECT, INSERT
+public.distroseries                           = SELECT, UPDATE
+public.flatpackagesetinclusion                = SELECT, INSERT
+public.gpgkey                                 = SELECT
+public.job                                    = SELECT, INSERT, UPDATE, DELETE
+public.libraryfilealias                       = SELECT, INSERT, UPDATE, DELETE
+public.libraryfilecontent                     = SELECT, INSERT
+public.packagebuild                           = SELECT, INSERT
+public.packageset                             = SELECT, INSERT
+public.packagesetgroup                        = SELECT, INSERT
+public.packagesetinclusion                    = SELECT, INSERT
+public.packagesetsources                      = SELECT, INSERT
+public.packageupload                          = SELECT
+public.packaging                              = SELECT, INSERT
+public.person                                 = SELECT
+public.pocketchroot                           = SELECT
+public.processor                              = SELECT
+public.processorfamily                        = SELECT
+public.section                                = SELECT
+public.sectionselection                       = SELECT, INSERT
+public.sourcepackageformatselection           = SELECT, INSERT
+public.sourcepackagename                      = SELECT
+public.sourcepackagepublishinghistory         = SELECT, INSERT
+public.sourcepackagerelease                   = SELECT
+public.sourcepackagereleasefile               = SELECT, INSERT, UPDATE
 type=user
 
 [distroseriesdifferencejob]
@@ -1183,7 +1186,7 @@
 public.distribution                     = SELECT
 public.emailaddress                     = SELECT
 public.faq                              = SELECT
-public.job                              = SELECT, UPDATE
+public.job                              = SELECT, INSERT, UPDATE
 public.language                         = SELECT
 public.message                          = SELECT, INSERT
 public.messagechunk                     = SELECT, INSERT
@@ -1192,7 +1195,7 @@
 public.product                          = SELECT
 public.question                         = SELECT, UPDATE
 public.questionbug                      = SELECT
-public.questionjob                      = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionmessage                  = SELECT, INSERT
 public.questionsubscription             = SELECT
 public.sourcepackagename                = SELECT
@@ -1285,6 +1288,7 @@
 public.project                          = SELECT, UPDATE
 public.question                         = SELECT
 public.questionbug                      = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionsubscription             = SELECT
 public.section                          = SELECT, INSERT
 public.sectionselection                 = SELECT
@@ -1389,6 +1393,7 @@
 public.publisherconfig                  = SELECT
 public.question                         = SELECT
 public.questionbug                      = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionsubscription             = SELECT
 public.section                          = SELECT
 public.sectionselection                 = SELECT
@@ -1464,6 +1469,7 @@
 public.project                          = SELECT, UPDATE
 public.question                         = SELECT
 public.questionbug                      = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionsubscription             = SELECT
 public.section                          = SELECT
 public.sourcepackagename                = SELECT
@@ -1667,6 +1673,7 @@
 public.project                          = SELECT, UPDATE
 public.question                         = SELECT, UPDATE
 public.questionbug                      = SELECT
+public.questionjob                      = SELECT, INSERT
 public.questionmessage                  = SELECT, INSERT
 public.questionsubscription             = SELECT
 public.section                          = SELECT
@@ -2026,6 +2033,7 @@
 public.project                          = SELECT, UPDATE
 public.pushmirroraccess                 = SELECT, UPDATE
 public.question                         = SELECT, UPDATE
+public.questionjob                      = SELECT, UPDATE
 public.questionreopening                = SELECT, UPDATE
 public.questionsubscription             = SELECT, UPDATE, DELETE
 public.revisionauthor                   = SELECT, UPDATE

=== modified file 'lib/lp/answers/browser/tests/views.txt'
--- lib/lp/answers/browser/tests/views.txt	2011-04-27 13:59:57 +0000
+++ lib/lp/answers/browser/tests/views.txt	2011-05-04 17:17:01 +0000
@@ -19,22 +19,6 @@
     >>> firefox_question.subscribe(firefox_question.owner)
     <QuestionSubscription...>
 
-    # Let's define a helper function which commits the transaction, so
-    # that the notifications are queued in stub.test_emails and pops these
-    # notifications from the queue.
-
-    >>> from lp.services.mail import stub
-    >>> import email
-    >>> import transaction
-    >>> def pop_notifications():
-    ...     transaction.commit()
-    ...     notifications = [
-    ...         email.message_from_string(raw_message)
-    ...         for fromaddr, toaddrs, raw_message in sorted(stub.test_emails)
-    ...     ]
-    ...     stub.test_emails = []
-    ...     return notifications
-
 
 QuestionSubscriptionView
 ------------------------
@@ -84,11 +68,6 @@
     >>> view.request.response.getHeader('Location')
     '.../+question/3'
 
-These two actions didn't generate any notification mails:
-
-    >>> len(pop_notifications())
-    0
-
 
 QuestionWorkflowView
 --------------------
@@ -155,13 +134,6 @@
     >>> workflow_harness.redirectionTarget()
     '.../+question/2'
 
-Workflow actions like these will send out notifications to subscribers.
-(Complete notifications testing will be found in answer-tracker-
-notifications.txt)
-
-    >>> len(pop_notifications())
-    1
-
 The available actions for that other user are still comment, give an
 answer or request more information:
 
@@ -347,10 +319,6 @@
     >>> workflow_harness.redirectionTarget()
     '.../+question/2'
 
-    # Clear all notifications.
-
-    >>> notifications = pop_notifications()
-
 
 QuestionMakeBugView
 -------------------
@@ -359,9 +327,6 @@
 question. In addition to creating a bug, this operation will also link
 the bug to the question.
 
-If the user creates a bug, a "Linked to bug" notification is sent and
-the user is subscribed to the bug.
-
     >>> login('[e-mail]')
     >>> request = LaunchpadTestRequest(
     ...     form={'field.actions.create': 'Create',
@@ -393,19 +358,6 @@
     >>> 'Bug #%s created.' % new_bug_id in message[0]
     True
 
-    >>> notifications = pop_notifications()
-    >>> len(notifications)
-    1
-
-    >>> print notifications[0].get_payload(decode=True)
-    Your question #3...
-    ...
-        Linked to bug: #...
-
-        http://bugs.launchpad.dev/bugs/...
-        "Bug title"
-    ...
-
 If the question already has bugs linked to it, no new bug can be
 created.
 
@@ -471,10 +423,6 @@
     >>> print firefox_question.status.title
     Solved
 
-    # Clear the notification.
-
-    >>> notifications = pop_notifications()
-
 
 QuestionEditView
 ----------------
@@ -586,10 +534,6 @@
     >>> print question_three.product.name
     firefox
 
-    # Clear out the pending notifications.
-
-    >>> notifications = pop_notifications()
-
     # Reassign back the question to ubuntu
 
     >>> question_three.target = ubuntu

=== modified file 'lib/lp/answers/doc/notifications.txt'
--- lib/lp/answers/doc/notifications.txt	2011-04-27 13:59:57 +0000
+++ lib/lp/answers/doc/notifications.txt	2011-05-04 17:17:01 +0000
@@ -7,9 +7,9 @@
 notification looks like:
 
     >>> from zope.event import notify
-    >>> from lazr.lifecycle.event import ObjectCreatedEvent
+    >>> from lp.answers.tests.test_question_notifications import (
+    ...     pop_questionemailjobs)
     >>> from lp.registry.interfaces.distribution import IDistributionSet
-    >>> from lp.testing.mail_helpers import pop_notifications
     >>> login('[e-mail]')
     >>> sample_person = getUtility(ILaunchBag).user
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
@@ -29,7 +29,7 @@
     >>> [sub.person.displayname for sub in ubuntu_question.subscriptions]
     [u'Sample Person']
 
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
     1
 
@@ -41,44 +41,26 @@
 Danilo have a story worth telling.
 
     >>> add_notification = notifications[0]
-    >>> add_notification['From']
-    'Sample Person <[e-mail]>'
-
-    >>> add_notification['Reply-To']
-    '[e-mail]'
-
-    >>> add_notification['To']
-    '[e-mail]'
-
-    >>> add_notification['Subject']
-    "[Question #...]: Can't install Ubuntu"
+
+    >>> print add_notification.subject
+    [Question #...]: Can't install Ubuntu
 
 Like all Launchpad notifications should, the message contain in the
 footer the reason why the user is receiving the notification.
 
-    >>> notification_body = add_notification.get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print add_notification.body
     New question #... on Ubuntu:
     http://.../ubuntu/+question/...
     <BLANKLINE>
     I insert the install CD in the CD-ROM drive, but it won't boot.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 The notification also includes a 'X-Launchpad-Question' header that
 contains information about the question.
 
-    >>> print add_notification['X-Launchpad-Question']
+    >>> print add_notification.headers['X-Launchpad-Question']
     distribution=ubuntu; sourcepackage=None; status=Open;
     assignee=None; priority=Normal; language=en
 
-As well as the standard 'X-Launchpad-Message-Rationale' header that
-contains in short format the reason for the user to be contacted.
-
-    >>> print add_notification['X-Launchpad-Message-Rationale']
-    Asker
-
 Register the Ubuntu Team as Ubuntu's answer contact, so that they get
 notified about the changes as well:
 
@@ -124,17 +106,12 @@
 Three copies of the notification got sent, one to Sample Person, one to
 Foo Bar, and one to Ubuntu Team:
 
-    >>> from operator import itemgetter
-    >>> notifications = sorted(pop_notifications(), key=itemgetter('To'))
-    >>> [notification['To'] for notification in notifications]
-    ['[e-mail]', '[e-mail]', '[e-mail]']
-
-    >>> edit_notification = notifications[0]
-    >>> notification_body = edit_notification.get_payload(decode=True)
-    >>> print edit_notification['Subject']
+    >>> notifications = pop_questionemailjobs()
+    >>> edit_notification = notifications[1]
+    >>> print edit_notification.subject
     Re: [Question #...]: Installer doesn't work on a Mac
 
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print edit_notification.body
     Question #... libstdc++ in Ubuntu changed:
     http://.../ubuntu/+source/libstdc++/+question/...
     <BLANKLINE>
@@ -148,10 +125,6 @@
     drive, but it won't boot.
     <BLANKLINE>
     It boots straight into MacOS 9.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are the assignee for
-    this question.
 
 # XXX flacoste 2006-09-19: Add checks for notification of change to #
 status whiteboard, priority. For example, if a question is # transferred
@@ -163,21 +136,13 @@
     >>> ubuntu_question.target = ubuntu
     >>> notify(ObjectModifiedEvent(
     ...     ubuntu_question, unmodified_question, ['target']))
-    >>> notifications = sorted(pop_notifications(), key=itemgetter('To'))
-    >>> [notification['To'] for notification in notifications]
-    ['[e-mail]', '[e-mail]', '[e-mail]']
-
-    >>> edit_notification = notifications[0]
-    >>> notification_body = edit_notification.get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notifications = pop_questionemailjobs()
+    >>> edit_notification = notifications[1]
+    >>> print edit_notification.body
     Question #... Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
         Project: libstdc++ in Ubuntu => Ubuntu
-    <BLANKLINE>
-    --...
-    You received this question notification because you are the assignee for
-    this question.
 
 Changing the assignee will trigger a notification.
 
@@ -187,21 +152,13 @@
     >>> ubuntu_question.assignee = no_priv
     >>> notify(ObjectModifiedEvent(
     ...     ubuntu_question, unmodified_question, ['assignee']))
-    >>> notifications = sorted(pop_notifications(), key=itemgetter('To'))
-    >>> [notification['To'] for notification in notifications]
-    ['[e-mail]', '[e-mail]', '[e-mail]']
-
-    >>> edit_notification = notifications[0]
-    >>> notification_body = edit_notification.get_payload(decode=True)
-    >>> print notification_body
+    >>> notifications = pop_questionemailjobs()
+    >>> edit_notification = notifications[1]
+    >>> print edit_notification.body
     Question #... Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
         Assignee: Foo Bar => No Privileges Person
-    <BLANKLINE>
-    --...
-    You received this question notification because you are the assignee for
-    this question.
 
 If we trigger a modification event when no changes worth notifying about
 was made, no notification is sent:
@@ -211,7 +168,7 @@
     >>> notify(ObjectModifiedEvent(
     ...     ubuntu_question, unmodified_question, ['status']))
 
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
     0
 
@@ -245,23 +202,18 @@
     >>> notify(ObjectModifiedEvent(
     ...     ubuntu_question, unmodified_question, ['bugs']))
 
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
     2
 
-    >>> edit_notification = notifications[0]
-    >>> notification_body = edit_notification.get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> edit_notification = notifications[1]
+    >>> print edit_notification.body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
         Linked to bug: #...
         http://.../bugs/...
         "Installer fails on a Mac PPC"
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 
 Bug Unlinked Notification
@@ -277,23 +229,18 @@
     >>> notify(ObjectModifiedEvent(
     ...     ubuntu_question, unmodified_question, ['bugs']))
 
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
     2
 
-    >>> edit_notification = notifications[0]
-    >>> notification_body = edit_notification.get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> edit_notification = notifications[1]
+    >>> print edit_notification.body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
         Removed link to bug: #...
         http://.../bugs/...
         "Installer fails on a Mac PPC"
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 
 Linked Bug Status Changed Notification
@@ -314,13 +261,10 @@
     >>> request_message = ubuntu_question.requestInfo(
     ...     no_priv, "What is your Mac model?")
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
-
-    >>> support_notification = notifications[0]
-    >>> support_notification['Subject']
-    "Re: [Question #...]: Installer doesn't work on a Mac"
+    >>> notifications = pop_questionemailjobs()
+    >>> support_notification = notifications[1]
+    >>> print support_notification.subject
+    Re: [Question #...]: Installer doesn't work on a Mac
 
 For workflow notifications, the content of the notification is slightly
 different based on whether you are the question owner or somebody else.
@@ -328,8 +272,7 @@
 For example, the notification to the answer contacts and every other
 subscribers except the question owner will look like this:
 
-    >>> notification_body = support_notification.get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print support_notification.body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -337,16 +280,11 @@
     <BLANKLINE>
     No Privileges Person requested more information:
     What is your Mac model?
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 But the owner notification has a slightly different preamble and has an
 extra footer.
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -359,8 +297,6 @@
     To answer this request for more information, you can either reply to
     this email or enter your reply at the following page:
     http://.../ubuntu/+question/...
-    <BLANKLINE>
-    You received this question notification because you asked the question.
 
 Of course, if the owner unsubscribe from the question, he won't receives
 a notification.
@@ -369,12 +305,8 @@
     >>> ubuntu_question.unsubscribe(sample_person)
     >>> message = ubuntu_question.giveInfo('A PowerMac 7200.')
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]']
-
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notifications = pop_questionemailjobs()
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -382,15 +314,11 @@
     <BLANKLINE>
     Sample Person gave more information on the question:
     A PowerMac 7200.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 The notification for new messages on the question contain a 'References'
 header to the previous message for threading purpose.
 
-    >>> references = notifications[0]['References']
+    >>> references = notifications[0].headers['References']
     >>> print references
     <...>
 
@@ -413,15 +341,11 @@
     >>> login('[e-mail]')
     >>> message = ubuntu_question.expireQuestion(
     ...     no_priv, "Expired because of no recent activity.")
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when the question is expired:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -430,14 +354,10 @@
     No Privileges Person expired the question:
     Expired because of no recent activity.
     <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -451,8 +371,6 @@
     by replying to this email or by going to the following page and
     entering more information about your problem:
     http://.../ubuntu/+question/...
-    <BLANKLINE>
-    You received this question notification because you asked the question.
 
 
 Notifications for reopen()
@@ -473,20 +391,16 @@
     ...         "newbie."),
     ...     owner=sample_person)
     >>> message = ubuntu_question.reopen(email_msg)
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Notice also how the 'Re' handling is handled nicely:
 
-    >>> print notifications[0]['Subject']
+    >>> print notifications[0].subject
     Re: [Question #...]: Installer doesn't work on a Mac
 
 Default notification when the owner reopens the question:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -497,15 +411,10 @@
     useful.
     <BLANKLINE>
     Please provide some help to a newbie.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -516,9 +425,6 @@
     useful.
     <BLANKLINE>
     Please provide some help to a newbie.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 
 Notifications for giveAnswer()
@@ -533,14 +439,11 @@
     ...     "https://help.ubuntu.com/community/Installation/OldWorldMacs "
     ...     "for all the details.")
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when an answer is proposed:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -553,15 +456,10 @@
     <BLANKLINE>
     Consult https://help.ubuntu.com/community/Installation/OldWorldMacs for
     all the details.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -583,8 +481,6 @@
     If you still need help, you can reply to this email or go to the
     following page to enter your feedback:
     http://.../ubuntu/+question/...
-    <BLANKLINE>
-    You received this question notification because you asked the question.
 
 
 Notifications for confirm()
@@ -595,14 +491,11 @@
     ...     "I've installed BootX and the installer CD is now booting. "
     ...     "Thanks!", answer=answer_message)
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when the owner confirms an answer:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -610,15 +503,10 @@
     <BLANKLINE>
     Sample Person confirmed that the question is solved:
     I've installed BootX and the installer CD is now booting. Thanks!
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -626,9 +514,6 @@
     <BLANKLINE>
     You confirmed that the question is solved:
     I've installed BootX and the installer CD is now booting. Thanks!
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 
 Notifications for addComment()
@@ -639,38 +524,27 @@
     ...     no_priv, "Unless you have lots of RAM... and even then, the "
     ...     "system will probably be very slow.")
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when a comment is posted:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
     No Privileges Person posted a new comment:
     Unless you have lots of RAM... and even then, the system will probably
     be very slow.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
     No Privileges Person posted a new comment:
     Unless you have lots of RAM... and even then, the system will probably
     be very slow.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 
 Notifications for reject()
@@ -681,14 +555,11 @@
     >>> message = ubuntu_question.reject(
     ...     foo_bar, "Yeah! It will be awfully slow.")
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when the question is rejected:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -697,14 +568,10 @@
     Foo Bar rejected the question:
     Yeah! It will be awfully slow.
     <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -718,8 +585,6 @@
     explaining your point of view either by replying to this email or at
     the following page:
     http://.../ubuntu/+question/...
-    <BLANKLINE>
-    You received this question notification because you asked the question.
 
 
 Notifications for setStatus()
@@ -730,14 +595,11 @@
     >>> message = ubuntu_question.setStatus(
     ...     foo_bar, QuestionStatus.SOLVED, "The rejection was a mistake.")
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
 Default notification when somebody changes the status:
 
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[1].body
     Question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -745,15 +607,10 @@
     <BLANKLINE>
     Foo Bar changed the question status:
     The rejection was a mistake.
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Notification received by the owner:
 
-    >>> notification_body = notifications[1].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> print notifications[0].body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -761,9 +618,6 @@
     <BLANKLINE>
     Foo Bar changed the question status:
     The rejection was a mistake.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 
 Notifications for linkFAQ()
@@ -777,10 +631,7 @@
     >>> firefox = getUtility(IProductSet).getByName('firefox')
     >>> firefox_question = firefox.newQuestion(
     ...     no_priv, 'How can I play Flash?', 'I want Flash!')
-
-    # Discard notifications.
-
-    >>> notifications = pop_notifications()
+    >>> ignore = pop_questionemailjobs()
 
     >>> login('[e-mail]')
     >>> firefox_faq = firefox.getFAQ(10)
@@ -789,13 +640,9 @@
 
     >>> message = firefox_question.linkFAQ(
     ...     sample_person, firefox_faq, "Read the FAQ.")
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]']
-
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notifications = pop_questionemailjobs()
+
+    >>> print notifications[0].body
     Your question #... on Mozilla Firefox changed:
     http://answers.launchpad.dev/firefox/+question/...
     <BLANKLINE>
@@ -814,13 +661,9 @@
 
     >>> message = firefox_question.linkFAQ(
     ...     sample_person, None, "Sorry, this wasn't so useful.")
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]']
-
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notifications = pop_questionemailjobs()
+
+    >>> print notifications[0].body
     Your question #... on Mozilla Firefox changed:
     http://answers.launchpad.dev/firefox/+question/...
     <BLANKLINE>
@@ -841,49 +684,9 @@
 from bugs just like when a question is normally created.
 
     >>> bug_question = ubuntu.createQuestionFromBug(bug)
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
-    4
-
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]',
-     '[e-mail]', '[e-mail]']
-
-
-Notifications and Teams
------------------------
-
-When a team is subscribed to a question, there are two cases two
-consider. The first one is if the team has an email address set, a
-notification will only be sent to that address. (That email address is
-assumed to be a mailing list reaching all the team members.) We already
-saw an example of that case with the Ubuntu Team in the examples above.
-
-The other case is when the team doesn't have an email address set. In
-that case, all the team members will be notified individually.
-
-    >>> launchpad_devs = getUtility(IPersonSet).getByName('launchpad')
-    >>> ubuntu_question.subscribe(launchpad_devs)
-    <QuestionSubscription...>
-
-    >>> login('[e-mail]')
-    >>> message = ubuntu_question.addComment(sample_person, 'A comment.')
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]', '[e-mail]']
-
-Of course, if the user is also individually subscribed to the question,
-he will receives only one notification:
-
-    >>> ubuntu_question.subscribe(foo_bar)
-    <QuestionSubscription...>
-
-    >>> message = ubuntu_question.addComment(sample_person, 'A comment.')
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]', '[e-mail]']
+    3
 
 
 Notifications and Localized Questions
@@ -915,13 +718,10 @@
     ...         u'corretamente e mostra a minha versao do java. No entanto, '
     ...         u'mover o mouse na pagina faz com que o firefox quebre.'),
     ...     language=getUtility(ILanguageSet)['pt_BR'])
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
-    >>> from email.Header import decode_header, make_header
-    >>> unicode(make_header(decode_header(notifications[0]['Subject'])))
-    u'[Question #...]: Abrir uma p\xe1gina que requer java quebra o firefox'
+    >>> print notifications[0].subject.encode('ASCII', 'backslashreplace')
+    [Question #...]: Abrir uma p\xe1gina que requer java quebra o firefox
 
 Similarly, when a question in a non-English language is modified or its
 status changed, only the subscribers speaking that language will receive
@@ -931,9 +731,7 @@
     ...     "Veja o screenshot: http://tinyurl.com/y8jq8z")
     <QuestionMessage...>
 
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
+    >>> ignore = pop_questionemailjobs()
 
 The exception to these general rules is that when a question is created
 in language spoken by none of the answer contacts, each one will receive
@@ -949,43 +747,35 @@
     ...     sample_person, title="Impossible d'installer Ubuntu",
     ...     description=u"Le CD ne semble pas fonctionn\xe9.",
     ...     language=french)
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]',
-     '[e-mail]']
+    >>> notifications = pop_questionemailjobs()
 
-    >>> notifications[0]['Subject']
-    "[Question #...]: (French) Impossible d'installer Ubuntu"
+    >>> print notifications[1].subject
+    [Question #...]: (French) Impossible d'installer Ubuntu
 
     # Define a function that will replace non-ascii character with
     # its unicoded encoded value.
     # Effectively replace u'\xe9' by '\\e9'.
 
-    >>> def escape_utf8_payload(message):
-    ...     charset = message.get_content_charset()
-    ...     content = unicode(message.get_payload(decode=True), charset)
-    ...     return content.encode('us-ascii', 'backslashreplace')
+    >>> def recode_text(notification):
+    ...     return notification.body.encode('ASCII', 'backslashreplace')
 
-    >>> notification_body = escape_utf8_payload(notifications[0])
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notification_body = recode_text(notifications[1])
+    >>> print notification_body
     A question was asked in a language (French) spoken by
     none of the registered Ubuntu answer contacts.
     <BLANKLINE>
     http://.../ubuntu/+question/...
     <BLANKLINE>
     Le CD ne semble pas fonctionn\xe9...
-    --...
-    You received this question notification because you are an answer
-    contact for Ubuntu.
 
 The notification received by the question owner contain a warning that
 the question is in a language spoken by none of the answer contacts:
 
-    >>> notifications[-1]['Subject']
-    "[Question #...]: Impossible d'installer Ubuntu"
+    >>> print notifications[0].subject
+    [Question #...]: Impossible d'installer Ubuntu
 
-    >>> notification_body = escape_utf8_payload(notifications[-1])
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notification_body = recode_text(notifications[0])
+    >>> print notification_body
     New question #... on Ubuntu:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -993,9 +783,6 @@
     <BLANKLINE>
     WARNING: This question is asked in a language (French)
     spoken by none of the registered Ubuntu answer contacts.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
 
 No notification will be sent to the answer contacts when this question
 is modified. Only the owner will receive a modification notification
@@ -1006,13 +793,10 @@
     >>> french_question.title = u"CD d'Ubuntu ne d\xe9marre pas"
     >>> notify(ObjectModifiedEvent(
     ...     french_question, unmodified_question, ['title']))
-
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]']
-
-    >>> notification_body = escape_utf8_payload(notifications[0])
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+    >>> notifications = pop_questionemailjobs()
+
+    >>> notification_body = recode_text(notifications[0])
+    >>> print notification_body
     Your question #... on Ubuntu changed:
     http://.../ubuntu/+question/...
     <BLANKLINE>
@@ -1021,89 +805,3 @@
     <BLANKLINE>
     WARNING: This question is asked in a language (French)
     spoken by none of the registered Ubuntu answer contacts.
-    <BLANKLINE>
-    --...
-    You received this question notification because you asked the question.
-
-
-Localized Questions and Teams
-.............................
-
-We will notify the team only if the question language is in one of the
-team's preferred languages. The languages spoken by the team members is
-unimportant.
-
-For example, the rosetta admins team becomes an Answer contact for
-English questions. Carlos speaks Spanish, and he is an answer contact
-for Ubuntu. He is also a member of the rosetta admins team. The team
-wont receive emails because of his membership when they become answer
-contacts too.
-
-    >>> rosetta_admins = getUtility(IPersonSet).getByName('rosetta-admins')
-    >>> [lang.code for lang in rosetta_admins.languages]
-    []
-
-    >>> rosetta_admins.addLanguage(getUtility(ILanguageSet)['en'])
-    >>> carlos = getUtility(IPersonSet).getByName('carlos')
-    >>> carlos.inTeam(rosetta_admins)
-    True
-
-    >>> spanish = getUtility(ILanguageSet)['es']
-    >>> spanish in carlos.languages
-    True
-
-    >>> ubuntu.addAnswerContact(carlos)
-    True
-
-    >>> ubuntu.addAnswerContact(rosetta_admins)
-    True
-
-    >>> spanish_question = ubuntu.newQuestion(
-    ...     sample_person, title="Necesidad ayuda con Firefox",
-    ...     description="No puedo acceso al Internet en Firefox.",
-    ...     language=spanish)
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
-
-    >>> ubuntu.removeAnswerContact(carlos)
-    True
-
-But if the team languages attribute is set, this set of languages will
-be used. So, if the team only officially speaks French, it will only
-receive notifications about French (and English) questions.
-
-    >>> rosetta_admins.addLanguage(french)
-
-    # Resend the new message notification
-
-    >>> notify(ObjectCreatedEvent(french_question))
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
-
-When the team doesn't use an explicit address. All team members will be
-contacted if the question language is supported. For example, the
-Launchpad Developers team doesn't have any preferred email address set.
-Its only member, Foo Bar will receive a notification if the team
-supported languages includes the question language:
-
-    >>> launchpad_devs = getUtility(IPersonSet).getByName('launchpad')
-    >>> list(launchpad_devs.languages)
-    []
-
-    >>> [member.name for member in launchpad_devs.activemembers]
-    [u'name16']
-
-    >>> launchpad_devs.addLanguage(spanish)
-    >>> ubuntu.addAnswerContact(launchpad_devs)
-    True
-
-    # Resend the new message notification
-
-    >>> notify(ObjectCreatedEvent(spanish_question))
-    >>> notifications = pop_notifications()
-    >>> [email_msg['To'] for email_msg in notifications]
-    ['[e-mail]', '[e-mail]']
-
-

=== modified file 'lib/lp/answers/model/questionjob.py'
--- lib/lp/answers/model/questionjob.py	2011-04-28 18:40:45 +0000
+++ lib/lp/answers/model/questionjob.py	2011-05-04 17:17:01 +0000
@@ -51,6 +51,7 @@
 from lp.services.job.runner import BaseRunnableJob
 from lp.services.mail.mailwrapper import MailWrapper
 from lp.services.mail.notificationrecipientset import NotificationRecipientSet
+from lp.services.mail.sendmail import format_address_for_person
 from lp.services.propertycache import cachedproperty
 
 
@@ -170,7 +171,7 @@
 
     def getErrorRecipients(self):
         """See `IRunnableJob`."""
-        return self.user
+        return [format_address_for_person(self.user)]
 
     @property
     def from_address(self):

=== modified file 'lib/lp/answers/notification.py'
--- lib/lp/answers/notification.py	2011-04-27 13:59:57 +0000
+++ lib/lp/answers/notification.py	2011-05-04 17:17:01 +0000
@@ -10,16 +10,17 @@
 
 import os
 
+from zope.component import getUtility
+
 from canonical.config import config
-from canonical.launchpad.mail import (
-    format_address,
-    simple_sendmail,
+from canonical.launchpad.webapp.publisher import canonical_url
+from lp.answers.enums import (
+    QuestionAction,
+    QuestionRecipientSet,
     )
-from canonical.launchpad.webapp.publisher import canonical_url
-from lp.answers.enums import QuestionAction
+from lp.answers.interfaces.questionjob import IQuestionEmailJobSource
 from lp.registry.interfaces.person import IPerson
 from lp.services.mail.mailwrapper import MailWrapper
-from lp.services.mail.notificationrecipientset import NotificationRecipientSet
 from lp.services.propertycache import cachedproperty
 
 
@@ -41,6 +42,8 @@
     QuestionNotification can be registered as event subscribers.
     """
 
+    recipient_set = QuestionRecipientSet.ASKER_SUBSCRIBER
+
     def __init__(self, question, event):
         """Base constructor.
 
@@ -51,25 +54,15 @@
         self.event = event
         self._user = IPerson(self.event.user)
         self.initialize()
+        self.job = None
         if self.shouldNotify():
-            self.send()
+            self.job = self.enqueue()
 
     @property
     def user(self):
         """Return the user from the event. """
         return self._user
 
-    def getFromAddress(self):
-        """Return a formatted email address suitable for user in the From
-        header of the question notification.
-
-        Default is Event Person Display Name <question#@answertracker_domain>
-        """
-        return format_address(
-            self.user.displayname,
-            'question%s@%s' % (
-                self.question.id, config.answertracker.email_domain))
-
     def getSubject(self):
         """Return the subject of the notification.
 
@@ -114,18 +107,6 @@
 
         return headers
 
-    def getRecipients(self):
-        """Return the recipient of the notification.
-
-        Default to the question's subscribers that speaks the request
-        languages. If the question owner is subscribed, he's always consider
-        to speak the language.
-
-        :return: A `INotificationRecipientSet` containing the recipients and
-                 rationale.
-        """
-        return self.question.getRecipients()
-
     def initialize(self):
         """Initialization hook for subclasses.
 
@@ -144,32 +125,16 @@
         """
         return True
 
-    def buildBody(self, body, rationale):
-        """Wrap the body and ensure the rationale is is separated."""
-        wrapper = MailWrapper()
-        body_parts = [body, wrapper.format(rationale)]
-        if '\n-- ' not in body:
-            body_parts.insert(1, '-- ')
-        return '\n'.join(body_parts)
-
-    def send(self):
-        """Sends the notification to all the notification recipients.
-
-        This method takes care of adding the rationale for contacting each
-        recipient and also sets the X-Launchpad-Message-Rationale header on
-        each message.
-        """
-        from_address = self.getFromAddress()
+    def enqueue(self):
+        """Create a job to send email about the event."""
         subject = self.getSubject()
         body = self.getBody()
         headers = self.getHeaders()
-        recipients = self.getRecipients()
-        for email in recipients.getEmails():
-            rationale, header = recipients.getReason(email)
-            headers['X-Launchpad-Message-Rationale'] = header
-            formatted_body = self.buildBody(body, rationale)
-            simple_sendmail(
-                from_address, email, subject, formatted_body, headers)
+        job_source = getUtility(IQuestionEmailJobSource)
+        job = job_source.create(
+            self.question, self.user, self.recipient_set,
+            subject, body, headers)
+        return job
 
     @property
     def unsupported_language(self):
@@ -215,6 +180,7 @@
 class QuestionModifiedDefaultNotification(QuestionNotification):
     """Base implementation of a notification when a question is modified."""
 
+    recipient_set = QuestionRecipientSet.SUBSCRIBER
     # Email template used to render the body.
     body_template = "question-modified-notification.txt"
 
@@ -347,18 +313,6 @@
 
         return get_email_template(self.body_template) % replacements
 
-    def getRecipients(self):
-        """The default notification goes to all question subscribers that
-        speak the request language, except the owner.
-        """
-        original_recipients = QuestionNotification.getRecipients(self)
-        recipients = NotificationRecipientSet()
-        for person in original_recipients:
-            if person != self.question.owner:
-                rationale, header = original_recipients.getReason(person)
-                recipients.add(person, rationale, header)
-        return recipients
-
     # Header template used when a new message is added to the question.
     action_header_template = {
         QuestionAction.REQUESTINFO:
@@ -397,6 +351,7 @@
 class QuestionModifiedOwnerNotification(QuestionModifiedDefaultNotification):
     """Notification sent to the owner when his question is modified."""
 
+    recipient_set = QuestionRecipientSet.ASKER
     # These actions will be done by the owner, so use the second person.
     action_header_template = dict(
         QuestionModifiedDefaultNotification.action_header_template)
@@ -426,16 +381,6 @@
             self.body_template = self.body_template_by_action.get(
                 self.new_message.action, self.body_template)
 
-    def getRecipients(self):
-        """Return the owner of the question if he's still subscribed."""
-        recipients = NotificationRecipientSet()
-        owner = self.question.owner
-        original_recipients = self.question.direct_recipients
-        if owner in self.question.direct_recipients:
-            rationale, header = original_recipients.getReason(owner)
-            recipients.add(owner, rationale, header)
-        return recipients
-
     def getBody(self):
         """See QuestionNotification."""
         body = QuestionModifiedDefaultNotification.getBody(self)
@@ -447,6 +392,8 @@
 class QuestionUnsupportedLanguageNotification(QuestionNotification):
     """Notification sent to answer contacts for unsupported languages."""
 
+    recipient_set = QuestionRecipientSet.CONTACT
+
     def getSubject(self):
         """See QuestionNotification."""
         return '[Question #%s]: (%s) %s' % (
@@ -457,10 +404,6 @@
         """Return True when the question is in an unsupported language."""
         return self.unsupported_language
 
-    def getRecipients(self):
-        """Notify only the answer contacts."""
-        return self.question.target.getAnswerContactRecipients(None)
-
     def getBody(self):
         """See QuestionNotification."""
         question = self.question

=== removed file 'lib/lp/answers/stories/question-confirm-url.txt'
--- lib/lp/answers/stories/question-confirm-url.txt	2009-11-11 22:17:17 +0000
+++ lib/lp/answers/stories/question-confirm-url.txt	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-= Confirming an Answer using the Link in the Notification Email =
-
-When an answer is posted on a question, its owner will usually receive a
-notification by email. That email includes a link that can be used by
-the owner to confirm that the answer solved his problem.
-
-    # We will use one browser objects for the owner, and one for the user
-    # providing support, 'No Privileges Person' here.
-
-    >>> owner_browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> support_browser = setupBrowser(
-    ...     auth='Basic [e-mail]:test')
-
-When the URL is used when the question isn't in the right state, the user
-will be redirected to the question page and a notification will be
-displayed:
-
-    >>> owner_browser.open(
-    ...     'http://launchpad.dev/firefox/+question/2/+confirm?'
-    ...     'answer_id=1')
-    >>> owner_browser.url
-    'http://.../firefox/+question/2'
-
-    >>> soup = find_main_content(owner_browser.contents)
-    >>> print soup.first('div', 'error message').renderContents()
-    The question is not in a state where you can confirm an
-    answer.
-
-Posting an answer on the question will send an email notification
-containing a link to confirm that answer.
-
-    # First subscribe the owner, so that he receives the notification.
-    >>> owner_browser.open(
-    ...     'http://launchpad.dev/firefox/+question/2/+subscribe')
-    >>> owner_browser.getControl('Subscribe').click()
-
-    # Post the answer...
-    >>> support_browser.open('http://launchpad.dev/firefox/+question/2')
-    >>> support_browser.getControl('Message').value = (
-    ...     'SVG is supported out of the box in recent versions of Firefox. '
-    ...     'I suggest you upgrade your browser.')
-    >>> support_browser.getControl('Add Answer').click()
-
-    # ... and get the confirmation URL from the notification
-    >>> import email
-    >>> import re
-    >>> from lp.services.mail import stub
-    >>> notification = email.message_from_string(stub.test_emails[-1][2])
-    >>> urls = re.findall('(http:[^\s]+)+', notification.get_payload())
-    >>> confirm_url = urls[-2].decode('quoted-printable')
-    >>> print confirm_url
-    http://answers.launchpad.dev/firefox/+question/2/+confirm?answer_id=...
-
-If a cropped URL or forged URL is used, an UnexpectedFormData error will
-be displayed. In the following example, the answer_id parameter refers
-to an answer not part of that question, it mimics a badly handcrafted
-URL:
-
-    >>> owner_browser.open(
-    ...     'http://launchpad.dev/firefox/+question/2/+confirm?'
-    ...     'answer_id=3')
-    Traceback (most recent call last):
-      ...
-    UnexpectedFormData...
-
-    >>> owner_browser.open(
-    ...     'http://launchpad.dev/firefox/+question/2/+confirm')
-    Traceback (most recent call last):
-      ...
-    UnexpectedFormData...
-
-The page is only accessible to the question owner:
-
-    >>> support_browser.open(confirm_url)
-    Traceback (most recent call last):
-      ...
-    Unauthorized...
-
-On the confirmation page, the user can see the answer that he is
-confirming.
-
-    >>> owner_browser.open(confirm_url)
-    >>> soup = find_main_content(owner_browser.contents)
-    >>> for comment in  soup.fetch('div', 'boardCommentBody'):
-    ...     print comment.renderContents()
-    <p>SVG is supported out of the box in recent versions of Firefox. I
-    suggest you upgrade your browser.</p>
-
-To confirm the answer, he needs to click the 'This Solved My Problem'
-button. He can enter an optional message along his confirmation.
-
-    >>> owner_browser.getControl('Message').value = (
-    ...     "Thanks! This indeed solved the problem.")
-    >>> owner_browser.getControl('This Solved My Problem').click()
-
-This adds his comment to the question and mark it as 'Solved.'
-
-    >>> print extract_text(
-    ...     find_tag_by_id(owner_browser.contents, 'question-status'))
-    Status: Solved ...
-    >>> print find_tags_by_class(
-    ...     owner_browser.contents, 'boardCommentBody')[-1].renderContents()
-    <p>Thanks! This indeed solved the problem.</p>
-
-

=== modified file 'lib/lp/answers/tests/test_question_notifications.py'
--- lib/lp/answers/tests/test_question_notifications.py	2011-04-23 01:31:22 +0000
+++ lib/lp/answers/tests/test_question_notifications.py	2011-05-04 17:17:01 +0000
@@ -5,18 +5,43 @@
 
 __metaclass__ = type
 
+__all__ = [
+    'pop_questionemailjobs',
+    ]
+
 from unittest import TestCase
 
+from zope.component import getUtility
 from zope.interface import implements
+from zope.security.proxy import removeSecurityProxy
 
+from canonical.testing import DatabaseFunctionalLayer
+from lp.answers.enums import QuestionRecipientSet
+from lp.answers.interfaces.questioncollection import IQuestionSet
+from lp.answers.model.questionjob import QuestionEmailJob
 from lp.answers.notification import (
     QuestionAddedNotification,
     QuestionModifiedDefaultNotification,
+    QuestionModifiedOwnerNotification,
+    QuestionNotification,
+    QuestionUnsupportedLanguageNotification,
     )
 from lp.registry.interfaces.person import IPerson
-
-
-class TestQuestionModifiedNotification(QuestionModifiedDefaultNotification):
+from lp.services.worlddata.interfaces.language import ILanguageSet
+from lp.testing import TestCaseWithFactory
+
+
+def pop_questionemailjobs():
+    jobs = sorted(
+        QuestionEmailJob.iterReady(),
+        key=lambda job: job.metadata["recipient_set"])
+    for job in jobs:
+        job.start()
+        job.complete()
+    return jobs
+
+
+class FakeQuestionModifiedNotification(QuestionModifiedDefaultNotification):
     """Subclass that do not send emails and with simpler initialization.
 
     Since notifications are handlers that accomplish their action on
@@ -39,6 +64,7 @@
         self.id = id
         self.title = title
         self.owner = FakeUser()
+        self.messages = []
 
 
 class StubQuestionMessage:
@@ -56,6 +82,7 @@
 class FakeEvent:
     """A fake event."""
     user = FakeUser()
+    object_before_modification = StubQuestion()
 
 
 class QuestionModifiedDefaultNotificationTestCase(TestCase):
@@ -63,22 +90,13 @@
 
     def setUp(self):
         """Create a notification with a fake question."""
-        self.notification = TestQuestionModifiedNotification(
+        self.notification = FakeQuestionModifiedNotification(
             StubQuestion(), FakeEvent())
 
-    def test_buildBody_with_separator(self):
-        # A body with a separator is preserved.
-        formatted_body = self.notification.buildBody(
-            "body\n-- ", "rationale")
-        self.assertEqual(
-            "body\n-- \nrationale", formatted_body)
-
-    def test_buildBody_without_separator(self):
-        # A separator will added to body if one is not present.
-        formatted_body = self.notification.buildBody(
-            "body -- mdash", "rationale")
-        self.assertEqual(
-            "body -- mdash\n-- \nrationale", formatted_body)
+    def test_recipient_set(self):
+        self.assertEqual(
+            QuestionRecipientSet.SUBSCRIBER,
+            self.notification.recipient_set)
 
     def test_getSubject(self):
         """getSubject() when there is no message added to the question."""
@@ -90,25 +108,120 @@
         """The notification user is always the event user."""
         question = StubQuestion()
         event = FakeEvent()
-        notification = TestQuestionModifiedNotification(question, event)
+        notification = FakeQuestionModifiedNotification(question, event)
         self.assertEqual(event.user, notification.user)
         self.assertNotEqual(question.owner, notification.user)
 
 
-class TestQuestionAddedNotification(QuestionAddedNotification):
-    """A subclass that does not send emails."""
-
-    def shouldNotify(self):
-        return False
-
-
-class QuestionCreatedTestCase(TestCase):
+class FakeQuestionModifiedOwnerNotification(
+                                           QuestionModifiedOwnerNotification):
+    """A subclass that does not send emails."""
+
+    def shouldNotify(self):
+        return False
+
+
+class QuestionModifiedOwnerNotificationTestCase(TestCase):
+    """Test cases for mail notifications about owner modified questions."""
+
+    def setUp(self):
+        self.question = StubQuestion()
+        self.event = FakeEvent()
+        self.notification = FakeQuestionModifiedOwnerNotification(
+            self.question, self.event)
+
+    def test_recipient_set(self):
+        self.assertEqual(
+            QuestionRecipientSet.ASKER,
+            self.notification.recipient_set)
+
+
+class FakeQuestionAddedNotification(QuestionAddedNotification):
+    """A subclass that does not send emails."""
+
+    def shouldNotify(self):
+        return False
+
+
+class QuestionAddedNotificationTestCase(TestCase):
     """Test cases for mail notifications about created questions."""
 
+    def setUp(self):
+        self.question = StubQuestion()
+        self.event = FakeEvent()
+        self.notification = FakeQuestionAddedNotification(
+            self.question, self.event)
+
+    def test_recipient_set(self):
+        self.assertEqual(
+            QuestionRecipientSet.ASKER_SUBSCRIBER,
+            self.notification.recipient_set)
+
     def test_user_is_question_owner(self):
         """The notification user is always the question owner."""
-        question = StubQuestion()
+        self.assertEqual(self.question.owner, self.notification.user)
+        self.assertNotEqual(self.event.user, self.notification.user)
+
+
+class FakeQuestionUnsupportedLanguageNotification(
+                                     QuestionUnsupportedLanguageNotification):
+    """A subclass that does not send emails."""
+
+    def shouldNotify(self):
+        return False
+
+
+class QuestionUnsupportedLanguageNotificationTestCase(TestCase):
+    """Test notifications about questions with unsupported languages."""
+
+    def setUp(self):
+        self.question = StubQuestion()
+        self.event = FakeEvent()
+        self.notification = FakeQuestionUnsupportedLanguageNotification(
+            self.question, self.event)
+
+    def test_recipient_set(self):
+        self.assertEqual(
+            QuestionRecipientSet.CONTACT,
+            self.notification.recipient_set)
+
+
+class FakeQuestionNotification(QuestionNotification):
+    """A subclass to exercise question notifcations."""
+
+    recipient_set = QuestionRecipientSet.ASKER_SUBSCRIBER
+
+    def getBody(self):
+        return 'body'
+
+
+class QuestionNotificationTestCase(TestCaseWithFactory):
+    """Test common question notification behavior."""
+
+    layer = DatabaseFunctionalLayer
+
+    def makeQuestion(self):
+        """Create question that does not trigger a notification."""
+        asker = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        naked_question_set = removeSecurityProxy(getUtility(IQuestionSet))
+        question = naked_question_set.new(
+            title='title', description='description', owner=asker,
+            language=getUtility(ILanguageSet)['en'],
+            product=product, distribution=None, sourcepackagename=None)
+        return question
+
+    def test_init_enqueue(self):
+        # Creating a question notification creates a queation email job.
+        question = self.makeQuestion()
         event = FakeEvent()
-        notification = TestQuestionAddedNotification(question, event)
-        self.assertEqual(question.owner, notification.user)
-        self.assertNotEqual(event.user, notification.user)
+        event.user = self.factory.makePerson()
+        notification = FakeQuestionNotification(question, event)
+        self.assertEqual(
+            notification.recipient_set.name,
+            notification.job.metadata['recipient_set'])
+        self.assertEqual(notification.question, notification.job.question)
+        self.assertEqual(notification.user, notification.job.user)
+        self.assertEqual(notification.getSubject(), notification.job.subject)
+        self.assertEqual(notification.getBody(), notification.job.body)
+        self.assertEqual(notification.getHeaders(), notification.job.headers)

=== modified file 'lib/lp/answers/tests/test_questionjob.py'
--- lib/lp/answers/tests/test_questionjob.py	2011-04-28 22:25:45 +0000
+++ lib/lp/answers/tests/test_questionjob.py	2011-05-04 17:17:01 +0000
@@ -11,6 +11,7 @@
 from testtools.content_type import UTF8_TEXT
 
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.interfaces.lpstorm import IStore
 from canonical.launchpad.mail import format_address
@@ -20,6 +21,7 @@
     QuestionJobType,
     QuestionRecipientSet,
     )
+from lp.answers.interfaces.questioncollection import IQuestionSet
 from lp.answers.interfaces.questionjob import IQuestionEmailJobSource
 from lp.answers.model.questionjob import (
     QuestionJob,
@@ -28,6 +30,7 @@
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.log.logger import BufferLogger
 from lp.services.mail import stub
+from lp.services.mail.sendmail import format_address_for_person
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.testing import (
     run_script,
@@ -107,7 +110,14 @@
 
     def test_iterReady(self):
         # Jobs in the ready state are returned by the iterator.
-        question = self.factory.makeQuestion()
+        # Creating a question implicitly created an question email job.
+        asker = self.factory.makePerson()
+        product = self.factory.makeProduct()
+        naked_question_set = removeSecurityProxy(getUtility(IQuestionSet))
+        question = naked_question_set.new(
+            title='title', description='description', owner=asker,
+            language=getUtility(ILanguageSet)['en'],
+            product=product, distribution=None, sourcepackagename=None)
         user, subject, ignore, headers = self.makeUserSubjectBodyHeaders()
         job_1 = QuestionEmailJob.create(
             question, user, QuestionRecipientSet.SUBSCRIBER,
@@ -198,7 +208,8 @@
         job = QuestionEmailJob.create(
             question, user, QuestionRecipientSet.SUBSCRIBER,
             subject, body, headers)
-        self.assertEqual(user, job.getErrorRecipients())
+        self.assertEqual(
+            [format_address_for_person(job.user)], job.getErrorRecipients())
 
     def test_recipients_asker(self):
         # The recipients property contains the question owner.
@@ -323,8 +334,18 @@
     def test_run_cronscript(self):
         # The cronscript is configured: schema-lazr.conf and security.cfg.
         question = self.factory.makeQuestion()
+        with person_logged_in(question.target.owner):
+            question.linkBug(self.factory.makeBug(product=question.target))
+            question.linkFAQ(
+                question.target.owner,
+                self.factory.makeFAQ(target=question.target),
+                'test FAQ link')
         self.addAnswerContact(question)
         user, subject, body, headers = self.makeUserSubjectBodyHeaders()
+        with person_logged_in(user):
+            lang_set = getUtility(ILanguageSet)
+            user.addLanguage(lang_set['en'])
+            question.target.addAnswerContact(user)
         job = QuestionEmailJob.create(
             question, user, QuestionRecipientSet.ASKER_SUBSCRIBER,
             subject, body, headers)
@@ -336,6 +357,8 @@
         self.addDetail("stdout", Content(UTF8_TEXT, lambda: out))
         self.addDetail("stderr", Content(UTF8_TEXT, lambda: err))
         self.assertEqual(0, exit_code)
+        self.assertTrue(
+            'Traceback (most recent call last)' not in err)
         message = (
             'QuestionEmailJob has sent email for question %s.' % question.id)
         self.assertTrue(

=== modified file 'lib/lp/bugs/tests/test_bugnotification.py'
--- lib/lp/bugs/tests/test_bugnotification.py	2011-04-05 22:34:35 +0000
+++ lib/lp/bugs/tests/test_bugnotification.py	2011-05-04 17:17:01 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 from itertools import chain
+import transaction
 import unittest
 
 from lazr.lifecycle.event import ObjectModifiedEvent
@@ -24,6 +25,7 @@
     LaunchpadFunctionalLayer,
     LaunchpadZopelessLayer,
     )
+from lp.answers.tests.test_question_notifications import pop_questionemailjobs
 from lp.bugs.interfaces.bugtask import (
     BugTaskStatus,
     IUpstreamBugTask,
@@ -36,7 +38,6 @@
 from lp.bugs.model.bugsubscriptionfilter import BugSubscriptionFilterMute
 from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
-from lp.testing.mail_helpers import pop_notifications
 from lp.testing.matchers import Contains
 
 
@@ -120,8 +121,9 @@
         self.subscriber = self.factory.makePerson()
         question.subscribe(self.subscriber)
         question.linkBug(self.bug)
-        # Flush pending notifications for question creation.
-        pop_notifications()
+        # Flush pending jobs for question creation.
+        pop_questionemailjobs()
+        transaction.commit()
         self.layer.switchDbUser(config.malone.expiration_dbuser)
 
     def test_notifications_for_question_subscribers(self):
@@ -134,10 +136,10 @@
         bug_modified = ObjectModifiedEvent(
             bugtask, bugtask_before_modification, ["status"])
         notify(bug_modified)
+        recipients = [
+            job.metadata['recipient_set'] for job in pop_questionemailjobs()]
         self.assertContentEqual(
-            [self.product.owner.preferredemail.email,
-             self.subscriber.preferredemail.email],
-            [mail['To'] for mail in pop_notifications()])
+            ['ASKER_SUBSCRIBER'], recipients)
 
 
 class TestNotificationsLinkToFilters(TestCaseWithFactory):
@@ -254,7 +256,7 @@
         self.assertEqual(
             {self.subscriber: {'sources': sources,
                                'filter descriptions': []},
-             subscriber2: {'sources': sources2, 
+             subscriber2: {'sources': sources2,
                            'filter descriptions': [u'Special Filter!']}},
             BugNotificationSet().getRecipientFilterData(
                 {self.subscriber: sources, subscriber2: sources2},
@@ -278,7 +280,7 @@
         # Perform the test.
         sources = list(self.notification.recipients)
         sources.extend(self.notification2.recipients)
-        assert(len(sources)==2)
+        assert(len(sources) == 2)
         self.assertEqual(
             {self.subscriber: {'sources': sources,
              'filter descriptions': ['Another Filter!', 'Special Filter!']}},
@@ -316,7 +318,7 @@
         sources = list(self.notification.recipients)
         sources2 = list(notification2.recipients)
         self.assertEqual(
-            {subscriber2: {'sources': sources2, 
+            {subscriber2: {'sources': sources2,
                            'filter descriptions': [u'Special Filter!']}},
             BugNotificationSet().getRecipientFilterData(
                 {self.subscriber: sources, subscriber2: sources2},

=== modified file 'lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt'
--- lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt	2011-05-04 17:17:01 +0000
@@ -1,4 +1,5 @@
-= Linked Bug Status Changed Notification =
+Linked Bug Status Changed Notification
+======================================
 
 While a bug is linked to a question , its subscribers will be notified
 of changes to the bug status:
@@ -7,6 +8,8 @@
     >>> from zope.interface import providedBy
     >>> from lazr.lifecycle.event import ObjectModifiedEvent
     >>> from lazr.lifecycle.snapshot import Snapshot
+    >>> from lp.answers.tests.test_question_notifications import (
+    ...     pop_questionemailjobs)
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
     >>> from lp.registry.interfaces.person import IPersonSet
 
@@ -15,20 +18,22 @@
     >>> original_bugtask = Snapshot(bugtask, providing=providedBy(bugtask))
     >>> bugtask.transitionToStatus(BugTaskStatus.CONFIRMED, no_priv)
     >>> bugtask.statusexplanation = 'This bug really happened to me.'
+    >>> ignore = pop_questionemailjobs()
     >>> notify(ObjectModifiedEvent(
     ...     bugtask, original_bugtask, ['status', 'statusexplanation'],
     ...     user=no_priv))
 
-    >>> from lp.testing.mail_helpers import pop_notifications
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
-    2
-    >>> [notification['To'] for notification in notifications]
-    ['[e-mail]', '[e-mail]']
-    >>> notification_body = notifications[0].get_payload(decode=True)
-    >>> print notifications[0]['Subject']
+    1
+
+    >>> print notifications[0].metadata['recipient_set']
+    ASKER_SUBSCRIBER
+
+    >>> print notifications[0].subject
     [Question #...]: Status of bug #... changed to 'Confirmed' in Ubuntu
-    >>> print notification_body #doctest: -NORMALIZE_WHITESPACE
+
+    >>> print notifications[0].body
     Bug #... status changed in Ubuntu:
     <BLANKLINE>
         New => Confirmed
@@ -43,15 +48,12 @@
     This bug is linked to #15.
     Can't install Ubuntu
     http://.../ubuntu/+question/...
-    <BLANKLINE>
-    --...
-    You received this question notification because you are a member of
-    Ubuntu Team, which is an answer contact for Ubuntu.
 
 Only a change in status triggers a notification.
 
     >>> from lp.testing import login_person
-    >>> sample_person = getUtility(IPersonSet).getByEmail('[e-mail]')
+    >>> sample_person = getUtility(IPersonSet).getByEmail(
+    ...     '[e-mail]')
     >>> login_person(sample_person)
     >>> original_bugtask = Snapshot(bugtask, providing=providedBy(bugtask))
     >>> bugtask.transitionToAssignee(sample_person)
@@ -59,6 +61,5 @@
     ...     bugtask, original_bugtask, ['assignee', 'dateassigned'],
     ...     user=sample_person))
 
-    >>> len(pop_notifications())
+    >>> len(pop_questionemailjobs())
     0
-

=== modified file 'lib/lp/coop/answersbugs/tests/notifications-linked-private-bug.txt'
--- lib/lp/coop/answersbugs/tests/notifications-linked-private-bug.txt	2010-10-10 15:39:28 +0000
+++ lib/lp/coop/answersbugs/tests/notifications-linked-private-bug.txt	2011-05-04 17:17:01 +0000
@@ -1,4 +1,5 @@
-= Linked Bug Status Changed Notification (Private) =
+Linked Bug Status Changed Notification (Private)
+================================================
 
 See `answer-tracker-notifications-linked-bug.txt` for public bug behavior.
 
@@ -9,9 +10,10 @@
     >>> from zope.interface import providedBy
     >>> from lazr.lifecycle.event import ObjectModifiedEvent
     >>> from lazr.lifecycle.snapshot import Snapshot
+    >>> from lp.answers.tests.test_question_notifications import (
+    ...     pop_questionemailjobs)
     >>> from lp.bugs.interfaces.bugtask import BugTaskStatus
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.testing.mail_helpers import pop_notifications
 
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
     >>> bugtask = get_bugtask_linked_to_question()
@@ -20,8 +22,9 @@
     True
     >>> original_bugtask = Snapshot(bugtask, providing=providedBy(bugtask))
     >>> bugtask.transitionToStatus(BugTaskStatus.FIXCOMMITTED, no_priv)
+    >>> ignore = pop_questionemailjobs()
     >>> notify(ObjectModifiedEvent(
     ...     bugtask, original_bugtask, ['status'], user=no_priv))
-    >>> notifications = pop_notifications()
+    >>> notifications = pop_questionemailjobs()
     >>> len(notifications)
     0

=== added directory 'lib/lp/services/mail/doc'
=== renamed file 'lib/canonical/launchpad/doc/notification-recipient-set.txt' => 'lib/lp/services/mail/doc/notification-recipient-set.txt'
--- lib/canonical/launchpad/doc/notification-recipient-set.txt	2010-12-06 22:10:11 +0000
+++ lib/lp/services/mail/doc/notification-recipient-set.txt	2011-05-04 17:17:01 +0000
@@ -1,8 +1,9 @@
-= INotificationRecipientSet =
+INotificationRecipientSet
+=========================
 
 It is part of Launchpad policy that all email notifications contain in
-the footer an explanation of why the email was sent. A simpler string
-is also usually added to a X-Launchpad-Message-Rationale header to allow
+the footer an explanation of why the email was sent. A simpler string is
+also usually added to a X-Launchpad-Message-Rationale header to allow
 easy filtering.
 
 The easiest way to implement that policy is for methods returning a list
@@ -11,11 +12,12 @@
 recipient lists with the rationale for contacting them.
 
 There is a base implementation of the interface available as
-canonical.launchpad.mailnotification.NotificationRecipientSet.
-You can use it as is or derive from it
-(see bugnotificationrecipients.txt for an example of a derivation).
+canonical.launchpad.mailnotification.NotificationRecipientSet. You can
+use it as is or derive from it (see bugnotificationrecipients.txt for an
+example of a derivation).
 
-    >>> from canonical.launchpad.interfaces.launchpad import INotificationRecipientSet
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     INotificationRecipientSet)
     >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from canonical.launchpad.mailnotification import (
     ...     NotificationRecipientSet)
@@ -24,10 +26,12 @@
     >>> verifyObject(INotificationRecipientSet, recipients)
     True
 
-== Populating the set ==
-
-You add recipients to the set using the add() method. The method takes the
-IPerson to add along the notification rationale and header code.
+
+Populating the set
+------------------
+
+You add recipients to the set using the add() method. The method takes
+the IPerson to add along the notification rationale and header code.
 
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> person_set = getUtility(IPersonSet)
@@ -43,7 +47,8 @@
 value is only used as an example. In practice, you should try to reuse
 existing values if they apply to your context.
 
-The getPersons() method returns the list of recipients sorted by display name.
+The getPersons() method returns the list of recipients sorted by display
+name.
 
     >>> [person.displayname for person in recipients.getRecipients()]
     [u'Celso Providelo', u'Sample Person']
@@ -55,19 +60,21 @@
     Celso Providelo
     Sample Person
 
-The getEmails() methods return the emails of all the recipients, also sorted
-alphabetically:
+The getEmails() methods return the emails of all the recipients, also
+sorted alphabetically:
 
     >>> recipients.getEmails()
     ['[e-mail]', '[e-mail]']
 
-You can test if an IPerson or an email is part of the recipients using the
-standard `in` operator:
+You can test if an IPerson or an email is part of the recipients using
+the standard `in` operator:
 
     >>> cprov in recipients
     True
+
     >>> '[e-mail]' in recipients
     True
+
     >>> u'[e-mail]' in recipients
     True
 
@@ -85,9 +92,12 @@
     >>> bool(NotificationRecipientSet())
     False
 
-== Obtaining the rationale ==
-
-You can obtain the rationale, header tuple by using the getReason() method:
+
+Obtaining the rationale
+-----------------------
+
+You can obtain the rationale, header tuple by using the getReason()
+method:
 
     >>> recipients.getReason(cprov)
     ('You are notified for no reason.', 'Why not')
@@ -117,24 +127,29 @@
       ...
     AssertionError: ...
 
-== Team as recipient ==
-
-Adding a team with a preferred email address works like adding any
-other person:
+
+Team as recipient
+-----------------
+
+Adding a team with a preferred email address works like adding any other
+person:
 
     >>> ubuntu_team = person_set.getByName('ubuntu-team')
     >>> login_person(ubuntu_team.teamowner)
     >>> print ubuntu_team.preferredemail.email
     [e-mail]
+
     >>> recipients.add(ubuntu_team, 'You are notified for fun.', 'Fun')
 
     >>> ubuntu_team in recipients
     True
+
     >>> '[e-mail]' in recipients
     True
 
     >>> [person.displayname for person in recipients]
     [u'Celso Providelo', u'Sample Person', u'Ubuntu Team']
+
     >>> recipients.getEmails()
     ['[e-mail]', '[e-mail]',
      '[e-mail]']
@@ -146,11 +161,13 @@
     >>> ubuntu_gnome_team = person_set.getByName('name18')
     >>> print ubuntu_gnome_team.preferredemail
     None
+
     >>> recipients.add(
     ...     ubuntu_gnome_team,
     ...     'Notified because a member of the team', 'Team')
     >>> ubuntu_gnome_team in recipients
     True
+
     >>> recipients.getEmails()
     ['[e-mail]', '[e-mail]',
      '[e-mail]', '[e-mail]',
@@ -162,21 +179,25 @@
     [u'Ubuntu Gnome Team']
 
 So Sample Person is not in the recipients list, even if his email will
-be notified for he's a member of Warty Security Team, itself a member
-of Ubuntu Gnome Team:
+be notified for he's a member of Warty Security Team, itself a member of
+Ubuntu Gnome Team:
 
     >>> warty_security_team = person_set.getByName('name20')
     >>> print warty_security_team.displayname
     Warty Security Team
+
     >>> sample_person.inTeam(warty_security_team)
     True
+
     >>> warty_security_team.inTeam(ubuntu_gnome_team)
     True
+
     >>> sample_person in ubuntu_gnome_team.activemembers
     False
 
     >>> sample_person in recipients
     False
+
     >>> '[e-mail]' in recipients
     True
 
@@ -184,10 +205,13 @@
 
     >>> recipients.getReason(ubuntu_gnome_team)
     ('Notified because a member of the team', 'Team')
+
     >>> recipients.getReason('[e-mail]')
     ('Notified because a member of the team', 'Team')
 
-== Adding many persons at the same time ==
+
+Adding many persons at the same time
+------------------------------------
 
 If you pass an iterable sequence to the add() method, all members will
 be added with the same rationale:
@@ -200,27 +224,37 @@
 
     >>> recipients.getReason(no_priv)
     ('Notified for fun.', 'Fun')
+
     >>> recipients.getReason(sample_person)
     ('Notified for fun.', 'Fun')
 
-== Removing recipients ==
-
-It is also possible to remove a person from the NotificationRecipientSet():
+
+Removing recipients
+-------------------
+
+It is also possible to remove a person from the
+NotificationRecipientSet():
 
     >>> recipients = NotificationRecipientSet()
     >>> recipients.add(
     ...     [sample_person, no_priv, cprov], 'Notified for fun.', 'Fun')
     >>> [person.displayname for person in recipients.getRecipients()]
     [u'Celso Providelo', u'No Privileges Person', u'Sample Person']
+
     >>> recipients.remove([sample_person, cprov])
     >>> [person.displayname for person in recipients.getRecipients()]
     [u'No Privileges Person']
 
-== A person's first impression sticks ==
-
-In general, the most specific rationale is used for a given email.
-A rationale given for a person is considered more
-specific than one obtained through team membership.
+    >>> recipients.getEmails()
+    ['[e-mail]']
+
+
+A person's first impression sticks
+----------------------------------
+
+In general, the most specific rationale is used for a given email. A
+rationale given for a person is considered more specific than one
+obtained through team membership.
 
 So, if a person is added more than once to the set, the first reason
 will be the one returned.
@@ -265,7 +299,8 @@
     ('Sample Person', 'Person')
 
 
-== Merging recipients set ==
+Merging recipients set
+----------------------
 
 You can merge two recipients set by using the update() method. It will
 add all the recipients in the second set along their rationale. If the
@@ -283,3 +318,5 @@
     Celso Providelo: B (Reason B)
     No Privileges Person: B (Reason B)
     Sample Person: A (Reason A)
+
+

=== modified file 'lib/lp/services/mail/notificationrecipientset.py'
--- lib/lp/services/mail/notificationrecipientset.py	2011-03-30 20:08:42 +0000
+++ lib/lp/services/mail/notificationrecipientset.py	2011-05-04 17:17:01 +0000
@@ -131,6 +131,7 @@
                     removed_person.preferredemail)
                 email = str(preferred_email.email)
                 self._receiving_people.discard((email, removed_person))
+                del self._emailToPerson[email]
 
     def update(self, recipient_set):
         """See `INotificationRecipientSet`."""

=== added file 'lib/lp/services/mail/tests/test_doc.py'
--- lib/lp/services/mail/tests/test_doc.py	1970-01-01 00:00:00 +0000
+++ lib/lp/services/mail/tests/test_doc.py	2011-05-04 17:17:01 +0000
@@ -0,0 +1,19 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test mail documentation."""
+
+__metaclass__ = type
+
+import os
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.services.testing import build_test_suite
+
+
+here = os.path.dirname(os.path.realpath(__file__))
+
+
+def test_suite():
+    suite = build_test_suite(here, {}, layer=DatabaseFunctionalLayer)
+    return suite