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

[Michael Nelson]

[Michael Nelson (michael.nelson)]

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

The MP for the prerequisite branch that fixes the actual 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 breakages are as follows:
http://pastebin.ubuntu.com/378292/

This branch fixes:

bin/test -vv -t doc/archive.txt -t publisher-config.txt -t buildd-scoring.txt

[Edwin Grubbs (edwin-grubbs)]

Hi Michael,

This is a nice improvement. Minor comments below.

merge-conditional

-Edwin

>=== modified file 'lib/lp/soyuz/doc/archive.txt'
>--- lib/lp/soyuz/doc/archive.txt 2010-01-26 11:34:26 +0000
>+++ lib/lp/soyuz/doc/archive.txt 2010-02-17 15:58:44 +0000
>@@ -102,10 +102,15 @@
> essentially the password to the archive for the builder.
>
> It can only be set by users with launchpad.Commercial permission in the
>-archive, i.e. an admin or a commercial admin.
>+archive, i.e. an admin or a commercial admin. We create a new PPA for
>+cprov here as changing privacy of a PPA is not allowed when sources have
>+already been published.
>
>+ >>> cprov_private_ppa = factory.makeArchive(
>+ ... owner=cprov, name='myprivateppa',
>+ ... distribution=cprov_archive.distribution)

Replace tab with spaces.

> >>> login(ANONYMOUS)
>- >>> cprov_archive.buildd_secret = 'boing'
>+ >>> cprov_private_ppa.buildd_secret = 'boing'
>
> Traceback (most recent call last):
> ...
> Unauthorized: (..., 'buildd_secret', 'launchpad.Commercial')
>@@ -1755,18 +1750,20 @@
> pmount 0.1-1 in warty PUBLISHED cprov
>
> Private source publications are excluded from this list, the fact that
>-they exist should never leak. If we make Celso's PPA private, its
>-contents will not be listed anymore. The same happens for uploaded
>-sources, since they are essentially another source publication in this
>-context.
>+they exist should never leak. If we copy the package to Celso's private
>+PPA the list is not updated. The same happens for uploaded sources, since they

Line too long.

>+are essentially another source publication in this context.
>
>- >>> naked_cprov_archive.private = True
>- >>> naked_cprov_archive.syncUpdate()
>+ >>> copy = cprov_cdrkit.copyTo(
>+ ... ubuntu['hoary'], PackagePublishingPocket.RELEASE,
>+ ... cprov_private_ppa)

Replace tab with spaces.

> >>> print_latest_uploads()
> cdrkit 1.0 in hoary PENDING mark
> iceweasel 1.0 in hoary PENDING mark
>+ cdrkit 1.0 in breezy-autotest SUPERSEDED cprov
> iceweasel 1.0 in breezy-autotest PUBLISHED mark
>+ pmount 0.1-1 in warty PUBLISHED cprov
>
> 'getMostActivePPAsForDistribution' returns a list of dictionaries
> containing up to 5 PPAs with the highest number of publications in the
>@@ -1808,14 +1805,13 @@
> ... a_pub.copyTo(
> ... ubuntu['hoary'], PackagePublishingPocket.RELEASE, where)
>
>- >>> create_activity(cprov_archive, 20)
>+ >>> create_activity(cprov_private_ppa, 20)
> >>> create_activity(sandbox_archive, 10)
> >>> create_activity(name12.archive, 4)
> >>> create_activity(no_priv.archive, 4)
> >>> create_activity(lp_buildd_team.archive, 8)
>
>-Celso's PPA is still private, so despite having the highest number of
>-uploads it's not listed.
>+Celso's private PPA is not listed despite having the highest number of uploads.

Line too long.

> >>> print_most_active_ppas()
> PPA for Foo Bar 10
>@@ -1824,13 +1820,11 @@
> PPA for Sample Person 4
> PPA for Mark Shuttleworth 2
>
>-When we make Celso's PPA public the result gets limited to 5 items.
>-The p...

review: Approve (code)

[Michael Nelson (michael.nelson)]

On Wed, Feb 17, 2010 at 6:39 PM, Edwin Grubbs
<email address hidden> wrote:
> Review: Approve code
> Hi Michael,
>
> This is a nice improvement. Minor comments below.
>
> merge-conditional
>
> -Edwin

Hi Edwin, it looks like you actually went through some of the
prerequisite branch changes too... thanks!

>
>
>>=== modified file 'lib/lp/soyuz/doc/archive.txt'
>>--- lib/lp/soyuz/doc/archive.txt       2010-01-26 11:34:26 +0000
>>+++ lib/lp/soyuz/doc/archive.txt       2010-02-17 15:58:44 +0000
>>@@ -102,10 +102,15 @@
>> essentially the password to the archive for the builder.
>>
>> It can only be set by users with launchpad.Commercial permission in the
>>-archive, i.e. an admin or a commercial admin.
>>+archive, i.e. an admin or a commercial admin. We create a new PPA for
>>+cprov here as changing privacy of a PPA is not allowed when sources have
>>+already been published.
>>
>>+    >>> cprov_private_ppa = factory.makeArchive(
>>+    ...     owner=cprov, name='myprivateppa',
>>+    ...           distribution=cprov_archive.distribution)
>
>
> Replace tab with spaces.

Sorry - switched editors recently, I've updated to automatically expand now.

>
>
>>     >>> login(ANONYMOUS)
>>-    >>> cprov_archive.buildd_secret = 'boing'
>>+    >>> cprov_private_ppa.buildd_secret = 'boing'
>>
>>     Traceback (most recent call last):
>>     ...
>>     Unauthorized: (..., 'buildd_secret', 'launchpad.Commercial')
>>@@ -1755,18 +1750,20 @@
>>     pmount 0.1-1 in warty PUBLISHED cprov
>>
>> Private source publications are excluded from this list, the fact that
>>-they exist should never leak. If we make Celso's PPA private, its
>>-contents will not be listed anymore. The same happens for uploaded
>>-sources, since they are essentially another source publication in this
>>-context.
>>+they exist should never leak. If we copy the package to Celso's private
>>+PPA the list is not updated.  The same happens for uploaded sources, since they
>
>
> Line too long.

... and to highlight from 78 rather than 79.

>
>
>>+are essentially another source publication in this context.
>>
>>-    >>> naked_cprov_archive.private = True
>>-    >>> naked_cprov_archive.syncUpdate()
>>+    >>> copy = cprov_cdrkit.copyTo(
>>+    ...      ubuntu['hoary'], PackagePublishingPocket.RELEASE,
>>+    ...            cprov_private_ppa)
>
>
> Replace tab with spaces.

Done

>
>
>>     >>> print_latest_uploads()
>>     cdrkit 1.0 in hoary PENDING mark
>>     iceweasel 1.0 in hoary PENDING mark
>>+    cdrkit 1.0 in breezy-autotest SUPERSEDED cprov
>>     iceweasel 1.0 in breezy-autotest PUBLISHED mark
>>+    pmount 0.1-1 in warty PUBLISHED cprov
>>
>> 'getMostActivePPAsForDistribution' returns a list of dictionaries
>> containing up to 5 PPAs with the highest number of publications in the
>>@@ -1808,14 +1805,13 @@
>>     ...         a_pub.copyTo(
>>     ...             ubuntu['hoary'], PackagePublishingPocket.RELEASE, where)
>>
>>-    >>> create_activity(cprov_archive, 20)
>>+    >>> create_activity(cprov_private_ppa, 20)
>>     >>> create_activity(sandbox_archive, 10)
>>     >>> create_activity(name12.archive, 4)
>>     >>> create_activity(no_priv.archive, 4)
>>     >>> create_activity(lp_buil...

=== modified file 'lib/lp/archivepublisher/tests/publisher-config.txt'
--- lib/lp/archivepublisher/tests/publisher-config.txt	2010-02-25 12:28:30 +0000
+++ lib/lp/archivepublisher/tests/publisher-config.txt	2010-02-26 15:30:40 +0000
@@ -112,9 +112,12 @@
     ...  config.personalpackagearchive.root)
     True
 
-    >>> cprov_archive.private = True
-    >>> cprov_archive.buildd_secret = "secret"
-    >>> p3a_config = getPubConfig(cprov_archive)
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, name='myprivateppa',
+    ...     distribution=cprov_archive.distribution)
+    >>> cprov_private_ppa.private = True
+    >>> cprov_private_ppa.buildd_secret = "secret"
+    >>> p3a_config = getPubConfig(cprov_private_ppa)
 
     >>> (p3a_config.distroroot ==
     ...  config.personalpackagearchive.private_root)
@@ -123,9 +126,9 @@
     >>> dump_config(p3a_config)
     stayofexecution: 5.0
     distroroot:      /var/tmp/ppa
-    archiveroot:     /var/tmp/ppa/cprov/ppa/ubuntutest
-    poolroot:        /var/tmp/ppa/cprov/ppa/ubuntutest/pool
-    distsroot:       /var/tmp/ppa/cprov/ppa/ubuntutest/dists
+    archiveroot:     /var/tmp/ppa/cprov/myprivateppa/ubuntutest
+    poolroot:        /var/tmp/ppa/cprov/myprivateppa/ubuntutest/pool
+    distsroot:       /var/tmp/ppa/cprov/myprivateppa/ubuntutest/dists
     overrideroot:    None
     cacheroot:       None
     miscroot:        None
@@ -137,11 +140,6 @@
       Architectures: amd64, i386
       Components: main, multiverse, restricted, universe
 
-Make Celso's PPA public again.
-
-    >>> cprov_archive.private = False
-    >>> cprov_archive.buildd_secret = None
-
 
 == Partner ==
 

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-02-18 17:11:12 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-02-26 15:30:40 +0000
@@ -102,10 +102,15 @@
 essentially the password to the archive for the builder.
 
 It can only be set by users with launchpad.Commercial permission in the
-archive, i.e. an admin or a commercial admin.
+archive, i.e. an admin or a commercial admin. We create a new PPA for
+cprov here as changing privacy of a PPA is not allowed when sources have
+already been published.
 
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, name='myprivateppa',
+    ...     distribution=cprov_archive.distribution)
     >>> login(ANONYMOUS)
-    >>> cprov_archive.buildd_secret = 'boing'
+    >>> cprov_private_ppa.buildd_secret = 'boing'
     Traceback (most recent call last):
     ...
     Unauthorized: (..., 'buildd_secret', 'launchpad.Commercial')
@@ -113,7 +118,7 @@
 Commercial Member, a commercial admin but not an admin, can set 'buildd_secret'.
 
     >>> login("[e-mail]")
-    >>> cprov_archive.buildd_secret = 'not so secret at all'
+    >>> cprov_private_ppa.buildd_secret = 'not so secret at all'
 
 Foo Bar, an admin, can set 'buildd_secret'.
 
@@ -133,11 +138,11 @@
 'launchpad.View' in the archive.
 
     >>> login("[e-mail]")
-    >>> cprov_archive.buildd_secret = 'really secret'
-    >>> cprov_archive.private = True
+    >>> cprov_private_ppa.buildd_secret = 'really secret'
+    >>> cprov_private_ppa.private = True
 
     >>> login(ANONYMOUS)
-    >>> print cprov_archive.buildd_secret
+    >>> print cprov_private_ppa.buildd_secret
     Traceback (most recent call last):
     ...
     Unauthorized: (..., 'buildd_secret', 'launchpad.View')
@@ -145,17 +150,9 @@
 Celso can read 'buildd_secret' contents for his PPA.
 
     >>> login('[e-mail]')
-    >>> print cprov_archive.buildd_secret
+    >>> print cprov_private_ppa.buildd_secret
     really secret
 
-In order to continue the tests of public archive attributes we will
-make Celso's PPA public again.
-
-    >>> login("[e-mail]")
-    >>> cprov_archive.buildd_secret = ''
-    >>> cprov_archive.private = False
-    >>> login(ANONYMOUS)
-
 Useful properties:
 
     >>> print cprov_archive.archive_url
@@ -745,59 +742,65 @@
 not publically available, but available only to users who have permission to
 view the archive:
 
-First, we turn cprov's archive into a private one:
-
-    >>> login("[e-mail]")
-    >>> cprov_archive.buildd_secret = 'really secret'
-    >>> cprov_archive.private = True
-
-And grab some source IDs from the archive:
-
-    >>> sources = cprov_archive.getPublishedSources()
-    >>> source_ids = [sources[0].id, sources[1].id]
+    # First we create some source/binary packages in cprov's private
+    # PPA so that we'll have some results to view.
+    >>> login('[e-mail]')
+    >>> from lp.soyuz.tests.test_publishing import (
+    ...     SoyuzTestPublisher)
+    >>> test_publisher = SoyuzTestPublisher()
+    >>> ignore = test_publisher.setUpDefaultDistroSeries(warty)
+    >>> test_publisher.addFakeChroots(warty)
+    >>> ignore = test_publisher.getPubBinaries(archive=cprov_private_ppa)
+
+    # Grab some source IDs from the archive that we can use for calls to
+    # getBuildSummariesForSourceIds():
+    >>> sources = cprov_private_ppa.getPublishedSources()
+    >>> source_ids = [sources[0].id]
 
 Then verify that an admin can see the counters and build summaries:
 
-    >>> print_build_counters(cprov_archive.getBuildCounters())
-    failed     1
-    ...
-    total      4
-    >>> print_build_summaries(cprov_archive.getBuildSummariesForSourceIds(
+    >>> print_build_counters(cprov_private_ppa.getBuildCounters())
+    failed     0
+    ...
+    succeeded  1
+    ...
+    total      1
+    >>> print_build_summaries(cprov_private_ppa.getBuildSummariesForSourceIds(
     ...     source_ids))
-    Source ID: 27
-    ...
+    Source ID:...
+    FULLYBUILT_PENDING
+    All builds were built successfully but have not yet been published.
+    Relevant builds:
+      - i386 build of foo 666 in ubuntu warty RELEASE
 
 Next veryify that cprov can still access the build counters:
 
     >>> login('[e-mail]')
-    >>> print_build_counters(cprov_archive.getBuildCounters())
-    failed     1
-    ...
-    total      4
-    >>> print_build_summaries(cprov_archive.getBuildSummariesForSourceIds(
+    >>> print_build_counters(cprov_private_ppa.getBuildCounters())
+    failed     0
+    ...
+    succeeded  1
+    ...
+    total      1
+    >>> print_build_summaries(cprov_private_ppa.getBuildSummariesForSourceIds(
     ...     source_ids))
-    Source ID: 27
+    Source ID:...
     ...
+      - i386 build of foo 666 in ubuntu warty RELEASE
 
 But the public cannot:
 
     >>> login('[e-mail]')
-    >>> print_build_counters(cprov_archive.getBuildCounters())
+    >>> print_build_counters(cprov_private_ppa.getBuildCounters())
     Traceback (most recent call last):
     ...
     Unauthorized: (..., 'getBuildCounters', 'launchpad.View')
-    >>> print_build_summaries(cprov_archive.getBuildSummariesForSourceIds(
+    >>> print_build_summaries(cprov_private_ppa.getBuildSummariesForSourceIds(
     ...     source_ids))
     Traceback (most recent call last):
     ...
     Unauthorized: (..., 'getBuildSummariesForSourceIds', 'launchpad.View')
 
-Make the archive public again before continuing:
-
-    >>> login("[e-mail]")
-    >>> cprov_archive.buildd_secret = ''
-    >>> cprov_archive.private = False
-
 
 == Package Counters ==
 
@@ -1476,16 +1479,11 @@
 If the archive is private, the url may be different as private PPAs
 are published to a secure location.
 
-    >>> from zope.security.proxy import removeSecurityProxy
-    >>> naked_cprov_archive = removeSecurityProxy(cprov_archive)
-    >>> print naked_cprov_archive.archive_url
+    >>> print cprov_archive.archive_url
     http://ppa.launchpad.dev/cprov/ppa/ubuntu
 
-    >>> naked_cprov_archive.private = True
-    >>> naked_cprov_archive.syncUpdate()
-
-    >>> print naked_cprov_archive.archive_url
-    http://private-ppa.launchpad.dev/cprov/ppa/ubuntu
+    >>> print cprov_private_ppa.archive_url
+    http://private-ppa.launchpad.dev/cprov/myprivateppa/ubuntu
 
 IArchive.allowUpdatesToReleasePocket returns whether the archive is allowed
 to publish to the RELEASE pocket no matter what state the distroseries is in.
@@ -1519,7 +1517,7 @@
 
     >>> archive_purposes = [archive.purpose.name for archive in archive_set]
     >>> len(archive_purposes)
-    17
+    18
 
     >>> print sorted(set(archive_purposes))
     ['COPY', 'DEBUG', 'PARTNER', 'PPA', 'PRIMARY']
@@ -1537,32 +1535,34 @@
 
 Those counters explicity exclude packages in private PPAs.
 
-The current counters says we only have 1 source and 1 binary published
+The current counters says we only have 4 source and 4 binary published
 in public PPAs.
 
     >>> archive_set.getNumberOfPPASourcesForDistribution(ubuntu)
-    1
+    4
     >>> archive_set.getNumberOfPPABinariesForDistribution(ubuntu)
-    1
+    4
 
 As mentioned caches for private PPAs are not considered.
 
-    >>> print cprov.archive.private
+    >>> print cprov_private_ppa.private
     True
 
-    >>> cprov.archive.sources_cached
-    3
-    >>> cprov.archive.binaries_cached
-    3
+    >>> cprov_private_ppa.sources_cached
+    0
+    >>> cprov_private_ppa.binaries_cached
+    0
 
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> naked_cprov_archive = removeSecurityProxy(cprov_private_ppa)
     >>> naked_cprov_archive.sources_cached = 1000
     >>> naked_cprov_archive.binaries_cached = 2000
     >>> naked_cprov_archive.syncUpdate()
 
     >>> archive_set.getNumberOfPPASourcesForDistribution(ubuntu)
-    1
+    4
     >>> archive_set.getNumberOfPPABinariesForDistribution(ubuntu)
-    1
+    4
 
 On the other hand, changes in the a public PPA are immediately
 considered.
@@ -1580,9 +1580,9 @@
     >>> naked_no_priv_archive.syncUpdate()
 
     >>> archive_set.getNumberOfPPASourcesForDistribution(ubuntu)
-    11
+    14
     >>> archive_set.getNumberOfPPABinariesForDistribution(ubuntu)
-    3
+    6
 
 Since we currently only create archives for ubuntu distribution, the
 counters for other distributions are always 'zero'.
@@ -1599,11 +1599,12 @@
 uses `TeamParticipation` relationships to calculate all the PPAs the
 user is allowed to upload or copy packages to.
 
-In the sampledata, 'cprov' only participates in his own PPA.
+Celso only participates in his own PPAs.
 
     >>> for ppa in archive_set.getPPAsForUser(cprov):
     ...     print ppa.displayname
     PPA for Celso Providelo
+    PPA named myprivateppa for Celso Providelo
 
 However 'cprov' is also a member of 'launchpad-buildd-admins' team,
 which doesn't have a PPA yet.
@@ -1628,6 +1629,7 @@
     ...     print ppa.displayname
     PPA for Celso Providelo
     PPA for Launchpad Buildd Admins
+    PPA named myprivateppa for Celso Providelo
 
 The same happens for specific upload rights granted on 3rd-party
 PPAs. When 'No Privileges' gets upload rights to Celso's PPA,
@@ -1699,14 +1701,7 @@
     >>> p3as = archive_set.getPrivatePPAs()
     >>> for p3a in p3as:
     ...     print p3a.displayname
-    PPA for Celso Providelo
-
-For the next test we will make Celso's PPA public again, so it can
-appear in public lists. We do that because that PPA contains relevant
-contents for testing.
-
-    >>> naked_cprov_archive.private = False
-    >>> naked_cprov_archive.syncUpdate()
+    PPA named myprivateppa for Celso Providelo
 
 'getLatestPPASourcePublicationsForDistribution' returns up to 5
 lastest source publications available for a given distribution ordered
@@ -1762,18 +1757,20 @@
     pmount 0.1-1 in warty PUBLISHED cprov
 
 Private source publications are excluded from this list, the fact that
-they exist should never leak. If we make Celso's PPA private, its
-contents will not be listed anymore. The same happens for uploaded
-sources, since they are essentially another source publication in this
-context.
+they exist should never leak. If we copy the package to Celso's private
+PPA the list is not updated.  The same happens for uploaded sources, since
+they are essentially another source publication in this context.
 
-    >>> naked_cprov_archive.private = True
-    >>> naked_cprov_archive.syncUpdate()
+    >>> copy = cprov_cdrkit.copyTo(
+    ...     ubuntu['hoary'], PackagePublishingPocket.RELEASE,
+    ...     cprov_private_ppa)
 
     >>> print_latest_uploads()
     cdrkit 1.0 in hoary PENDING mark
     iceweasel 1.0 in hoary PENDING mark
+    cdrkit 1.0 in breezy-autotest SUPERSEDED cprov
     iceweasel 1.0 in breezy-autotest PUBLISHED mark
+    pmount 0.1-1 in warty PUBLISHED cprov
 
 'getMostActivePPAsForDistribution' returns a list of dictionaries
 containing up to 5 PPAs with the highest number of publications in the
@@ -1815,14 +1812,14 @@
     ...         a_pub.copyTo(
     ...             ubuntu['hoary'], PackagePublishingPocket.RELEASE, where)
 
-    >>> create_activity(cprov_archive, 20)
+    >>> create_activity(cprov_private_ppa, 20)
     >>> create_activity(sandbox_archive, 10)
     >>> create_activity(name12.archive, 4)
     >>> create_activity(no_priv.archive, 4)
     >>> create_activity(lp_buildd_team.archive, 8)
 
-Celso's PPA is still private, so despite having the highest number of
-uploads it's not listed.
+Celso's private PPA is not listed despite having the highest number of
+uploads.
 
     >>> print_most_active_ppas()
     PPA for Foo Bar 10
@@ -1831,13 +1828,11 @@
     PPA for Sample Person 4
     PPA for Mark Shuttleworth 2
 
-When we make Celso's PPA public the result gets limited to 5 items.
-The previous last item (Mark's PPA) will now be excluded in place of
-Celso's PPA.
-
-    >>> naked_cprov_archive.private = False
-    >>> naked_cprov_archive.syncUpdate()
-
+If we give lots of activity to Celso's public PPA the previous
+last item (Mark's PPA) will now be excluded as the results are
+limited to 5 items.
+
+    >>> create_activity(cprov_archive, 20)
     >>> print_most_active_ppas()
     PPA for Celso Providelo 20
     PPA for Foo Bar 10
@@ -2128,14 +2123,15 @@
     False
 
 We can also create an ArchivePermission entry for carlos to be able to upload
-to cprov's PPA, even though he is not the owner.
+to someone else's PPA, even though he is not the owner.
 
-    >>> discard = cprov_archive.newComponentUploader(
+    >>> joes_ppa = factory.makeArchive()
+    >>> discard = joes_ppa.newComponentUploader(
     ...     carlos, "main")
 
-Carlos can now upload to cprov's PPA:
+Carlos can now upload to Joe's PPA:
 
-    >>> cprov_archive.canUpload(carlos)
+    >>> joes_ppa.canUpload(carlos)
     True
 
 Note that when creating a new permission, trying to specify a component other
@@ -2146,7 +2142,7 @@
 packagesets will replace components entirely as the ACL mechanism, so this
 anacronism can be removed.
 
-    >>> cprov_archive.newComponentUploader(
+    >>> joes_ppa.newComponentUploader(
     ...     carlos, "universe")
     Traceback (most recent call last):
     ...
@@ -2155,60 +2151,61 @@
 You'll get the same error if you use a component object that's not main.
 
     >>> universe = getUtility(IComponentSet)['universe']
-    >>> cprov_archive.newComponentUploader(
+    >>> joes_ppa.newComponentUploader(
     ...     carlos, universe)
     Traceback (most recent call last):
     ...
     InvalidComponent: Component for PPAs should be 'main'
 
-As important as the right to upload packages to Celso's PPA, Carlos
+As important as the right to upload packages to Joe's PPA, Carlos
 also got the corresponding permissions on it.
 
     >>> from canonical.launchpad.webapp.authorization import check_permission
     >>> login("[e-mail]")
 
-    >>> check_permission('launchpad.View', cprov_archive)
-    True
-
-    >>> check_permission('launchpad.Append', cprov_archive)
-    True
-
-So even if Celso's PPA suddenly becomes private, Carlos rights will be
+    >>> check_permission('launchpad.View', joes_ppa)
+    True
+
+    >>> check_permission('launchpad.Append', joes_ppa)
+    True
+
+So even if Joe's PPA suddenly becomes private, Carlos rights will be
 preserved.
 
     >>> login('[e-mail]')
-    >>> cprov_archive.buildd_secret = 'x'
-    >>> cprov_archive.private = True
+    >>> joes_ppa.buildd_secret = 'x'
+    >>> joes_ppa.private = True
 
     >>> login("[e-mail]")
 
-    >>> check_permission('launchpad.View', cprov_archive)
-    True
-
-    >>> check_permission('launchpad.Append', cprov_archive)
-    True
-
-On the other hand, if Celso's PPA is disabled, only the view
+    >>> check_permission('launchpad.View', joes_ppa)
+    True
+
+    >>> check_permission('launchpad.Append', joes_ppa)
+    True
+
+On the other hand, if Joe's PPA is disabled, only the view
 permissions are kept. No one has permission to upload or copy sources
 to it.
 
     >>> login('[e-mail]')
-    >>> cprov_archive.disable()
+    >>> joes_ppa.disable()
 
     >>> login("[e-mail]")
-    >>> check_permission('launchpad.Append', cprov_archive)
+    >>> check_permission('launchpad.Append', joes_ppa)
     False
 
-    >>> login("[e-mail]")
-    >>> check_permission('launchpad.Append', cprov_archive)
+    >>> login_person(joes_ppa.owner)
+    >>> check_permission('launchpad.Append', joes_ppa)
     False
 
 Similarly to private PPAs, disabled public PPAs can only be viewed by
 owners or uploaders.
 
     >>> login('[e-mail]')
-    >>> cprov_archive.buildd_secret = ''
-    >>> cprov_archive.private = False
+    >>> discard = cprov_archive.newComponentUploader(
+    ...     carlos, "main")
+    >>> cprov_archive.disable()
 
     >>> login(ANONYMOUS)
     >>> check_permission('launchpad.View', cprov_archive)
@@ -2348,17 +2345,12 @@
 First we use the SoyuzTestPublisher to make some test publications in
 hoary:
 
-    >>> from lp.soyuz.tests.test_publishing import (
-    ...     SoyuzTestPublisher)
-    >>> test_publisher = SoyuzTestPublisher()
-    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
-    >>> hoary = ubuntu.getSeries('hoary')
     >>> test_publisher.addFakeChroots(hoary)
     >>> unused = test_publisher.setUpDefaultDistroSeries(hoary)
     >>> discard = test_publisher.getPubSource(
     ...     sourcename="package1", version="1.0", archive=cprov.archive,
-    ...     status=PackagePublishingStatus.PUBLISHED) 
-    >>> discard = test_publisher.getPubSource( 
+    ...     status=PackagePublishingStatus.PUBLISHED)
+    >>> discard = test_publisher.getPubSource(
     ...     sourcename="package1", version="1.1", archive=cprov.archive,
     ...     status=PackagePublishingStatus.PUBLISHED)
     >>> discard = test_publisher.getPubSource(

=== modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
--- lib/lp/soyuz/doc/buildd-scoring.txt	2010-01-20 01:23:38 +0000
+++ lib/lp/soyuz/doc/buildd-scoring.txt	2010-02-26 15:30:40 +0000
@@ -86,31 +86,31 @@
 
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bq0)
-    >>> build.archive.buildd_secret = "secret"
-    >>> build.archive.private = True
-    >>> bq0.score()
-    >>> bq0.lastscore
+    >>> private_ppa = factory.makeArchive()
+    >>> private_ppa.buildd_secret = "secret"
+    >>> private_ppa.private = True
+    >>> bq1 = setUpBuildQueueEntry(archive=private_ppa)
+    >>> bq1.score()
+    >>> bq1.lastscore
     12515
 
 The archive can also have a delta applied to all its build scores.  Setting
 IArchive.relative_build_score to boost by 100 changes the lastscore value
 appropriately.
 
-    >>> build.archive.relative_build_score = 100
-    >>> bq0.score()
-    >>> bq0.lastscore
+    >>> private_ppa.relative_build_score = 100
+    >>> bq1.score()
+    >>> bq1.lastscore
     12615
 
 The delta can also be negative.
 
-    >>> build.archive.relative_build_score = -100
-    >>> bq0.score()
-    >>> bq0.lastscore
+    >>> private_ppa.relative_build_score = -100
+    >>> bq1.score()
+    >>> bq1.lastscore
     12415
 
-    >>> build.archive.relative_build_score = 0
+    >>> private_ppa.relative_build_score = 0
     >>> LaunchpadZopelessLayer.switchDbUser(test_dbuser)
 
 
@@ -260,6 +260,7 @@
     ...     name='test-rebuild')
 
     >>> bqc = setUpBuildQueueEntry(archive=copy)
+    >>> from lp.soyuz.interfaces.build import IBuildSet
     >>> build = getUtility(IBuildSet).getByQueueEntry(bqc)
     >>> bqc.score()
     >>> bqc.lastscore