Merge lp:~michael.nelson/launchpad/ppa-privatisation-test-refactor4 into lp:launchpad

[Michael Nelson]

[Michael Nelson (michael.nelson)]

This is the fourth branch in a series to refactor soyuz tests after fixing bug 506203.

The MP for the branch that actually fixed the bug is at:

https://code.edge.launchpad.net/~michael.nelson/launchpad/506203-ppa-privatisation-check/+merge/19415

The fix ensures that the privacy of a PPA cannot be altered once it has packages published. Unfortunately most of our test infrastructure does exactly that (switches the privacy to do a few tests and then switches it back).

The complete test breakages are as follows:
http://pastebin.ubuntu.com/378292/

This branch fixes:

bin/test -vv -t archiveauthtoken.txt -t archivesubscriber.txt -t doc/build.txt -t package-diff.txt -t sourcepackagerelease.txt -t xx-ppa-files.txt

Thanks.

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/archiveauthtoken.txt'
--- lib/lp/soyuz/doc/archiveauthtoken.txt	2009-05-06 20:53:05 +0000
+++ lib/lp/soyuz/doc/archiveauthtoken.txt	2010-02-26 15:38:20 +0000
@@ -7,13 +7,12 @@
 
 See also ArchiveSubscriber.txt.
 
-Set cprov's PPA to be a private one:
+First we create a private PPA for Joe.
 
-    >>> login("[e-mail]")
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> cprov = getUtility(IPersonSet).getByName("cprov")
-    >>> cprov.archive.buildd_secret = "secret"
-    >>> cprov.archive.private = True
+    >>> login("[e-mail]")
+    >>> joe = factory.makePerson(name="joe", displayname="Joe Smith")
+    >>> joe_private_ppa = factory.makeArchive(
+    ...     owner=joe, private=True)
     >>> logout()
 
 == Creating new tokens ==
@@ -26,23 +25,24 @@
 though we do not yet have a subscription:
 
     >>> login("[e-mail]")
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> name12 = getUtility(IPersonSet).getByName("name12")
-    >>> new_token = cprov.archive.newAuthToken(name12)
+    >>> new_token = joe_private_ppa.newAuthToken(name12)
     Traceback (most recent call last):
     ...
     Unauthorized: You do not have a subscription for
-    PPA for Celso Providelo.
-
-Create a subscription for name12 to cprov's archive:
-
-    >>> login("[e-mail]")
-    >>> subscription_to_cprov_archive = cprov.archive.newSubscription(
-    ...     name12, cprov)
+    PPA for Joe Smith.
+
+Create a subscription for name12 to joe's archive:
+
+    >>> login_person(joe)
+    >>> subscription_to_joe_private_ppa = joe_private_ppa.newSubscription(
+    ...     name12, joe)
     >>> login("[e-mail]")
 
 Now try again to create a token as name12 - this time it works:
 
-    >>> token_with_random_string = cprov.archive.newAuthToken(name12)
+    >>> token_with_random_string = joe_private_ppa.newAuthToken(name12)
 
 By default the tokens are 20 characters long.
 
@@ -51,26 +51,26 @@
 
 It is not possible to create a second token when one already exists:
 
-    >>> new_token = cprov.archive.newAuthToken(name12)
+    >>> new_token = joe_private_ppa.newAuthToken(name12)
     Traceback (most recent call last):
     ...
     ArchiveSubscriptionError: Sample Person already has a token for
-    PPA for Celso Providelo.
+    PPA for Joe Smith.
 
 So deactivate the old token so that we can create a new token:
 
-    >>> login("[e-mail]")
+    >>> login_person(joe)
     >>> token_with_random_string.deactivate()
     >>> login("[e-mail]")
 
 We can also specify our own token for testing purposes:
 
-    >>> new_token = cprov.archive.newAuthToken(name12, u"testtoken")
+    >>> new_token = joe_private_ppa.newAuthToken(name12, u"testtoken")
 
 The new token is returned and reflects the data:
 
     >>> print new_token.archive.displayname
-    PPA for Celso Providelo
+    PPA for Joe Smith
 
     >>> print new_token.person.name
     name12
@@ -79,7 +79,7 @@
     testtoken
 
     >>> print new_token.archive_url
-    http://name12:[e-mail]/cprov/ppa/ubuntu
+    http://name12:[e-mail]/joe/ppa/...
 
 Commit the new token to the database.
 
@@ -126,7 +126,7 @@
 
 It's also possible to retrieve a set of all the tokens for an archive.
 
-    >>> tokens = token_set.getByArchive(cprov.archive)
+    >>> tokens = token_set.getByArchive(joe_private_ppa)
     >>> print tokens.count()
     1
 
@@ -153,7 +153,7 @@
     ...
     Unauthorized:...
 
-    >>> login("[e-mail]")
+    >>> login_person(joe)
     >>> new_token.deactivate()
 
 Deactivating sets the date_deactivated value.
@@ -163,14 +163,14 @@
 
 We can do this as an admin too:
 
-    >>> new_token = cprov.archive.newAuthToken(name12)
+    >>> new_token = joe_private_ppa.newAuthToken(name12)
     >>> login("[e-mail]")
     >>> new_token.deactivate()
 
 Deactivating a token stops it being returned from getByArchive().  The
 previous count of 1 is now reduced to 0.
 
-    >>> token_set.getByArchive(cprov.archive).count()
+    >>> token_set.getByArchive(joe_private_ppa).count()
     0
 
 The IArchiveAuthTokenSet.getActiveTokenForArchiveAndPerson() method will

=== modified file 'lib/lp/soyuz/doc/archivesubscriber.txt'
--- lib/lp/soyuz/doc/archivesubscriber.txt	2010-02-11 09:14:17 +0000
+++ lib/lp/soyuz/doc/archivesubscriber.txt	2010-02-26 15:38:20 +0000
@@ -61,7 +61,7 @@
     Unauthorized:...
 
 If we log in as cprov it will still not work because his archive is
-currently public:
+public:
 
     >>> login("[e-mail]")
     >>> new_sub = cprov.archive.newSubscription(
@@ -70,20 +70,22 @@
     ...
     ArchiveNotPrivate: Only private archives can have subscriptions.
 
-After ensuring cprov's archive is private, cprov can create a
+If we create a private ppa for Celso, then he can create a
 subscription for joesmith:
 
     >>> login('[e-mail]')
-    >>> cprov.archive.buildd_secret = 'really secret'
-    >>> cprov.archive.private = True
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, distribution=cprov.archive.distribution,
+    ...     private=True, name='p3a',
+    ...     description="packages to help my friends.")
     >>> login("[e-mail]")
-    >>> new_sub = cprov.archive.newSubscription(
+    >>> new_sub = cprov_private_ppa.newSubscription(
     ...     joesmith, cprov, description=u"subscription for joesmith")
 
 The new subscription is returned and reflects the data:
 
     >>> print new_sub.displayname
-    Joe Smith's access to PPA for Celso Providelo
+    Joe Smith's access to PPA named p3a for Celso Providelo
 
     >>> print new_sub.registrant.name
     cprov
@@ -109,15 +111,15 @@
     From: Celso Providelo <[e-mail]>
     To: [e-mail]
     Reply-To: Celso Providelo <[e-mail]>
-    Subject: PPA access granted for PPA for Celso Providelo
+    Subject: PPA access granted for PPA named p3a for Celso Providelo
     Hello Joe Smith,
     <BLANKLINE>
     Launchpad: access to a private archive
     --------------------------------------
     <BLANKLINE>
     Celso Providelo has granted you access to a private software archive
-    "PPA for Celso Providelo" (ppa:cprov/ppa), which is hosted by Launchpad
-    and has the following description:
+    "PPA named p3a for Celso Providelo" (ppa:cprov/p3a), which is hosted
+    by Launchpad and has the following description:
     <BLANKLINE>
     packages to help my friends.
     <BLANKLINE>
@@ -143,21 +145,22 @@
 A subscription for a subscriber who already has a current subscription
 cannot be created:
 
-    >>> new_sub = cprov.archive.newSubscription(
+    >>> new_sub = cprov_private_ppa.newSubscription(
     ...     joesmith, cprov, description=u"subscription for joesmith")
     Traceback (most recent call last):
     ...
     AlreadySubscribed: Joe Smith already has a current subscription for
-    'PPA for Celso Providelo'.
+    'PPA named p3a for Celso Providelo'.
 
 
 Add another subscription for the test user, this time to mark's ppa:
 
     >>> login("[e-mail]")
     >>> mark = getUtility(IPersonSet).getByName("mark")
-    >>> mark.archive.buildd_secret = "really secret"
-    >>> mark.archive.private = True
-    >>> new_sub_to_mark_ppa = mark.archive.newSubscription(
+    >>> mark_private_ppa = factory.makeArchive(
+    ...     owner=mark, distribution=mark.archive.distribution,
+    ...     private=True, name='p3a')
+    >>> new_sub_to_mark_ppa = mark_private_ppa.newSubscription(
     ...     joesmith, mark, description=u"subscription for joesmith")
 
     >>> print_emails()
@@ -167,7 +170,7 @@
 
 And also a subscription for a Team:
 
-    >>> new_team_sub_to_mark_ppa = mark.archive.newSubscription(
+    >>> new_team_sub_to_mark_ppa = mark_private_ppa.newSubscription(
     ...     team_cprov, mark, description=u"Access for cprov team")
 
     >>> print_emails()
@@ -219,7 +222,7 @@
 
     >>> print sub_set.getBySubscriber(
     ...     new_sub.subscriber)[0].archive.displayname
-    PPA for Celso Providelo
+    PPA named p3a for Celso Providelo
 
     >>> print sub_set.getByArchive(new_sub.archive)[0].subscriber.name
     joesmith
@@ -229,7 +232,7 @@
 
     >>> print sub_set.getBySubscriber(
     ...     new_sub.subscriber, new_sub.archive)[0].archive.displayname
-    PPA for Celso Providelo
+    PPA named p3a for Celso Providelo
 
 By default the getBySubscriber() and getByArchive() methods return
 all current subscriptions, most recently created first:
@@ -238,10 +241,10 @@
     >>> for subscription in sub_set.getBySubscriber(new_sub.subscriber):
     ...     print subscription.archive.displayname
     ...     print subscription.date_created.date()
-    PPA for Celso Providelo      2009-02-26
-    PPA for Mark Shuttleworth    2009-02-22
+    PPA named p3a for Celso Providelo      2009-02-26
+    PPA named p3a for Mark Shuttleworth    2009-02-22
 
-    >>> for subscription in sub_set.getByArchive(mark.archive):
+    >>> for subscription in sub_set.getByArchive(mark_private_ppa):
     ...     print subscription.subscriber.displayname
     ...     print subscription.date_created.date()
     Team Cprov      2009-02-24
@@ -258,7 +261,7 @@
 
     >>> sub_set.getBySubscriber(new_sub.subscriber).count()
     1
-    >>> sub_set.getByArchive(mark.archive).count()
+    >>> sub_set.getByArchive(mark_private_ppa).count()
     1
 
 Unless we explicitly ask for all subscriptions - not just the current ones:
@@ -266,7 +269,7 @@
     >>> sub_set.getBySubscriber(
     ...     new_sub.subscriber, current_only=False).count()
     2
-    >>> sub_set.getByArchive(mark.archive, current_only=False).count()
+    >>> sub_set.getByArchive(mark_private_ppa, current_only=False).count()
     2
 
 The getBySubscriber() method includes by default subscriptions for teams
@@ -276,8 +279,8 @@
     >>> for subscription in sub_set.getBySubscriber(joesmith):
     ...     print subscription.archive.displayname
     ...     print subscription.description
-    PPA for Celso Providelo        subscription for joesmith
-    PPA for Mark Shuttleworth      Access for cprov team
+    PPA named p3a for Celso Providelo        subscription for joesmith
+    PPA named p3a for Mark Shuttleworth      Access for cprov team
 
 Finally, many callsites of getBySubscriber() will be interested not only
 in each subscription of the subscriber, but also the generated
@@ -286,7 +289,7 @@
 
 First create a token for joesmith's subscription for cprov's archive:
 
-    >>> joesmith_token = cprov.archive.newAuthToken(joesmith, u"test_token")
+    >>> joesmith_token = cprov_private_ppa.newAuthToken(joesmith, u"test_token")
 
 Now print out all subscriptions with their tokens for joesmith:
 
@@ -300,8 +303,8 @@
     ...         print token_text
     >>> print_subscriptions_with_tokens(
     ...     sub_set.getBySubscriberWithActiveToken(joesmith))
-    PPA for Celso Providelo            test_token
-    PPA for Mark Shuttleworth          None
+    PPA named p3a for Celso Providelo            test_token
+    PPA named p3a for Mark Shuttleworth          None
 
 Deactivated tokens are not included with the returned token for a
 subscription:
@@ -312,8 +315,8 @@
 
     >>> print_subscriptions_with_tokens(
     ... sub_set.getBySubscriberWithActiveToken(joesmith))
-    PPA for Celso Providelo            None
-    PPA for Mark Shuttleworth          None
+    PPA named p3a for Celso Providelo            None
+    PPA named p3a for Mark Shuttleworth          None
 
 == Amending Subscriptions ==
 
@@ -402,7 +405,7 @@
     >>> for subscription in sub_set.getBySubscriber(joesmith):
     ...     print subscription.archive.displayname
     ...     print subscription.description
-    PPA for Mark Shuttleworth      Access for cprov team
+    PPA named p3a for Mark Shuttleworth      Access for cprov team
 
     >>> subscription = sub_set.getBySubscriber(joesmith).first()
 
@@ -419,7 +422,7 @@
 a separate subscription), then he will no longer be listed as a non-active
 subscriber for this subscription:
 
-    >>> joesmith_token = mark.archive.newAuthToken(joesmith)
+    >>> joesmith_token = mark_private_ppa.newAuthToken(joesmith)
     >>> for person in subscription.getNonActiveSubscribers():
     ...     print person.displayname
     Celso Providelo
@@ -433,7 +436,7 @@
     ...                                 displayname="Harry Smith",
     ...                                 password="test",
     ...                                 email="[e-mail]")
-    >>> subscription = mark.archive.newSubscription(
+    >>> subscription = mark_private_ppa.newSubscription(
     ...     harrysmith, mark, description=u"subscription for joesmith")
     >>> for person in subscription.getNonActiveSubscribers():
     ...     print person.displayname
@@ -443,7 +446,7 @@
 getNonActiveSubscribers will return an empty result set as he is now
 "active".
 
-    >>> harry_token = mark.archive.newAuthToken(harrysmith)
+    >>> harry_token = mark_private_ppa.newAuthToken(harrysmith)
     >>> print subscription.getNonActiveSubscribers().count()
     0
 
@@ -453,7 +456,7 @@
     >>> launchpad_devs = getUtility(IPersonSet).getByName('launchpad')
     >>> ignored = launchpad_devs.addMember(
     ...     team_cprov, mark, force_team_add=True)
-    >>> subscription = mark.archive.newSubscription(
+    >>> subscription = mark_private_ppa.newSubscription(
     ...     launchpad_devs, mark, description=u"LP team too")
     >>> for person in subscription.getNonActiveSubscribers():
     ...     print person.displayname

=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2010-02-10 11:21:41 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-02-26 15:38:20 +0000
@@ -220,8 +220,9 @@
 storeUploadLog() upload the given content as a restricted file.
 
     >>> login('[e-mail]')
-    >>> active_build.archive.buildd_secret = "secret"
-    >>> active_build.archive.private = True
+    >>> original_archive = active_build.archive
+    >>> private_ppa = factory.makeArchive(private=True)
+    >>> removeSecurityProxy(active_build).archive = private_ppa
     >>> login(ANONYMOUS)
 
 Simply changing the archive privacy after the 'upload_log' is stored
@@ -249,11 +250,11 @@
     >>> print active_build.upload_log.restricted
     True
 
-Restore ubuntu main archive state to not affect the rest of the tests.
+Restore ubuntu main archive as the target to not affect the rest of the
+tests.
 
     >>> login('[e-mail]')
-    >>> active_build.archive.buildd_secret = ''
-    >>> active_build.archive.private = False
+    >>> removeSecurityProxy(active_build).archive = original_archive
     >>> login(ANONYMOUS)
 
 Since ubuntu/warty is already released the failed build can't be
@@ -770,38 +771,46 @@
 
     >>> login('[e-mail]')
 
-Let's make cprov's archive private (and hence its builds become private):
+Let's create a private PPA for cprov (and hence its builds become private):
 
     >>> from canonical.launchpad.interfaces import IPersonSet
     >>> cprov = removeSecurityProxy(getUtility(IPersonSet).getByName('cprov'))
-    >>> cprov.archive.buildd_secret = "secret"
-    >>> cprov.archive.private = True
-    >>> flush_database_updates()
-
-The default set of builds with no user specified excludes private builds:
-
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, private=True, name='p3a',
+    ...     distribution=cprov.archive.distribution)
     >>> from canonical.launchpad.interfaces import IBuilderSet
     >>> bob = getUtility(IBuilderSet)['bob']
+    >>> binaries = test_publisher.getPubBinaries(
+    ...     archive=cprov_private_ppa, builder=bob,
+    ...     binaryname='privacycheck-bin')
+    >>> flush_database_updates()
+
+The default set of builds with no user specified excludes private builds:
+
     >>> bob_builds = bob.getBuildRecords()
     >>> print_build_details(bob_builds)
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
+    cprov: i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     no-priv: i386 build of cdrkit 1.0 in ubuntu warty RELEASE
     ubuntu-team: i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     ...
     ubuntu-team: i386 build of mozilla-firefox 0.9 in ubuntu warty RELEASE
-    ubuntu-team: i386 build of mozilla-firefox 0.9 in ubuntu breezy-autotest 
+    ubuntu-team: i386 build of mozilla-firefox 0.9 in ubuntu breezy-autotest
     RELEASE
-    
+
     >>> bob_builds.count()
-    13
+    16
 
 If we include an admin user, we can see all the builds.  Here, we get
-three additional private builds for cprov:
+an additional private build for cprov:
 
     >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
     >>> admin = getUtility(ILaunchpadCelebrities).admin
     >>> bob_builds = bob.getBuildRecords(user=admin)
     >>> print_build_details(bob_builds)
+    cprov: i386 build of privacycheck 666 in ubuntutest breezy-autotest...
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
@@ -812,14 +821,15 @@
     ubuntu-team: i386 build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     ubuntu-team: i386 build of mozilla-firefox 0.9 in ubuntu breezy-autotest
         RELEASE
-    
+
     >>> bob_builds.count()
-    16
+    17
 
 Cprov can also see his own builds of course:
 
     >>> bob_builds = bob.getBuildRecords(user=cprov)
     >>> print_build_details(bob_builds)
+    cprov: i386 build of privacycheck 666 in ubuntutest breezy-autotest...
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
@@ -832,7 +842,7 @@
         RELEASE
 
     >>> bob_builds.count()
-    16
+    17
 
 Buildd admins specifically are not allowed to see private builds, which will
 be filtered from the list returned:
@@ -844,6 +854,9 @@
     >>> bob_builds = bob.getBuildRecords(user=buildd_admin)
     >>> print_build_details(bob_builds)
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
+    cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
+    cprov: i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     no-priv: i386 build of cdrkit 1.0 in ubuntu warty RELEASE
     ubuntu-team: i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
     ...
@@ -852,7 +865,7 @@
     RELEASE
 
     >>> bob_builds.count()
-    13
+    16
 
 You can filter on build state:
 
@@ -874,13 +887,6 @@
     >>> bob_pmount_ok_builds.count()
     4
 
-Restore cprov to non-private:
-
-    >>> login('[e-mail]')
-    >>> removeSecurityProxy(cprov).archive.private = False
-    >>> flush_database_updates()
-    >>> login(ANONYMOUS)
-
 
 == AssertionErrors in IBuild ==
 
@@ -1169,26 +1175,12 @@
 IBuild's content class is wrapped in a Zope security wrapper that prevents
 access to private builds for unauthorised users.
 
-cprov's archive is private which makes its builds private.  We'll add
-an extra build that is not published anywhere but in his PPA.
-
-    >>> login('[e-mail]')
-    >>> test_publisher.prepareBreezyAutotest()
-    >>> removeSecurityProxy(cprov).archive.private = True
-    >>> private_source_pub = test_publisher.getPubSource(
-    ...     status=PackagePublishingStatus.PUBLISHED,
-    ...     sourcename='privacy-test',
-    ...     architecturehintlist='i386',
-    ...     archive=cprov.archive)
-    >>> [private_build] = private_source_pub.createMissingBuilds()
-    >>> private_build.builder = bob
-    >>> flush_database_updates()
-
 Accessing the cprov builds when logged in as admin will see the records:
 
+    >>> login('[e-mail]')
     >>> bob_builds = bob.getBuildRecords(user=admin)
     >>> print_build_details(bob_builds)
-    cprov: i386 build of privacy-test 666 in ubuntutest breezy-autotest...
+    cprov: i386 build of privacycheck 666 in ubuntutest breezy-autotest...
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
@@ -1200,7 +1192,7 @@
     >>> login('[e-mail]')
     >>> bob_builds = bob.getBuildRecords(user=admin)
     >>> print_build_details(bob_builds)
-    cprov: i386 build of privacy-test 666 in ubuntutest breezy-autotest...
+    cprov: i386 build of privacycheck 666 in ubuntutest breezy-autotest...
     ubuntu-team: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: hppa build of mozilla-firefox 0.9 in ubuntu warty RELEASE
     cprov: i386 build of pmount 0.1-1 in ubuntu warty RELEASE
@@ -1446,10 +1438,10 @@
 
 == Getting the build records for a particular builder ==
 
-The getBuildsForBuilder method returns all the builds for the 
+The getBuildsForBuilder method returns all the builds for the
 specified builder ID, ordered from most-recently built.
 
-    Create some source packages with which to test the 
+    Create some source packages with which to test the
     getBuildsForBuilder method:
 
     >>> src_pkg_earlier = test_publisher.getPubSource(
@@ -1459,7 +1451,7 @@
     ...     status=PackagePublishingStatus.PUBLISHED,
     ...     sourcename='laterbuildsrc',
     ...     architecturehintlist='hppa i386')
-    
+
     Create the builds based on the source packages, with the builds
     for 'earlierbuildsrc' built one day before the 'laterbuildsrc':
 
@@ -1474,10 +1466,10 @@
     >>> later_builds = src_pkg_later.createMissingBuilds()
     >>> for build in later_builds:
     ...     build.datebuilt = eg_build_date
-    
+
     Ensure that the i386 builds are created by the 'frog' builder,
     while the hppa builds are created by 'bob' the builder:
-    
+
     >>> builds = earlier_builds + later_builds
     >>> for build in builds:
     ...     if build.processor.name == u'386':
@@ -1487,7 +1479,7 @@
 
     A call to getBuildsForBuilder returns only those builds that were
     built by the specified builder, ordered by datebuilt DESC:
-    
+
     >>> frog_builds = getUtility(IBuildSet).getBuildsForBuilder(
     ...     frog_builder.id)
     >>> print_build_details(frog_builds)

=== modified file 'lib/lp/soyuz/doc/package-diff.txt'
--- lib/lp/soyuz/doc/package-diff.txt	2009-12-13 11:55:40 +0000
+++ lib/lp/soyuz/doc/package-diff.txt	2010-02-26 15:38:20 +0000
@@ -732,11 +732,12 @@
     >>> print diff.diff_content.restricted
     False
 
-When we make FooBar's PPA private, the diff becomes 'private' and the
-new 'diff_content' is stored in the restricted librarian instance.
+If the diff is attached to a private PPA, the diff becomes 'private' and
+the new 'diff_content' is stored in the restricted librarian instance.
 
-    >>> diff.to_source.upload_archive.buildd_secret = 'nhack!'
-    >>> diff.to_source.upload_archive.private = True
+    >>> private_ppa = factory.makeArchive(private=True)
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> removeSecurityProxy(diff.to_source).upload_archive = private_ppa
 
     >>> print diff.private
     True

=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease.txt	2009-12-10 11:42:07 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease.txt	2010-02-26 15:38:20 +0000
@@ -265,11 +265,11 @@
     >>> cprov = getUtility(IPersonSet).getByName('cprov')
 
     >>> login('[e-mail]')
-    >>> cprov.archive.buildd_secret = 'boing'
-    >>> cprov.archive.private = True
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, private=True)
 
     >>> private_publication = test_publisher.getPubSource(
-    ...     archive=cprov.archive)
+    ...     archive=cprov_private_ppa)
 
     >>> test_sourcepackagerelease = private_publication.sourcepackagerelease
     >>> print test_sourcepackagerelease.title

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-files.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-files.txt	2010-01-20 14:29:59 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-files.txt	2010-02-26 15:38:20 +0000
@@ -15,12 +15,15 @@
     ...      SoyuzTestPublisher)
     >>> from lp.registry.interfaces.person import IPersonSet
 
-Make the PPA private.
+Create a private PPA for no-priv.
 
     >>> login('[e-mail]')
     >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
-    >>> no_priv.archive.buildd_secret = 'x'
-    >>> no_priv.archive.private = True
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> no_priv_private_ppa = factory.makeArchive(
+    ...     owner=no_priv, private=True, name='p3a',
+    ...     distribution=ubuntu)
 
 Initialise SoyuzTestPublisher.
 
@@ -31,7 +34,7 @@
 Publish a source.
 
     >>> test_source = test_publisher.getPubSource(
-    ...     archive=no_priv.archive, sourcename='test-pkg',
+    ...     archive=no_priv_private_ppa, sourcename='test-pkg',
     ...     version='1.0')
     >>> dsc_file = test_source.sourcepackagerelease.files[0].libraryfile
 
@@ -68,10 +71,12 @@
 Create a subsequent source publication so a package diff can be provided.
 
     >>> another_test_source = test_publisher.getPubSource(
-    ...     archive=no_priv.archive, sourcename='test-pkg',
+    ...     archive=no_priv_private_ppa, sourcename='test-pkg',
     ...     version='1.1')
     >>> another_dsc_file = (
     ...     another_test_source.sourcepackagerelease.files[0].libraryfile)
+    >>> other_binary_pubs = test_publisher.getPubBinaries(
+    ...     binaryname='test-bin', pub_source=another_test_source)
 
     >>> package_diff  = test_source.sourcepackagerelease.requestDiffTo(
     ...     no_priv, another_test_source.sourcepackagerelease)
@@ -145,26 +150,26 @@
     >>> no_priv_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
     >>> no_priv_browser.open(
-    ...     "http://launchpad.dev/~no-priv/+archive/ppa/+packages")
+    ...     "http://launchpad.dev/~no-priv/+archive/p3a/+packages")
 
     >>> print no_priv_browser.title
-    Packages in “PPA for No Privileges Person”...
+    Packages in “PPA named p3a for No Privileges Person”...
 
 Source changesfiles are served on the PPA '+files' traversal.
 
     >>> check_urls(no_priv_browser, ppa_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a')
     test-pkg_1.1_source.changes: OK
 
     >>> no_priv_browser.getLink('Copy packages').click()
     >>> check_urls(no_priv_browser, ppa_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a')
     test-pkg_1.1_source.changes: OK
 
     >>> no_priv_browser.getLink('Cancel').click()
     >>> no_priv_browser.getLink('Delete packages').click()
     >>> check_urls(no_priv_browser, ppa_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a')
     test-pkg_1.1_source.changes: OK
 
 Buildlogs are served on the Build '+files' traversal, when the PPA
@@ -176,11 +181,11 @@
     >>> no_priv_browser.getControl("Filter").click()
 
     >>> check_urls(no_priv_browser, builds_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa/+build/31')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+build/31')
     buildlog_ubuntu-breezy-autotest-i386.test-pkg_1.0_FULLYBUILT.txt.gz: OK
 
     >>> no_priv_browser.open(
-    ...     'http://launchpad.dev/~no-priv/+archive/ppa/+packages')
+    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+packages')
 
 Source and binary files, in the expandable-row area, are served via
 the PPA '+files' traversal.
@@ -190,7 +195,7 @@
     >>> no_priv_browser.getLink(id=expander_id).click()
 
     >>> check_urls(no_priv_browser, ppa_1_0_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a')
     test-pkg_1.0.dsc:     OK
     test-pkg_1.0.tar.gz:  OK
     test-bin_1.0_all.deb: OK
@@ -200,10 +205,10 @@
 
     >>> no_priv_browser.getLink('i386').click()
     >>> print no_priv_browser.title
-    PPA for No Privileges Person : No Privileges Person
+    PPA named p3a for No Privileges Person : No Privileges Person
 
     >>> check_urls(no_priv_browser, build_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa/+build/31')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a/+build/31')
     test-bin_1.0_i386.changes:    OK
     buildlog_...txt.gz:           OK
     upload_..._log.txt:           OK
@@ -212,14 +217,14 @@
 '+files' traversal.
 
     >>> no_priv_browser.open(
-    ...     "http://launchpad.dev/~no-priv/+archive/ppa/+packages")
+    ...     "http://launchpad.dev/~no-priv/+archive/p3a/+packages")
 
     >>> expander_id = find_tags_by_class(
     ...     no_priv_browser.contents, 'expander')[0]['id']
     >>> no_priv_browser.getLink(id=expander_id).click()
 
     >>> check_urls(no_priv_browser, ppa_1_1_links,
-    ...            'http://launchpad.dev/~no-priv/+archive/ppa')
+    ...            'http://launchpad.dev/~no-priv/+archive/p3a')
     test-pkg_1.1.dsc:         OK
     test-pkg_1.0_1.1.diff.gz: OK
 
@@ -230,7 +235,7 @@
     >>> file_size = str(dsc_file.content.filesize)
     >>> file_mimetype = dsc_file.mimetype
     >>> file_lp_url = str(
-    ...     'http://launchpad.dev/~no-priv/+archive/ppa/+files/%s' %
+    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+files/%s' %
     ...     dsc_file.filename)
     >>> logout()
 
@@ -271,13 +276,13 @@
     >>> buildlog_content = buildlog.read()
     >>> buildlog_size = str(buildlog.content.filesize)
     >>> buildlog_lp_url = str(
-    ...     'http://launchpad.dev/~no-priv/+archive/ppa/+build/%d/+files/%s' %
+    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+build/%d/+files/%s' %
     ...     (build.id, buildlog.filename))
 
     >>> diff_content = package_diff.diff_content.read()
     >>> diff_size = str(package_diff.diff_content.content.filesize)
     >>> diff_lp_url = str(
-    ...     'http://launchpad.dev/~no-priv/+archive/ppa/+files/%s' %
+    ...     'http://launchpad.dev/~no-priv/+archive/p3a/+files/%s' %
     ...     package_diff.diff_content.filename)
 
     >>> logout()
@@ -321,19 +326,25 @@
     >>> print no_priv_browser.headers['content-encoding']
     gzip
 
-When the PPA and the `LibraryFileAlias` become public, the +files/
-proxy redirects to the public http url.
-
-    >>> login('[e-mail]')
-
-    >>> no_priv = getUtility(IPersonSet).getByName('no-priv')
-    >>> no_priv.archive.buildd_secret = ''
-    >>> no_priv.archive.private = False
+If the associated PPA and the `LibraryFileAlias` are public, the +files/
+proxy redirects to the public http url. We'll copy the test sources and
+binaries across to no-priv's public ppa.
+
+    >>> login_person(no_priv)
+    >>> from lp.soyuz.scripts.packagecopier import do_copy
+    >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
+    >>> copies = do_copy(
+    ...     no_priv_private_ppa.getPublishedSources(name='test-pkg'),
+    ...     no_priv.archive, series=ubuntu['warty'],
+    ...     pocket=PackagePublishingPocket.RELEASE,
+    ...     include_binaries=True, allow_delayed_copies=False)
 
     >>> from zope.security.proxy import removeSecurityProxy
     >>> removeSecurityProxy(dsc_file).restricted = False
-
     >>> file_librarian_url = dsc_file.http_url
+    >>> file_lp_url = str(
+    ...     'http://launchpad.dev/~no-priv/+archive/ppa/+files/%s' %
+    ...     dsc_file.filename)
 
     >>> commit()
     >>> logout()
@@ -372,7 +383,7 @@
 The same redirection happens for +archive/+build/blah urls:
 
     >>> buildlog_lp_url_without_ppa_name = buildlog_lp_url.replace(
-    ...     '/ppa', '')
+    ...     '/p3a', '')
     >>> print buildlog_lp_url_without_ppa_name
     http://.../~no-priv/+archive/+build/31/+files/...
 

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-02-23 11:53:08 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-02-26 15:38:20 +0000
@@ -263,9 +263,8 @@
                        pocket=PackagePublishingPocket.RELEASE,
                        format=BinaryPackageFormat.DEB,
                        scheduleddeletiondate=None, dateremoved=None,
-                       distroseries=None,
-                       archive=None,
-                       pub_source=None):
+                       distroseries=None, archive=None,
+                       pub_source=None, builder=None):
         """Return a list of binary publishing records."""
         if distroseries is None:
             distroseries = self.distroseries
@@ -284,6 +283,7 @@
         builds = pub_source.createMissingBuilds()
         published_binaries = []
         for build in builds:
+            build.builder = builder
             binarypackagerelease = self.uploadBinaryForBuild(
                 build, binaryname, filecontent, summary, description,
                 shlibdep, depends, recommends, suggests, conflicts, replaces,

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-02-26 15:38:18 +0000
+++ lib/lp/testing/factory.py	2010-02-26 15:38:20 +0000
@@ -1559,7 +1559,7 @@
 
     def makeArchive(self, distribution=None, owner=None, name=None,
                     purpose=None, enabled=True, private=False,
-                    virtualized=True):
+                    virtualized=True, description=None):
         """Create and return a new arbitrary archive.
 
         :param distribution: Supply IDistribution, defaults to a new one
@@ -1571,6 +1571,7 @@
         :param enabled: Whether the archive is enabled.
         :param private: Whether the archive is created private.
         :param virtualized: Whether the archive is virtualized.
+        :param description: A description of the archive.
         """
         if distribution is None:
             distribution = self.makeDistribution()
@@ -1592,7 +1593,7 @@
         archive = getUtility(IArchiveSet).new(
             owner=owner, purpose=purpose,
             distribution=distribution, name=name, enabled=enabled,
-            require_virtualized=virtualized)
+            require_virtualized=virtualized, description=description)
 
         if private:
             archive.private = True