Merge lp:~abentley/launchpad/build-mail3 into lp:launchpad

[Aaron Bentley]

[r=bac,jcsackett][ui=none][bug=613958,681125] Fix recipe build mail.

= Summary =
Fix bugs:

Bug #681125: Async uploader sends recipe mail as if it were source package
uploads

Bug #613958: upload failure emails should include the upload log

== Proposed fix ==
Extend queue to skip notifications for recipe build-based uploads, not only
binary build-based uploads.

Move responsibility for deciding whether to notify on success to the Build
itself.

The upload log is now attached to the build before sending emails.

== Pre-implementation notes ==
Discussed with thumper

== Implementation details ==
Much doctest lint was cleaned up.
Some BinaryBuild tests were adjusted to reflect the fact that emails are never
sent for successful binary builds.

== Tests ==
bin/test -vt testSourcePackageRecipeBuild_success_mail -t testSourcePackageRecipeBuild_fail_mail -t test_notify_successfully_built -t test_notify_owner_supresses_mail -t test_sponsored_upload_notification -t nascentupload-announcements.txt

== Demo and Q/A ==
Create a sourcepackage recipe. Do a successful build. You should get an email
with a subject line like "Successfully built".

Do a build with the same version number as the previous one. You should get an
email like "[recipe build #8558] of ~abentley wakeonlan-lucid in maverick:
Failed to upload", but not one like "[PPA abentley-test]
wakeonlan_0+4+2~maverick1_source.changes rejected".

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/archiveuploader/uploadprocessor.py
  lib/lp/archiveuploader/tests/test_ppauploadprocessor.py
  lib/lp/soyuz/model/queue.py
  lib/lp/archiveuploader/tests/test_recipeuploads.py
  lib/lp/archiveuploader/tests/nascentupload-announcements.txt
  database/schema/security.cfg
  lib/lp/soyuz/tests/test_build_notify.py
  lib/lp/archiveuploader/tests/test_buildduploads.py
  lib/lp/archiveuploader/tests/test_uploadprocessor.py
  lib/lp/soyuz/model/binarypackagebuild.py

./lib/lp/archiveuploader/tests/test_ppauploadprocessor.py
     873: E301 expected 1 blank line, found 2

^^^ due to a weirdly-positioned comment

./lib/lp/archiveuploader/tests/nascentupload-announcements.txt
     191: want exceeds 78 characters.
     192: want exceeds 78 characters.
     718: want exceeds 78 characters.
     720: want exceeds 78 characters.
     766: want exceeds 78 characters.
     768: want exceeds 78 characters.

^^^ cannot be fixed because tests specify strict whitespace handling
./database/schema/security.cfg
     704: Line exceeds 78 characters.
     705: Line exceeds 78 characters.
     706: Line exceeds 78 characters.
     732: Line exceeds 78 characters.
     736: Line exceeds 78 characters.
     791: Line exceeds 78 characters.
     804: Line exceeds 78 characters.
     805: Line exceeds 78 characters.
     822: Line exceeds 78 characters.
     823: Line exceeds 78 characters.
     824: Line exceeds 78 characters.
     825: Line exceeds 78 characters.
     826: Line exceeds 78 characters.
     878: Line exceeds 78 characters.
     879: Line exceeds 78 characters.
     880: Line exceeds 78 characters.
     910: Line exceeds 78 characters.
     991: Line exceeds 78 characters.
    1001: Line exceeds 78 characters.
    1002: Line exceeds 78 characters.

^^^ 78-char limit does not apply here AFAIK

./lib/lp/archiveuploader/tests/test_uploadprocessor.py
    1263: E301 expected 1 blank line, found 2

^^^ due to a weirdly-positioned comment

[j.c.sackett (jcsackett)]

Aaron--

This looks pretty good. I have one commenting suggestion below which isn't terribly important, and one potentially important performance question at the bottom of the diff below.

> === modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
> --- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2011-01-27 16:13:58 +0000
> +++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2011-01-27 16:13:59 +0000
> @@ -2012,11 +2022,23 @@
> BuildUploadHandler(self.uploadprocessor, self.incoming_folder,
> leaf_name).process()
> self.layer.txn.commit()
> + return build
> +
> + def testSourcePackageRecipeBuild_fail(self):
> + build = self.doFailureRecipeBuild()
> self.assertEquals(BuildStatus.FAILEDTOUPLOAD, build.status)
> self.assertEquals(None, build.builder)
> self.assertIsNot(None, build.duration)
> self.assertIsNot(None, build.upload_log)
>
> + def testSourcePackageRecipeBuild_fail_mail(self):
> + self.doFailureRecipeBuild()
> + (mail,) = pop_notifications()
> + subject = mail['Subject'].replace('\n\t', ' ')
> + self.assertIn('Failed to upload', subject)
> + body = mail.get_payload(decode=True)
> + self.assertIn('Upload Log: http', body)
> +
> def testBuildWithInvalidStatus(self):
> # Builds with an invalid (non-UPLOADING) status should trigger
> # a warning but be left alone.

A comment to the effect
+ # When a recipe fails it should include the log in the mail.
in testSourcePackageRecipeBuild_fail_mail would be good.

> @@ -192,9 +191,23 @@
> # PackageUploadSource objects which are related.
> sources = SQLMultipleJoin('PackageUploadSource',
> joinColumn='packageupload')
> + # Does not include source builds.
> builds = SQLMultipleJoin('PackageUploadBuild',
> joinColumn='packageupload')
>
> + def getSourceBuild(self):
> + #avoid circular import
> + from lp.code.model.sourcepackagerecipebuild import (
> + SourcePackageRecipeBuild)
> + from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
> + return Store.of(self).find(
> + SourcePackageRecipeBuild,
> + SourcePackageRecipeBuild.id ==
> + SourcePackageRelease.source_package_recipe_build_id,
> + SourcePackageRelease.id ==
> + PackageUploadSource.sourcepackagereleaseID,
> + PackageUploadSource.packageupload == self.id).one()
> +
> # Also the custom files associated with the build.
> customfiles = SQLMultipleJoin('PackageUploadCustom',
> joinColumn='packageupload')
> @@ -488,6 +501,10 @@
> """See `IPackageUpload`."""
> return self.builds
>
> + @cachedproperty
> + def from_build(self):
> + return bool(self.builds) or self.getSourceBuild()
> +

Is there any chance of a cold cache use of this method causing performance issues? I'm not saying it will, just asking. I have no idea how large the query fired for this could be.

review: Needs Information (code*)

[j.c.sackett (jcsackett)]

After talking in IRC, my performance question has been addressed.

11:57 AM jcsackett
abentley: builds is a SQLMultipleJoin; i'm wondering if when self.build gets called we may return a huge rowset in some cases.
11:57 AM abentley
jcsackett, as I said, it's always one or zero results.
11:57 AM jcsackett
abenltey, ah! i thought you meant from_build was called one or zero times.
11:57 AM abentley
jcsackett, there is a comment in the code saying it shouldn't be a multiple join.
11:59 AM jcsackett
abentley: yes, i see now.
11:59 AM
apologies for the confusion.

review: Approve (code*)

[Brad Crittenden (bac)]

Code and review look fine. Thanks to you both.

review: Approve (code)

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-12-02 16:15:46 +0000
+++ database/schema/security.cfg	2011-01-27 17:17:51 +0000
@@ -1363,6 +1363,7 @@
 public.sourcepackagepublishinghistory   = SELECT, INSERT, UPDATE
 public.distributionsourcepackage        = SELECT, INSERT, UPDATE
 public.binarypackagepublishinghistory   = SELECT, INSERT, UPDATE
+public.sourcepackagerecipebuild         = SELECT
 public.sourcepackagerecipebuildjob      = SELECT, INSERT, UPDATE
 public.component                        = SELECT
 public.section                          = SELECT
 
=== modified file 'lib/lp/archiveuploader/tests/nascentupload-announcements.txt'
--- lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2010-12-23 12:16:57 +0000
+++ lib/lp/archiveuploader/tests/nascentupload-announcements.txt	2011-01-27 17:17:51 +0000
@@ -1,4 +1,5 @@
-= NascentUpload Announcements =
+NascentUpload Announcements
+===========================
 
 NascentUpload announces uploads according its final status (NEW,
 AUTO-APPROVED, UNAPPROVED) and its destination pocket:
@@ -32,272 +33,275 @@
 
 We need to be logged into the security model in order to get any further
 
-  >>> from canonical.testing.layers import LaunchpadZopelessLayer
-  >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-  >>> login('[e-mail]')
+    >>> from canonical.testing.layers import LaunchpadZopelessLayer
+    >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
+    >>> login('[e-mail]')
 
 Helper functions to examine emails that were sent:
 
-  >>> from lp.services.mail import stub
-  >>> from lp.testing.mail_helpers import pop_notifications
-
-  >>> def by_to_addrs(a, b):
-  ...     return cmp(a[1], b[1])
-
-  >>> def print_addrlist(field):
-  ...    for entry in field.split(','):
-  ...        print entry.strip()
+    >>> from lp.services.mail import stub
+    >>> from lp.testing.mail_helpers import pop_notifications
+
+    >>> def by_to_addrs(a, b):
+    ...     return cmp(a[1], b[1])
+
+    >>> def print_addrlist(field):
+    ...    for entry in field.split(','):
+    ...        print entry.strip()
 
 Import the test keys to use 'insecure' policy.
 
-  >>> from canonical.launchpad.ftests import import_public_test_keys
-  >>> import_public_test_keys()
+    >>> from canonical.launchpad.ftests import import_public_test_keys
+    >>> import_public_test_keys()
 
 For the purpose of this test, hoary needs to be an open (development)
 distroseries so that we can upload to it. Also adjust 'changeslist'
 address and allow uploads to universe:
 
-  >>> from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-  >>> from lp.registry.interfaces.distribution import IDistributionSet
-  >>> from lp.registry.interfaces.series import SeriesStatus
-  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
-  >>> hoary = ubuntu['hoary']
-  >>> hoary.status = SeriesStatus.DEVELOPMENT
-  >>> hoary.changeslist = "[e-mail]"
-  >>> fake_chroot = getUtility(ILibraryFileAliasSet)[1]
-  >>> trash = hoary['hppa'].addOrUpdateChroot(fake_chroot)
+    >>> from canonical.launchpad.interfaces.librarian import (
+    ...     ILibraryFileAliasSet,
+    ...     )
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.series import SeriesStatus
+    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
+    >>> hoary = ubuntu['hoary']
+    >>> hoary.status = SeriesStatus.DEVELOPMENT
+    >>> hoary.changeslist = "[e-mail]"
+    >>> fake_chroot = getUtility(ILibraryFileAliasSet)[1]
+    >>> trash = hoary['hppa'].addOrUpdateChroot(fake_chroot)
 
 NEW source upload to RELEASE pocket via 'sync' policy (it presents
 the same behaviour than using insecure policy, apart from allowing
 unsigned changes):
 
-  >>> from lp.archiveuploader.nascentupload import NascentUpload
-  >>> from lp.archiveuploader.tests import datadir, getPolicy
-
-  >>> sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries='hoary')
-
-  >>> from lp.services.log.logger import DevNullLogger
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
-  ...     sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> from lp.services.log.logger import FakeLogger
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  ...
-  DEBUG Sent a mail:
-  ...
-  DEBUG NEW: bar_1.0.orig.tar.gz
-  DEBUG NEW: bar_1.0-1.diff.gz
-  DEBUG NEW: bar_1.0-1.dsc
-  ...
-  DEBUG above if files already exist in other distroseries.
-  ...
-  DEBUG --
-  DEBUG You are receiving this email because you are the uploader, maintainer or
-  DEBUG signer of the above package.
+    >>> from lp.archiveuploader.nascentupload import NascentUpload
+    >>> from lp.archiveuploader.tests import datadir, getPolicy
+
+    >>> sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries='hoary')
+
+    >>> from lp.services.log.logger import DevNullLogger
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
+    ...     sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> from lp.services.log.logger import FakeLogger
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    ...
+    DEBUG Sent a mail:
+    ...
+    DEBUG NEW: bar_1.0.orig.tar.gz
+    DEBUG NEW: bar_1.0-1.diff.gz
+    DEBUG NEW: bar_1.0-1.dsc
+    ...
+    DEBUG above if files already exist in other distroseries.
+    ...
+    DEBUG --
+    DEBUG You are receiving this email because you are the uploader,
+    maintainer or
+    DEBUG signer of the above package.
 
 There is only one email generated:
 
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> notification['Subject']
-  '[ubuntu/hoary] bar 1.0-1 (New)'
-
-  >>> print_addrlist(notification['To'])
-  Daniel Silverstone <[e-mail]>
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> notification['Subject']
+    '[ubuntu/hoary] bar 1.0-1 (New)'
+
+    >>> print_addrlist(notification['To'])
+    Daniel Silverstone <[e-mail]>
 
 Let's ACCEPT bar sources in order to make the next uploads of this
 series *known* in hoary:
 
-  >>> bar_src.queue_root.setAccepted()
-  >>> pub_records = bar_src.queue_root.realiseUpload()
+    >>> bar_src.queue_root.setAccepted()
+    >>> pub_records = bar_src.queue_root.realiseUpload()
 
 Make the uploaded orig file available to librarian lookups
 
-  >>> import transaction
-  >>> transaction.commit()
+    >>> import transaction
+    >>> transaction.commit()
 
 Ensure the previous transaction is *really* in the database before the next
 test:
 
-  >>> from canonical.launchpad.ftests import syncUpdate
-  >>> syncUpdate(bar_src.queue_root)
+    >>> from canonical.launchpad.ftests import syncUpdate
+    >>> syncUpdate(bar_src.queue_root)
 
 Uploading the same package again will result in a rejection email:
 
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
-  ...     sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  DEBUG bar diff from 1.0-1 to 1.0-1 requested
-  DEBUG Setting it to ACCEPTED
-  ...
-  DEBUG Sending rejection email.
-  ...
-  DEBUG Rejected:
-  DEBUG The source bar - 1.0-1 is already accepted in ubuntu/hoary
-         and you cannot upload the same version within the same
-         distribution. You have to modify the source version and
-         re-upload.
-  ...
-
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Daniel Silverstone <[e-mail]>
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
+    ...     sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    DEBUG bar diff from 1.0-1 to 1.0-1 requested
+    DEBUG Setting it to ACCEPTED
+    ...
+    DEBUG Sending rejection email.
+    ...
+    DEBUG Rejected:
+    DEBUG The source bar - 1.0-1 is already accepted in ubuntu/hoary
+           and you cannot upload the same version within the same
+           distribution. You have to modify the source version and
+           re-upload.
+    ...
+
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Daniel Silverstone <[e-mail]>
 
 Upload notifications from primary archive do not contain the
 'X-Launchpad-PPA' header, since it doesn't apply to this context.
 
-  >>> 'X-Launchpad-PPA' in notification.keys()
-  False
+    >>> 'X-Launchpad-PPA' in notification.keys()
+    False
 
 Notifications for source uploads will contain the 'X-Launchpad-Component'
 header however.
 
-  >>> 'X-Launchpad-Component' in notification.keys()
-  True
+    >>> 'X-Launchpad-Component' in notification.keys()
+    True
 
-  >>> notification['X-Launchpad-Component']
-  'component=universe, section=devel'
+    >>> notification['X-Launchpad-Component']
+    'component=universe, section=devel'
 
 This is the body of the rejection email.
 
-  >>> body = notification.get_payload()[0]
-  >>> print body.as_string() # doctest: -NORMALIZE_WHITESPACE
-  Content-Type: text/plain; charset="utf-8"
-  MIME-Version: 1.0
-  Content-Transfer-Encoding: quoted-printable
-  <BLANKLINE>
-  Rejected:
-  The source bar - 1.0-1 is already accepted in ubuntu/hoary and you cannot u=
-  pload the same version within the same distribution. You have to modify the=
-   source version and re-upload.
-  <BLANKLINE>
-  bar (1.0-1) breezy; urgency=3Dlow
-  <BLANKLINE>
-    * Initial version
-  <BLANKLINE>
-  Date: Thu, 16 Feb 2006 15:34:09 +0000
-  Changed-By: Daniel Silverstone <[e-mail]>
-  Maintainer: Launchpad team <[e-mail]>
-  <BLANKLINE>
-  =3D=3D=3D
-  <BLANKLINE>
-  If you don't understand why your files were rejected, or if the
-  override file requires editing, please go to:
-  http://answers.launchpad.net/soyuz
-  <BLANKLINE>
-  -- =
-  <BLANKLINE>
-  You are receiving this email because you are the uploader, maintainer or
-  signer of the above package.
-  <BLANKLINE>
+    >>> body = notification.get_payload()[0]
+    >>> print body.as_string() # doctest: -NORMALIZE_WHITESPACE
+    Content-Type: text/plain; charset="utf-8"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: quoted-printable
+    <BLANKLINE>
+    Rejected:
+    The source bar - 1.0-1 is already accepted in ubuntu/hoary and you cannot u=
+    pload the same version within the same distribution. You have to modify the=
+     source version and re-upload.
+    <BLANKLINE>
+    bar (1.0-1) breezy; urgency=3Dlow
+    <BLANKLINE>
+      * Initial version
+    <BLANKLINE>
+    Date: Thu, 16 Feb 2006 15:34:09 +0000
+    Changed-By: Daniel Silverstone <[e-mail]>
+    Maintainer: Launchpad team <[e-mail]>
+    <BLANKLINE>
+    =3D=3D=3D
+    <BLANKLINE>
+    If you don't understand why your files were rejected, or if the
+    override file requires editing, please go to:
+    http://answers.launchpad.net/soyuz
+    <BLANKLINE>
+    -- =
+    <BLANKLINE>
+    You are receiving this email because you are the uploader, maintainer or
+    signer of the above package.
+    <BLANKLINE>
 
 In order to facilitate automated processing of announcement emails, the
 changes file is enclosed as an attachment.
 
-  >>> attachment = notification.get_payload()[1]
-  >>> print attachment.as_string() # doctest: -NORMALIZE_WHITESPACE
-  Content-Type: text/plain; charset="utf-8"
-  MIME-Version: 1.0
-  Content-Transfer-Encoding: quoted-printable
-  Content-Disposition: attachment; filename="changesfile"
-  <BLANKLINE>
-  -----BEGIN PGP SIGNED MESSAGE-----
-  Hash: SHA1
-  <BLANKLINE>
-  Format: 1.7
-  Date: Thu, 16 Feb 2006 15:34:09 +0000
-  Source: bar
-  Binary: bar
-  Architecture: source
-  Version: 1.0-1
-  Distribution: breezy
-  Urgency: low
-  Maintainer: Launchpad team <[e-mail]>
-  Changed-By: Daniel Silverstone <[e-mail]>
-  Description: =
-  <BLANKLINE>
-   bar        - Stuff for testing
-  Changes: =
-  <BLANKLINE>
-   bar (1.0-1) breezy; urgency=3Dlow
-   .
-     * Initial version
-  Files: =
-  <BLANKLINE>
-   5d533778b698edc1a122098a98c8490e 512 devel optional bar_1.0-1.dsc
-   fc1464e5985b962a042d5354452f361d 164 devel optional bar_1.0.orig.tar.gz
-   1e35b810764f140af9616de8274e6e73 537 devel optional bar_1.0-1.diff.gz
-  <BLANKLINE>
-  -----BEGIN PGP SIGNATURE-----
-  Version: GnuPG v1.4.3 (GNU/Linux)
-  <BLANKLINE>
-  iD8DBQFFt7D9jn63CGxkqMURAk1BAJwIQfOMS+l9lDDwPORtuZb3hFI2OgCaArNc
-  oH5uIHeKtedJa5Ekpcfi2bY=3D
-  =3DDMqI
-  -----END PGP SIGNATURE-----
-  <BLANKLINE>
+    >>> attachment = notification.get_payload()[1]
+    >>> print attachment.as_string() # doctest: -NORMALIZE_WHITESPACE
+    Content-Type: text/plain; charset="utf-8"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: quoted-printable
+    Content-Disposition: attachment; filename="changesfile"
+    <BLANKLINE>
+    -----BEGIN PGP SIGNED MESSAGE-----
+    Hash: SHA1
+    <BLANKLINE>
+    Format: 1.7
+    Date: Thu, 16 Feb 2006 15:34:09 +0000
+    Source: bar
+    Binary: bar
+    Architecture: source
+    Version: 1.0-1
+    Distribution: breezy
+    Urgency: low
+    Maintainer: Launchpad team <[e-mail]>
+    Changed-By: Daniel Silverstone <[e-mail]>
+    Description: =
+    <BLANKLINE>
+     bar        - Stuff for testing
+    Changes: =
+    <BLANKLINE>
+     bar (1.0-1) breezy; urgency=3Dlow
+     .
+       * Initial version
+    Files: =
+    <BLANKLINE>
+     5d533778b698edc1a122098a98c8490e 512 devel optional bar_1.0-1.dsc
+     fc1464e5985b962a042d5354452f361d 164 devel optional bar_1.0.orig.tar.gz
+     1e35b810764f140af9616de8274e6e73 537 devel optional bar_1.0-1.diff.gz
+    <BLANKLINE>
+    -----BEGIN PGP SIGNATURE-----
+    Version: GnuPG v1.4.3 (GNU/Linux)
+    <BLANKLINE>
+    iD8DBQFFt7D9jn63CGxkqMURAk1BAJwIQfOMS+l9lDDwPORtuZb3hFI2OgCaArNc
+    oH5uIHeKtedJa5Ekpcfi2bY=3D
+    =3DDMqI
+    -----END PGP SIGNATURE-----
+    <BLANKLINE>
 
 A PPA upload will contain the X-Launchpad-PPA header.
 
-  >>> from lp.registry.interfaces.distribution import IDistributionSet
-  >>> from lp.registry.interfaces.person import IPersonSet
-  >>> from lp.soyuz.enums import ArchivePurpose
-  >>> from lp.soyuz.interfaces.archive import IArchiveSet
-
-  >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
-  >>> name16 = getUtility(IPersonSet).getByName('name16')
-  >>> name16_ppa = getUtility(IArchiveSet).new(
-  ...     owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)
-
-  >>> ppa_policy = getPolicy(
-  ...     name='insecure', distro='ubuntu', distroseries=None)
-  >>> ppa_policy.archive = name16_ppa
-  >>> ppa_policy.setDistroSeriesAndPocket('hoary')
-
-  >>> ppa_bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
-  ...     ppa_policy, DevNullLogger())
-  >>> ppa_bar_src.process()
-  >>> result = ppa_bar_src.do_accept()
-
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Foo Bar <[e-mail]>
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.soyuz.enums import ArchivePurpose
+    >>> from lp.soyuz.interfaces.archive import IArchiveSet
+
+    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
+    >>> name16 = getUtility(IPersonSet).getByName('name16')
+    >>> name16_ppa = getUtility(IArchiveSet).new(
+    ...     owner=name16, distribution=ubuntu, purpose=ArchivePurpose.PPA)
+
+    >>> ppa_policy = getPolicy(
+    ...     name='insecure', distro='ubuntu', distroseries=None)
+    >>> ppa_policy.archive = name16_ppa
+    >>> ppa_policy.setDistroSeriesAndPocket('hoary')
+
+    >>> ppa_bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
+    ...     ppa_policy, DevNullLogger())
+    >>> ppa_bar_src.process()
+    >>> result = ppa_bar_src.do_accept()
+
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Foo Bar <[e-mail]>
 
 On PPA upload notifications the 'X-Launchpad-PPA' is present and
 contains the target PPA owner account name.
 
-  >>> notification['X-Launchpad-PPA']
-  'name16'
+    >>> notification['X-Launchpad-PPA']
+    'name16'
 
 However, PPA upload notifications do not contain an attachment with the
 original changesfile.
 
-  >>> attachment = notification.get_payload()[1]
-  Traceback (most recent call last):
-  ...
-  IndexError: list index out of range
+    >>> attachment = notification.get_payload()[1]
+    Traceback (most recent call last):
+    ...
+    IndexError: list index out of range
 
 See further tests upon PPA upload notifications on
 archiveuploader/ftests/test_ppauploadprocessor.
@@ -305,234 +309,240 @@
 NEW binary upload to RELEASE pocket via 'sync' policy (we need to
 override sync policy to allow binary uploads):
 
-  >>> from lp.archiveuploader.uploadpolicy import ArchiveUploadType
-  >>> modified_sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries='hoary')
-  >>> modified_sync_policy.accepted_type = ArchiveUploadType.BINARY_ONLY
-
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-1_binary/bar_1.0-1_i386.changes'),
-  ...     modified_sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  DEBUG Not sending email, upload contains binaries.
+    >>> from lp.archiveuploader.uploadpolicy import ArchiveUploadType
+    >>> modified_sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries='hoary')
+    >>> modified_sync_policy.accepted_type = ArchiveUploadType.BINARY_ONLY
+
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-1_binary/bar_1.0-1_i386.changes'),
+    ...     modified_sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    DEBUG Not sending email; upload is from a build.
 
 We simply ignore messages generated at this step because they are not
 going to exist in production. We simply need this binary to be published
 in order to test other features in post-release pockets.
 
-   >>> ignore = pop_notifications()
+    >>> ignore = pop_notifications()
 
 Let's accept & publish bar binary in order to make the next uploads of
 this series *known* in hoary:
 
-  >>> bar_src.queue_root.setAccepted()
-  >>> pub_records = bar_src.queue_root.realiseUpload()
+    >>> bar_src.queue_root.setAccepted()
+    >>> pub_records = bar_src.queue_root.realiseUpload()
 
 
 NEW source uploads for 'translations' section via sync policy:
 
-  >>> modified_sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries='hoary')
-
-  >>> lang_pack = NascentUpload.from_changesfile_path(
-  ...     datadir('language-packs/language-pack-pt_1.0-1_source.changes'),
-  ...     modified_sync_policy, DevNullLogger())
-  >>> lang_pack.process()
-
-  >>> lang_pack.logger = FakeLogger()
-  >>> result = lang_pack.do_accept()
-  DEBUG Creating queue entry
-  DEBUG Skipping acceptance and announcement, it is a language-package upload.
-
-  >>> lang_pack.queue_root.status.name
-  'NEW'
+    >>> modified_sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries='hoary')
+
+    >>> lang_pack = NascentUpload.from_changesfile_path(
+    ...     datadir('language-packs/language-pack-pt_1.0-1_source.changes'),
+    ...     modified_sync_policy, DevNullLogger())
+    >>> lang_pack.process()
+
+    >>> lang_pack.logger = FakeLogger()
+    >>> result = lang_pack.do_accept()
+    DEBUG Creating queue entry
+    DEBUG Skipping acceptance and announcement, it is a language-package
+    upload.
+
+    >>> lang_pack.queue_root.status.name
+    'NEW'
 
 No messages were generated since this upload is targeted for the
 'translation' section:
 
-  >>> transaction.commit()
-  >>> len(stub.test_emails)
-  0
+    >>> transaction.commit()
+    >>> len(stub.test_emails)
+    0
 
 Accept and publish this series:
 
-  >>> lang_pack.queue_root.setAccepted()
-  >>> pub_records = lang_pack.queue_root.realiseUpload()
+    >>> lang_pack.queue_root.setAccepted()
+    >>> pub_records = lang_pack.queue_root.realiseUpload()
 
 
 AUTO_APPROVED source uploads for 'translations' section:
 
-  >>> modified_sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries='hoary')
-
-  >>> lang_pack = NascentUpload.from_changesfile_path(
-  ...     datadir('language-packs/language-pack-pt_1.0-2_source.changes'),
-  ...     modified_sync_policy, DevNullLogger())
-  >>> lang_pack.process()
-
-  >>> lang_pack.logger = FakeLogger()
-  >>> result = lang_pack.do_accept()
-  DEBUG Creating queue entry
-  ...
-  DEBUG Skipping acceptance and announcement, it is a language-package upload.
-
-  >>> lang_pack.queue_root.status.name
-  'DONE'
+    >>> modified_sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries='hoary')
+
+    >>> lang_pack = NascentUpload.from_changesfile_path(
+    ...     datadir('language-packs/language-pack-pt_1.0-2_source.changes'),
+    ...     modified_sync_policy, DevNullLogger())
+    >>> lang_pack.process()
+
+    >>> lang_pack.logger = FakeLogger()
+    >>> result = lang_pack.do_accept()
+    DEBUG Creating queue entry
+    ...
+    DEBUG Skipping acceptance and announcement, it is a language-package
+    upload.
+
+    >>> lang_pack.queue_root.status.name
+    'DONE'
 
 Again, no messages were generated since this upload is targeted for
 'translation' section:
 
-  >>> transaction.commit()
-  >>> len(stub.test_emails)
-  0
+    >>> transaction.commit()
+    >>> len(stub.test_emails)
+    0
 
 Release hoary, enable uploads to post-release pockets:
 
-  >>> hoary.status = SeriesStatus.CURRENT
+    >>> hoary.status = SeriesStatus.CURRENT
 
 UNAPPROVED source uploads for 'translations' section via insecure:
 
-  >>> insecure_policy = getPolicy(
-  ...     name='insecure', distro='ubuntu', distroseries=None)
-  >>> insecure_policy.setDistroSeriesAndPocket('hoary-updates')
-
-  >>> lang_pack = NascentUpload.from_changesfile_path(
-  ...     datadir('language-packs/language-pack-pt_1.0-3_source.changes'),
-  ...     insecure_policy, DevNullLogger())
-  >>> lang_pack.process()
-  >>> lang_pack.logger = FakeLogger()
-  >>> result = lang_pack.do_accept()
-  DEBUG Creating queue entry
-  DEBUG language-pack-pt diff from 1.0-2 to 1.0-3 requested
-  DEBUG Setting it to UNAPPROVED
-  DEBUG Skipping acceptance and announcement, it is a language-package upload.
-
-  >>> lang_pack.queue_root.status.name
-  'UNAPPROVED'
+    >>> insecure_policy = getPolicy(
+    ...     name='insecure', distro='ubuntu', distroseries=None)
+    >>> insecure_policy.setDistroSeriesAndPocket('hoary-updates')
+
+    >>> lang_pack = NascentUpload.from_changesfile_path(
+    ...     datadir('language-packs/language-pack-pt_1.0-3_source.changes'),
+    ...     insecure_policy, DevNullLogger())
+    >>> lang_pack.process()
+    >>> lang_pack.logger = FakeLogger()
+    >>> result = lang_pack.do_accept()
+    DEBUG Creating queue entry
+    DEBUG language-pack-pt diff from 1.0-2 to 1.0-3 requested
+    DEBUG Setting it to UNAPPROVED
+    DEBUG Skipping acceptance and announcement, it is a language-package
+    upload.
+
+    >>> lang_pack.queue_root.status.name
+    'UNAPPROVED'
 
 UNAPPROVED message was also skipped for an upload targeted to
 'translation' section:
 
-  >>> transaction.commit()
-  >>> len(stub.test_emails)
-  0
+    >>> transaction.commit()
+    >>> len(stub.test_emails)
+    0
 
 
 An UNAPPROVED binary upload via insecure will send one email saying that
 the upload is waiting for approval:
 
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-2/bar_1.0-2_source.changes'),
-  ...     insecure_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  ...
-
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Foo Bar <[e-mail]>
-  Daniel Silverstone <[e-mail]>
-
-  >>> notification['Subject']
-  '[ubuntu/hoary-updates] bar 1.0-2 (Waiting for approval)'
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-2/bar_1.0-2_source.changes'),
+    ...     insecure_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    ...
+
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Foo Bar <[e-mail]>
+    Daniel Silverstone <[e-mail]>
+
+    >>> notification['Subject']
+    '[ubuntu/hoary-updates] bar 1.0-2 (Waiting for approval)'
 
 
 UNAPPROVED upload to BACKPORTS via insecure policy will send a notification
 saying they are waiting for approval:
 
-  >>> unapproved_backports_policy = getPolicy(
-  ...     name='insecure', distro='ubuntu', distroseries=None)
-  >>> unapproved_backports_policy.setDistroSeriesAndPocket('hoary-backports')
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-3_valid/bar_1.0-3_source.changes'),
-  ...     unapproved_backports_policy, DevNullLogger())
-  >>> bar_src.process()
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  DEBUG bar diff from 1.0-1 to 1.0-3 requested
-  DEBUG Setting it to UNAPPROVED
-  ...
-
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Foo Bar <[e-mail]>
-  Daniel Silverstone <[e-mail]>
-
-  >>> notification['Subject']
-  '[ubuntu/hoary-backports] bar 1.0-3 (Waiting for approval)'
+    >>> unapproved_backports_policy = getPolicy(
+    ...     name='insecure', distro='ubuntu', distroseries=None)
+    >>> unapproved_backports_policy.setDistroSeriesAndPocket(
+    ...     'hoary-backports')
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-3_valid/bar_1.0-3_source.changes'),
+    ...     unapproved_backports_policy, DevNullLogger())
+    >>> bar_src.process()
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    DEBUG bar diff from 1.0-1 to 1.0-3 requested
+    DEBUG Setting it to UNAPPROVED
+    ...
+
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Foo Bar <[e-mail]>
+    Daniel Silverstone <[e-mail]>
+
+    >>> notification['Subject']
+    '[ubuntu/hoary-backports] bar 1.0-3 (Waiting for approval)'
 
 AUTO-APPROVED upload to BACKPORTS pocket via 'sync' policy:
 
-  >>> modified_sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries=None)
-  >>> modified_sync_policy.setDistroSeriesAndPocket('hoary-backports')
-
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-4/bar_1.0-4_source.changes'),
-  ...     modified_sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  ...
-  DEBUG Sent a mail:
-  DEBUG     Subject: [ubuntu/hoary-backports] bar 1.0-4 (Accepted)
-  DEBUG     Recipients: Celso Providelo <[e-mail]>
-  DEBUG     Body:
-  DEBUG bar (1.0-4) breezy; urgency=low
-  DEBUG
-  DEBUG   * Changer using non-preferred email
-  DEBUG
-  DEBUG Date: Tue, 25 Apr 2006 10:36:14 -0300
-  DEBUG Changed-By: Celso R. Providelo <[e-mail]>
-  DEBUG Maintainer: Launchpad team <[e-mail]>
-  DEBUG http://launchpad.dev/ubuntu/hoary/+source/bar/1.0-4
-  DEBUG
-  DEBUG ==
-  DEBUG
-  DEBUG Announcing to [e-mail]
-  DEBUG
-  DEBUG Thank you for your contribution to Ubuntu Linux.
-  DEBUG
-  DEBUG --
-  DEBUG You are receiving this email because you are the uploader, maintainer or
-  DEBUG signer of the above package.
+    >>> modified_sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries=None)
+    >>> modified_sync_policy.setDistroSeriesAndPocket('hoary-backports')
+
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-4/bar_1.0-4_source.changes'),
+    ...     modified_sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    ...
+    DEBUG Sent a mail:
+    DEBUG     Subject: [ubuntu/hoary-backports] bar 1.0-4 (Accepted)
+    DEBUG     Recipients: Celso Providelo <[e-mail]>
+    DEBUG     Body:
+    DEBUG bar (1.0-4) breezy; urgency=low
+    DEBUG
+    DEBUG   * Changer using non-preferred email
+    DEBUG
+    DEBUG Date: Tue, 25 Apr 2006 10:36:14 -0300
+    DEBUG Changed-By: Celso R. Providelo <[e-mail]>
+    DEBUG Maintainer: Launchpad team <[e-mail]>
+    DEBUG http://launchpad.dev/ubuntu/hoary/+source/bar/1.0-4
+    DEBUG
+    DEBUG ==
+    DEBUG
+    DEBUG Announcing to [e-mail]
+    DEBUG
+    DEBUG Thank you for your contribution to Ubuntu Linux.
+    DEBUG
+    DEBUG --
+    DEBUG You are receiving this email because you are the uploader,
+    maintainer or
+    DEBUG signer of the above package.
 
 There is one email generated:
 
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Celso Providelo <[e-mail]>
-
-  >>> notification['Subject']
-  '[ubuntu/hoary-backports] bar 1.0-4 (Accepted)'
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Celso Providelo <[e-mail]>
+
+    >>> notification['Subject']
+    '[ubuntu/hoary-backports] bar 1.0-4 (Accepted)'
 
 Remove orig.tar.gz pumped from librarian to disk during the upload
 checks:
 
- >>> import os
- >>> os.remove(os.path.join(datadir('suite/bar_1.0-4'), 'bar_1.0.orig.tar.gz'))
+    >>> import os
+    >>> upload_data = datadir('suite/bar_1.0-4')
+    >>> os.remove(os.path.join(upload_data, 'bar_1.0.orig.tar.gz'))
 
 DEBIAN SYNC upload of a source via the 'sync' policy.
 These uploads do not generate any announcement emails for auto-accepted
@@ -541,88 +551,88 @@
 Make hoary developmental again, as syncs only happen at that stage of a
 distroseries.
 
-  >>> hoary.status = SeriesStatus.DEVELOPMENT
-
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir(
-  ...          'suite/bar_1.0-5_debian_auto_sync/bar_1.0-5_source.changes'),
-  ...     sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  ...
+    >>> hoary.status = SeriesStatus.DEVELOPMENT
+
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir(
+    ...          'suite/bar_1.0-5_debian_auto_sync/bar_1.0-5_source.changes'),
+    ...     sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    ...
 
 One email generated:
 
-  >>> [notification] = pop_notifications()
-  >>> notification['Subject']
-  '[ubuntu/hoary] bar 1.0-5 (Accepted)'
+    >>> [notification] = pop_notifications()
+    >>> notification['Subject']
+    '[ubuntu/hoary] bar 1.0-5 (Accepted)'
 
 
 In contrast, manual sync uploads do generate the announcement:
 
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir(
-  ...          'suite/bar_1.0-6/bar_1.0-6_source.changes'),
-  ...     sync_policy, DevNullLogger())
-  >>> bar_src.process()
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir(
+    ...          'suite/bar_1.0-6/bar_1.0-6_source.changes'),
+    ...     sync_policy, DevNullLogger())
+    >>> bar_src.process()
 
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Creating queue entry
-  ...
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Creating queue entry
+    ...
 
 Two emails generated:
 
-  >>> import operator
-  >>> msgs = pop_notifications(sort_key=operator.itemgetter('To'))
-  >>> len(msgs)
-  2
-
-  >>> [message['To'] for message in msgs]
-  ['Celso Providelo <[e-mail]>',
-      '[e-mail]']
-
-  >>> [message['Subject'] for message in msgs]
-  ['[ubuntu/hoary] bar 1.0-6 (Accepted)',
-   '[ubuntu/hoary] bar 1.0-6 (Accepted)']
+    >>> import operator
+    >>> msgs = pop_notifications(sort_key=operator.itemgetter('To'))
+    >>> len(msgs)
+    2
+
+    >>> [message['To'] for message in msgs]
+    ['Celso Providelo <[e-mail]>',
+        '[e-mail]']
+
+    >>> [message['Subject'] for message in msgs]
+    ['[ubuntu/hoary] bar 1.0-6 (Accepted)',
+     '[ubuntu/hoary] bar 1.0-6 (Accepted)']
 
 Reset hoary back to released and remove disk files created during processing:
 
-  >>> hoary.status = SeriesStatus.CURRENT
-  >>> os.remove(os.path.join(datadir('suite/bar_1.0-5_debian_auto_sync'),
-  ...     'bar_1.0.orig.tar.gz'))
-  >>> os.remove(os.path.join(datadir('suite/bar_1.0-6'),
-  ...     'bar_1.0.orig.tar.gz'))
+    >>> hoary.status = SeriesStatus.CURRENT
+    >>> os.remove(os.path.join(datadir('suite/bar_1.0-5_debian_auto_sync'),
+    ...     'bar_1.0.orig.tar.gz'))
+    >>> os.remove(os.path.join(datadir('suite/bar_1.0-6'),
+    ...     'bar_1.0.orig.tar.gz'))
 
 Dry run uploads should not generate any emails.  Call do_accept with
 notify=False:
 
-  >>> sync_policy = getPolicy(
-  ...     name='sync', distro='ubuntu', distroseries='hoary')
-
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
-  ...     sync_policy, DevNullLogger())
-  >>> bar_src.process()
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept(notify=False)
+    >>> sync_policy = getPolicy(
+    ...     name='sync', distro='ubuntu', distroseries='hoary')
+
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'),
+    ...     sync_policy, DevNullLogger())
+    >>> bar_src.process()
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept(notify=False)
 
 No emails generated:
 
-  >>> msgs = pop_notifications()
-  >>> len(msgs)
-  0
+    >>> msgs = pop_notifications()
+    >>> len(msgs)
+    0
 
 Rejections with notify=False will also not generate any emails.
 
-  >>> result = bar_src.do_reject(notify=False)
-  >>> msgs = pop_notifications()
-  >>> len(msgs)
-  0
+    >>> result = bar_src.do_reject(notify=False)
+    >>> msgs = pop_notifications()
+    >>> len(msgs)
+    0
 
 The PackageUpload record created by NascentUpload will be in the NEW
 state if the package was not previously uploaded.  When accepted by an
@@ -631,199 +641,205 @@
 dry_run, which when True will not send any emails.  It will also log at
 the INFO level what it /would/ have sent.
 
-  >>> random_package_upload = hoary.getQueueItems()[0]
-  >>> random_package_upload.notify(dry_run=True, logger=FakeLogger())
-  DEBUG Building recipients list.
-  ...
-  INFO Would have sent a mail:
-  INFO   Subject: [ubuntu/hoary] bar 1.0-6 (Accepted)
-  ...
-  INFO   Recipients: Celso Providelo <[e-mail]>
-  ...
-  INFO bar (1.0-6) breezy; urgency=low
-  ...
-  INFO No announcement sent
-  ...
-  INFO You are receiving this email because you are the uploader, maintainer or
-  INFO signer of the above package.
+    >>> random_package_upload = hoary.getQueueItems()[0]
+    >>> random_package_upload.notify(dry_run=True, logger=FakeLogger())
+    DEBUG Building recipients list.
+    ...
+    INFO Would have sent a mail:
+    INFO   Subject: [ubuntu/hoary] bar 1.0-6 (Accepted)
+    ...
+    INFO   Recipients: Celso Providelo <[e-mail]>
+    ...
+    INFO bar (1.0-6) breezy; urgency=low
+    ...
+    INFO No announcement sent
+    ...
+    INFO You are receiving this email because you are the uploader, maintainer
+    or
+    INFO signer of the above package.
 
 No emails generated:
 
-  >>> msgs = pop_notifications()
-  >>> len(msgs)
-  0
+    >>> msgs = pop_notifications()
+    >>> len(msgs)
+    0
 
 Uploads with UTF-8 characters in email addresses in the changes file are
 permitted, but converted to ASCII, which is a limitation of the mailer.
 However, UTF-8 in the mail content is preserved.
 
-  >>> hoary.status = SeriesStatus.DEVELOPMENT
-  >>> anything_policy = getPolicy(
-  ...     name='anything', distro='ubuntu', distroseries='hoary')
-  >>> bar_upload = NascentUpload.from_changesfile_path(
-  ...     datadir(
-  ...         'suite/bar_1.0-10_utf8_changesfile/bar_1.0-10_source.changes'),
-  ...     anything_policy, DevNullLogger())
-  >>> bar_upload.process()
-
-  >>> bar_upload.logger = FakeLogger()
-  >>> result = bar_upload.do_accept()
-  DEBUG Creating queue entry
-  ...
-
-  >>> msgs = pop_notifications(sort_key=operator.itemgetter('To'))
-  >>> len(msgs)
-  2
+    >>> hoary.status = SeriesStatus.DEVELOPMENT
+    >>> anything_policy = getPolicy(
+    ...     name='anything', distro='ubuntu', distroseries='hoary')
+    >>> bar_upload = NascentUpload.from_changesfile_path(
+    ...     datadir(
+    ...         'suite/bar_1.0-10_utf8_changesfile/'
+    ...         'bar_1.0-10_source.changes'),
+    ...     anything_policy, DevNullLogger())
+    >>> bar_upload.process()
+
+    >>> bar_upload.logger = FakeLogger()
+    >>> result = bar_upload.do_accept()
+    DEBUG Creating queue entry
+    ...
+
+    >>> msgs = pop_notifications(sort_key=operator.itemgetter('To'))
+    >>> len(msgs)
+    2
 
 "Cihar" should actually be "Čihař" but the mailer will convert to ASCII.
 
-  >>> [message['From'] for message in msgs]
-  ['Root <root@localhost>', 'Non-ascii changed-by Cihar <[e-mail]>']
+    >>> [message['From'] for message in msgs]
+    ['Root <root@localhost>', 'Non-ascii changed-by Cihar
+    <[e-mail]>']
 
 UTF-8 text in the changes file that is sent on the email is preserved
 in the MIME encoding. Please note also that the person that signed the
 changes file is mentioned toward the end of the email.
 
-  >>> announcement_email = msgs[0]
-  >>> announcement_email.is_multipart()
-  True
+    >>> announcement_email = msgs[0]
+    >>> announcement_email.is_multipart()
+    True
 
-  >>> body = announcement_email.get_payload()[0]
-  >>> print body.as_string() # doctest: -NORMALIZE_WHITESPACE
-  Content-Type: text/plain; charset="utf-8"
-  MIME-Version: 1.0
-  Content-Transfer-Encoding: quoted-printable
-  <BLANKLINE>
-  bar (1.0-10) breezy; urgency=3Dlow
-  <BLANKLINE>
-    * Changes file that contains UTF-8
-  <BLANKLINE>
-    * Non-ascii text: =C4=8Ciha=C5=99
-  <BLANKLINE>
-  <BLANKLINE>
-  Date: Thu, 30 Mar 2006 01:36:14 +0100
-  Changed-By: Non-ascii changed-by =C4=8Ciha=C5=99 <daniel.silverstone@canoni=
-  cal.com>
-  Maintainer: Non-ascii maintainer =C4=8Ciha=C5=99 <[e-mail]=
-  .com>
-  Signed-By: Foo Bar <[e-mail]>
-  http://launchpad.dev/ubuntu/hoary/+source/bar/1.0-10
-  <BLANKLINE>
-  =3D=3D
-  <BLANKLINE>
-  Announcing to [e-mail]
-  <BLANKLINE>
-  Thank you for your contribution to Ubuntu Linux.
-  <BLANKLINE>
-  -- =
-  <BLANKLINE>
-  You are receiving this email because you are the uploader, maintainer or
-  signer of the above package.
-  <BLANKLINE>
+    >>> body = announcement_email.get_payload()[0]
+    >>> print body.as_string() # doctest: -NORMALIZE_WHITESPACE
+    Content-Type: text/plain; charset="utf-8"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: quoted-printable
+    <BLANKLINE>
+    bar (1.0-10) breezy; urgency=3Dlow
+    <BLANKLINE>
+      * Changes file that contains UTF-8
+    <BLANKLINE>
+      * Non-ascii text: =C4=8Ciha=C5=99
+    <BLANKLINE>
+    <BLANKLINE>
+    Date: Thu, 30 Mar 2006 01:36:14 +0100
+    Changed-By: Non-ascii changed-by =C4=8Ciha=C5=99 <daniel.silverstone@canoni=
+    cal.com>
+    Maintainer: Non-ascii maintainer =C4=8Ciha=C5=99 <[e-mail]=
+    .com>
+    Signed-By: Foo Bar <[e-mail]>
+    http://launchpad.dev/ubuntu/hoary/+source/bar/1.0-10
+    <BLANKLINE>
+    =3D=3D
+    <BLANKLINE>
+    Announcing to [e-mail]
+    <BLANKLINE>
+    Thank you for your contribution to Ubuntu Linux.
+    <BLANKLINE>
+    -- =
+    <BLANKLINE>
+    You are receiving this email because you are the uploader, maintainer or
+    signer of the above package.
+    <BLANKLINE>
 
 In order to facilitate scripts that parse announcement emails, the changes
 file is enclosed as an attachment.
 
-  >>> attachment = announcement_email.get_payload()[1]
+    >>> attachment = announcement_email.get_payload()[1]
 
 Here's the attachment metadata.
 
-  >>> attachment['Content-Disposition']
-  'attachment; filename="changesfile"'
+    >>> attachment['Content-Disposition']
+    'attachment; filename="changesfile"'
 
 And what follows is the content of the attachment.
 
-  >>> print attachment.as_string() # doctest: -NORMALIZE_WHITESPACE
-  Content-Type: text/plain; charset="utf-8"
-  MIME-Version: 1.0
-  Content-Transfer-Encoding: quoted-printable
-  Content-Disposition: attachment; filename="changesfile"
-  <BLANKLINE>
-  -----BEGIN PGP SIGNED MESSAGE-----
-  Hash: SHA1
-  <BLANKLINE>
-  Format: 1.7
-  Date: Thu, 30 Mar 2006 01:36:14 +0100
-  Source: bar
-  Binary: bar
-  Architecture: source
-  Version: 1.0-10
-  Distribution: breezy
-  Urgency: low
-  Maintainer: Non-ascii maintainer =C4=8Ciha=C5=99 <[e-mail]=
-  .com>
-  Changed-By: Non-ascii changed-by =C4=8Ciha=C5=99 <daniel.silverstone@canoni=
-  cal.com>
-  Description: =
-  <BLANKLINE>
-   bar        - Stuff for testing
-  Changes: =
-  <BLANKLINE>
-   bar (1.0-10) breezy; urgency=3Dlow
-   .
-     * Changes file that contains UTF-8
-   .
-     * Non-ascii text: =C4=8Ciha=C5=99
-   .
-  Files: =
-  <BLANKLINE>
-   a4932aa84fdb62819b49f3dda163fc0d 514 devel optional bar_1.0-10.dsc
-   ac6b4efe44e31f47ec9f0d0fac6935f4 622 devel optional bar_1.0-10.diff.gz
-  <BLANKLINE>
-  -----BEGIN PGP SIGNATURE-----
-  Version: GnuPG v1.4.6 (GNU/Linux)
-  <BLANKLINE>
-  iD8DBQFGjOzNjn63CGxkqMURAlDZAJ9CusNQWwbTJr7JHYV4Ka1JbWwmJACeLbs5
-  Hzkb2pxxwYzKs7uyCiFONlo=3D
-  =3D9dL/
-  -----END PGP SIGNATURE-----
-  <BLANKLINE>
+    >>> print attachment.as_string() # doctest: -NORMALIZE_WHITESPACE
+    Content-Type: text/plain; charset="utf-8"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: quoted-printable
+    Content-Disposition: attachment; filename="changesfile"
+    <BLANKLINE>
+    -----BEGIN PGP SIGNED MESSAGE-----
+    Hash: SHA1
+    <BLANKLINE>
+    Format: 1.7
+    Date: Thu, 30 Mar 2006 01:36:14 +0100
+    Source: bar
+    Binary: bar
+    Architecture: source
+    Version: 1.0-10
+    Distribution: breezy
+    Urgency: low
+    Maintainer: Non-ascii maintainer =C4=8Ciha=C5=99 <[e-mail]=
+    .com>
+    Changed-By: Non-ascii changed-by =C4=8Ciha=C5=99 <daniel.silverstone@canoni=
+    cal.com>
+    Description: =
+    <BLANKLINE>
+     bar        - Stuff for testing
+    Changes: =
+    <BLANKLINE>
+     bar (1.0-10) breezy; urgency=3Dlow
+     .
+       * Changes file that contains UTF-8
+     .
+       * Non-ascii text: =C4=8Ciha=C5=99
+     .
+    Files: =
+    <BLANKLINE>
+     a4932aa84fdb62819b49f3dda163fc0d 514 devel optional bar_1.0-10.dsc
+     ac6b4efe44e31f47ec9f0d0fac6935f4 622 devel optional bar_1.0-10.diff.gz
+    <BLANKLINE>
+    -----BEGIN PGP SIGNATURE-----
+    Version: GnuPG v1.4.6 (GNU/Linux)
+    <BLANKLINE>
+    iD8DBQFGjOzNjn63CGxkqMURAlDZAJ9CusNQWwbTJr7JHYV4Ka1JbWwmJACeLbs5
+    Hzkb2pxxwYzKs7uyCiFONlo=3D
+    =3D9dL/
+    -----END PGP SIGNATURE-----
+    <BLANKLINE>
 
 The attempt to upload a package with a malformed changes file name will
 result in a rejection email.
 
 We first create a misnamed copy of the changes file.
 
-  >>> import os, shutil
-  >>> originalp = datadir('suite/bar_1.0-1/bar_1.0-1_source.changes')
-  >>> copyp = datadir('suite/bar_1.0-1/z-z_0.4.12-2~ppa2.changes')
-  >>> shutil.copyfile(originalp, copyp)
+    >>> import os, shutil
+    >>> originalp = datadir('suite/bar_1.0-1/bar_1.0-1_source.changes')
+    >>> copyp = datadir('suite/bar_1.0-1/z-z_0.4.12-2~ppa2.changes')
+    >>> shutil.copyfile(originalp, copyp)
 
 And then try to upload using the changes file with the malformed name.
 
-  >>> bar_src = NascentUpload.from_changesfile_path(
-  ...     copyp, sync_policy, DevNullLogger())
-  >>> bar_src.process()
-  Traceback (most recent call last):
-  ...
-  EarlyReturnUploadError: An error occurred that prevented further processing.
-
-  >>> bar_src.logger = FakeLogger()
-  >>> result = bar_src.do_accept()
-  DEBUG Building recipients list.
-  ...
-  DEBUG Sending rejection email.
-  DEBUG Sent a mail:
-  ...
-  DEBUG Rejected:
-  DEBUG z-z_0.4.12-2~ppa2.changes -> inappropriate changesfile name, should follow "<pkg>_<version>_<arch>.changes" format
-  ...
-  DEBUG If you don't understand why your files were rejected, or if the
-  DEBUG override file requires editing, please go to:
-  DEBUG http://answers.launchpad.net/soyuz
-  DEBUG
-  DEBUG --
-  DEBUG You are receiving this email because you are the uploader, maintainer or
-  DEBUG signer of the above package.
-
-  >>> [notification] = pop_notifications()
-
-  >>> notification['X-Katie']
-  'Launchpad actually'
-
-  >>> print_addrlist(notification['To'])
-  Daniel Silverstone <[e-mail]>
+    >>> bar_src = NascentUpload.from_changesfile_path(
+    ...     copyp, sync_policy, DevNullLogger())
+    >>> bar_src.process()
+    Traceback (most recent call last):
+    ...
+    EarlyReturnUploadError: An error occurred that prevented further
+    processing.
+
+    >>> bar_src.logger = FakeLogger()
+    >>> result = bar_src.do_accept()
+    DEBUG Building recipients list.
+    ...
+    DEBUG Sending rejection email.
+    DEBUG Sent a mail:
+    ...
+    DEBUG Rejected:
+    DEBUG z-z_0.4.12-2~ppa2.changes -> inappropriate changesfile name, should
+    follow "<pkg>_<version>_<arch>.changes" format
+    ...
+    DEBUG If you don't understand why your files were rejected, or if the
+    DEBUG override file requires editing, please go to:
+    DEBUG http://answers.launchpad.net/soyuz
+    DEBUG
+    DEBUG --
+    DEBUG You are receiving this email because you are the uploader,
+    maintainer or
+    DEBUG signer of the above package.
+
+    >>> [notification] = pop_notifications()
+
+    >>> notification['X-Katie']
+    'Launchpad actually'
+
+    >>> print_addrlist(notification['To'])
+    Daniel Silverstone <[e-mail]>
 
 Remove the misnamed changes file copy used for testing.
 
-  >>> os.unlink(copyp)
+    >>> os.unlink(copyp)
 
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2011-01-27 17:17:50 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2011-01-27 17:17:51 +0000
@@ -1950,10 +1950,7 @@
         # Upon full build the upload log is unset.
         self.assertIs(None, build.upload_log)
 
-    def testSourcePackageRecipeBuild(self):
-        # Properly uploaded source packages should result in the
-        # build status changing to FULLYBUILT.
-
+    def doSuccessRecipeBuild(self):
         # Upload a source package
         archive = self.factory.makeArchive()
         archive.require_virtualized = False
@@ -1981,14 +1978,27 @@
         BuildUploadHandler(self.uploadprocessor, self.incoming_folder,
             leaf_name).process()
         self.layer.txn.commit()
+        return build
 
+    def testSourcePackageRecipeBuild(self):
+        # Properly uploaded source packages should result in the
+        # build status changing to FULLYBUILT.
+        build = self.doSuccessRecipeBuild()
         self.assertEquals(BuildStatus.FULLYBUILT, build.status)
         self.assertEquals(None, build.builder)
         self.assertIsNot(None, build.duration)
         # Upon full build the upload log is unset.
         self.assertIs(None, build.upload_log)
 
-    def testSourcePackageRecipeBuild_fail(self):
+    def testSourcePackageRecipeBuild_success_mail(self):
+        # When a source package recipe build succeeds, it sends a build-style
+        # email, not user-upload-style one.
+        self.doSuccessRecipeBuild()
+        (mail,) = pop_notifications()
+        subject = mail['Subject'].replace('\n\t', ' ')
+        self.assertIn('Successfully built', subject)
+
+    def doFailureRecipeBuild(self):
         # A source package recipe build will fail if no files are present.
 
         # Upload a source package
@@ -2012,11 +2022,24 @@
         BuildUploadHandler(self.uploadprocessor, self.incoming_folder,
             leaf_name).process()
         self.layer.txn.commit()
+        return build
+
+    def testSourcePackageRecipeBuild_fail(self):
+        build = self.doFailureRecipeBuild()
         self.assertEquals(BuildStatus.FAILEDTOUPLOAD, build.status)
         self.assertEquals(None, build.builder)
         self.assertIsNot(None, build.duration)
         self.assertIsNot(None, build.upload_log)
 
+    def testSourcePackageRecipeBuild_fail_mail(self):
+        # Failures should generate a message that includes the upload log URL.
+        self.doFailureRecipeBuild()
+        (mail,) = pop_notifications()
+        subject = mail['Subject'].replace('\n\t', ' ')
+        self.assertIn('Failed to upload', subject)
+        body = mail.get_payload(decode=True)
+        self.assertIn('Upload Log: http', body)
+
     def testBuildWithInvalidStatus(self):
         # Builds with an invalid (non-UPLOADING) status should trigger
         # a warning but be left alone.
 
=== modified file 'lib/lp/archiveuploader/uploadprocessor.py'
--- lib/lp/archiveuploader/uploadprocessor.py	2011-01-27 17:17:50 +0000
+++ lib/lp/archiveuploader/uploadprocessor.py	2011-01-27 17:17:51 +0000
@@ -660,13 +660,15 @@
             error_utility.raising(info, request)
             logger.error('%s (%s)' % (message, request.oopsid))
             result = UploadStatusEnum.FAILED
-        if not (result == UploadStatusEnum.ACCEPTED and
-                self.build.verifySuccessfulUpload() and
-                self.build.status == BuildStatus.FULLYBUILT):
+        if (result != UploadStatusEnum.ACCEPTED or
+            not self.build.verifySuccessfulUpload()):
             self.build.status = BuildStatus.FAILEDTOUPLOAD
+        if self.build.status != BuildStatus.FULLYBUILT:
+            self.build.storeUploadLog(logger.getLogBuffer())
             self.build.notify(extra_info="Uploading build %s failed." %
                               self.upload)
-            self.build.storeUploadLog(logger.getLogBuffer())
+        else:
+            self.build.notify()
         self.processor.ztm.commit()
         self.moveProcessedUpload(result, logger)
 
 
=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2011-01-24 20:57:37 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2011-01-27 17:17:51 +0000
@@ -621,6 +621,8 @@
 
         if not config.builddmaster.send_build_notification:
             return
+        if self.status == BuildStatus.FULLYBUILT:
+            return
 
         recipients = set()
 
 
=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2011-01-14 14:03:28 +0000
+++ lib/lp/soyuz/model/queue.py	2011-01-27 17:17:51 +0000
@@ -72,7 +72,6 @@
     )
 from lp.services.propertycache import cachedproperty
 from lp.soyuz.enums import (
-    BinaryPackageFormat,
     PackageUploadCustomFormat,
     PackageUploadStatus,
     )
@@ -192,9 +191,23 @@
     # PackageUploadSource objects which are related.
     sources = SQLMultipleJoin('PackageUploadSource',
                               joinColumn='packageupload')
+    # Does not include source builds.
     builds = SQLMultipleJoin('PackageUploadBuild',
                              joinColumn='packageupload')
 
+    def getSourceBuild(self):
+        #avoid circular import
+        from lp.code.model.sourcepackagerecipebuild import (
+            SourcePackageRecipeBuild)
+        from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
+        return Store.of(self).find(
+            SourcePackageRecipeBuild,
+            SourcePackageRecipeBuild.id ==
+                SourcePackageRelease.source_package_recipe_build_id,
+            SourcePackageRelease.id ==
+            PackageUploadSource.sourcepackagereleaseID,
+            PackageUploadSource.packageupload == self.id).one()
+
     # Also the custom files associated with the build.
     customfiles = SQLMultipleJoin('PackageUploadCustom',
                                   joinColumn='packageupload')
@@ -488,6 +501,10 @@
         """See `IPackageUpload`."""
         return self.builds
 
+    @cachedproperty
+    def from_build(self):
+        return bool(self.builds) or self.getSourceBuild()
+
     def isAutoSyncUpload(self, changed_by_email):
         """See `IPackageUpload`."""
         katie = getUtility(ILaunchpadCelebrities).katie
@@ -1070,10 +1087,10 @@
 
         # If this is a binary or mixed upload, we don't send *any* emails
         # provided it's not a rejection or a security upload:
-        if(self.contains_build and
+        if(self.from_build and
            self.status != PackageUploadStatus.REJECTED and
            self.pocket != PackagePublishingPocket.SECURITY):
-            debug(self.logger, "Not sending email, upload contains binaries.")
+            debug(self.logger, "Not sending email; upload is from a build.")
             return
 
         # XXX julian 2007-05-11:
 
=== modified file 'lib/lp/soyuz/tests/test_build_notify.py'
--- lib/lp/soyuz/tests/test_build_notify.py	2011-01-20 20:31:07 +0000
+++ lib/lp/soyuz/tests/test_build_notify.py	2011-01-27 17:17:51 +0000
@@ -114,7 +114,7 @@
             duration = 'not finished'
             build_log = 'see builder page'
         elif (
-            build.status == BuildStatus.SUPERSEDED or 
+            build.status == BuildStatus.SUPERSEDED or
             build.status == BuildStatus.NEEDSBUILD):
             duration = 'not available'
             build_log = 'not available'
@@ -203,20 +203,11 @@
         self._assert_mail_is_correct(build, notification, ppa=True)
 
     def test_notify_successfully_built(self):
-        # We can notify the creator when the build is sucessful.
+        # Successful builds don't notify anyone.
         self.create_builds(self.archive)
         build = self.builds[BuildStatus.FULLYBUILT.value]
         build.notify()
-        notification = pop_notifications()[1]
-        self._assert_mail_is_correct(build, notification)
-
-    def test_notify_successfully_built_ppa(self):
-        # We can notify the creator when the build is sucessful.
-        self.create_builds(self.ppa)
-        build = self.builds[BuildStatus.FULLYBUILT.value]
-        build.notify()
-        notification = pop_notifications()[1]
-        self._assert_mail_is_correct(build, notification, ppa=True)
+        self.assertEqual([], pop_notifications())
 
     def test_notify_dependency_wait(self):
         # We can notify the creator when the build can't find a dependency.
@@ -321,7 +312,7 @@
         # When the 'notify_owner' config option is False, we don't send mail
         # to the owner of the SPR.
         self.create_builds(self.archive)
-        build = self.builds[BuildStatus.FULLYBUILT.value]
+        build = self.builds[BuildStatus.FAILEDTOBUILD.value]
         notify_owner = dedent("""
             [builddmaster]
             send_build_notification: True
@@ -357,13 +348,13 @@
         sponsor = self.factory.makePerson('[e-mail]')
         key = self.factory.makeGPGKey(owner=sponsor)
         self.create_builds(self.archive)
-        build = self.builds[BuildStatus.FULLYBUILT.value]
+        build = self.builds[BuildStatus.FAILEDTOBUILD.value]
         spr = build.current_source_publication.sourcepackagerelease
         # Push past the security proxy
         removeSecurityProxy(spr).dscsigningkey = key
         build.notify()
         notifications = pop_notifications()
         expected_emails = self.buildd_admins_email + [
-            '[e-mail]', '[e-mail]'] 
+            '[e-mail]', '[e-mail]']
         actual_emails = [n['To'] for n in notifications]
         self.assertEquals(expected_emails, actual_emails)