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

[Michael Nelson]

[Michael Nelson (michael.nelson)]

This is the fifth 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 original 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 xx-ppa-packages -t xx-private-ppa-presentation.txt -t xx-private-ppa-subscription-stories.txt -t xx-private-ppa-subscriptions.txt -t xx-private-ppas.txt -t xx-person-packages.txt

Thanks.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	2010-01-20 14:29:59 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt	2010-02-26 15:48:21 +0000
@@ -134,7 +134,8 @@
     >>> login('[e-mail]')
     >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> cprov_ppa = cprov.archive
     >>> pmount_i386_pub = cprov_ppa.getAllPublishedBinaries(
     ...     name='pmount', version='0.1-1')[1]
     >>> print pmount_i386_pub.displayname
@@ -178,39 +179,70 @@
     'http://launchpad.dev/~mark/+archive/ppa'
 
 This link is not present if the user does not have permission to view
-the PPA.  If we make mark's PPA private and then browse back as
-an anonymous user, the link will be gone.
-
-    >>> admin_browser.open("http://launchpad.dev/~mark/+archive/ppa/+admin")
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
+the PPA.  We create a private PPA with a published source and then copy
+the source into a public PPA to demonstrate this.
+
+    >>> login('[e-mail]')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName(
+    ...     'ubuntu')
+    >>> warty = ubuntu.getSeries('warty')
+    >>> private_ppa = factory.makeArchive(
+    ...     name='p3a', private=True, owner=cprov,
+    ...     distribution=ubuntu)
+    >>> joe = factory.makePerson(name="joe")
+    >>> public_ppa = factory.makeArchive(
+    ...     owner=joe, distribution=ubuntu)
+    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
+    >>> test_publisher = SoyuzTestPublisher()
+    >>> test_publisher.prepareBreezyAutotest()
+    >>> source = test_publisher.getPubSource(
+    ...     sourcename='foo', archive=private_ppa, distroseries=warty)
+    >>> copied_source = source.copyTo(
+    ...     source.distroseries, source.pocket, public_ppa)
+    >>> expander_link_id = "pub%s-expander" % copied_source.id
+    >>> logout()
+
+
+We can view the link on the public PPA to Celso's private PPA when logged
+in as Celso.
+
+    >>> cprov_browser = setupBrowser(
+    ...     auth="Basic [e-mail]:cprov")
+    >>> cprov_browser.open(
+    ...     "http://launchpad.dev/~joe/+archive/ppa/+packages")
+    >>> expander_url = cprov_browser.getLink(id=expander_link_id).url
+    >>> cprov_browser.open(expander_url)
+    >>> print cprov_browser.getLink("PPA named p3a for Celso Providelo").url
+    http://launchpad.dev/~cprov/+archive/p3a
+
+But Joe himself will not see the link.
+
+    >>> joe_browser = setupBrowser(
+    ...     auth="Basic [e-mail]:test")
+    >>> joe_browser.open(expander_url)
+    >>> joe_browser.getLink("PPA named p3a for Celso Providelo")
+    Traceback (most recent call last):
+    ...
+    LinkNotFoundError
+
+And neither can an anonymous user.
 
     >>> anon_browser.open(expander_url)
-    >>> anon_browser.getLink("PPA for Mark Shuttleworth")
+    >>> anon_browser.getLink("PPA named p3a for Celso Providelo")
     Traceback (most recent call last):
     ...
     LinkNotFoundError
 
-While we are there, we can also see that Mark's PPA 'repository-size'
-pagelet isn't publicly available once the PPA was marked private.
+While we are there, we can also see that the private PPA's 'repository-size'
+pagelet isn't publicly available.
 
     >>> anon_browser.open(
-    ...     "http://launchpad.dev/~mark/+archive/ppa/+repository-size")
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+repository-size")
     Traceback (most recent call last):
     ...
     Unauthorized: (..., 'launchpad.View')
 
-    >>> anon_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/ppa/+packages")
-
-Set mark's archive back to public before continuing.
-
-    >>> admin_browser.open("http://launchpad.dev/~mark/+archive/ppa/+admin")
-    >>> admin_browser.getControl(name="field.private").value = False
-    >>> admin_browser.getControl(name="field.buildd_secret").value = ""
-    >>> admin_browser.getControl("Save").click()
-
 
 Searching the packages list
 ===========================
@@ -218,6 +250,8 @@
 We can search a PPA for a particular package.  A non-existent package shows
 no results.
 
+    >>> anon_browser.open(
+    ...     "http://launchpad.dev/~cprov/+archive/ppa/+packages")
     >>> field = anon_browser.getControl(name='field.name_filter')
     >>> field.value = 'nonexistentpackage'
     >>> anon_browser.getControl('Filter', index=0).click()
@@ -244,8 +278,6 @@
     >>> cprov = getUtility(IPersonSet).getByName('cprov')
     >>> iceweasel_pub = cprov.archive.getPublishedSources(
     ...     name='iceweasel')[0]
-    >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-    >>> test_publisher = SoyuzTestPublisher()
     >>> bpr = test_publisher.uploadBinaryForBuild(
     ...     iceweasel_pub.getBuilds()[0], 'bar-bin')
     >>> pub_bins = test_publisher.publishBinaryInArchive(

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-presentation.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-presentation.txt	2009-09-09 20:39:52 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-presentation.txt	2010-02-26 15:48:21 +0000
@@ -15,21 +15,24 @@
 
 == Private presentation ==
 
-Let's make "cprov's" PPA private.  To do this we need to be an
-admin, and go to his admin page.
-
-    >>> admin_browser.open("http://launchpad.dev/~cprov/+archive")
-    >>> admin_browser.getLink("Administer archive").click()
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
-
-When the PPA is marked private it gains the standard Launchpad
+Let's create a private PPA for Celso and see what it looks like.
+
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> private_ppa = factory.makeArchive(
+    ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
+    >>> logout()
+
+When the PPA is private it gains the standard Launchpad
 presentation for private items.
 
     >>> cprov_browser = setupBrowser(
     ...     auth='Basic [e-mail]:cprov')
-    >>> cprov_browser.open("http://launchpad.dev/~cprov/+archive")
+    >>> cprov_browser.open("http://launchpad.dev/~cprov/+archive/p3a")
     >>> from BeautifulSoup import BeautifulSoup, SoupStrainer
     >>> body_el = BeautifulSoup(cprov_browser.contents).first('body')
     >>> 'private' in body_el['class']

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscription-stories.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscription-stories.txt	2010-02-12 12:39:24 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscription-stories.txt	2010-02-26 15:48:21 +0000
@@ -31,18 +31,22 @@
 
 Given a private PPA for Celso,
 
-    >>> admin_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
-    >>> admin_browser.getLink("Administer archive").click()
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> private_ppa = factory.makeArchive(
+    ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
+    >>> logout()
 
 and a browser for Celso currently navigated to the Manage Subscriptions page,
 
     >>> cprov_browser = setupBrowser(
     ...     auth="Basic [e-mail]:cprov")
     >>> cprov_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/ppa/+subscriptions")
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+subscriptions")
 
 and a client of Celso's who has a launchpad name of 'joesmith'
 
@@ -51,7 +55,9 @@
     ...     password="test", email="[e-mail]")
     >>> logout()
 
-When Celso fills in the form with 'joesmith' as the subscriber, a blank subscription expiry, a description of "Joe is my friend" and clicks on the "Add subscriber" button,
+When Celso fills in the form with 'joesmith' as the subscriber, a blank
+subscription expiry, a description of "Joe is my friend" and clicks on the
+"Add subscriber" button,
 
     >>> cprov_browser.getControl(name='field.subscriber').value = 'joesmith'
     >>> cprov_browser.getControl(
@@ -75,7 +81,7 @@
     >>> for msg in get_feedback_messages(cprov_browser.contents):
     ...     print msg
     You have granted access for Joe Smith to install software from
-    PPA for Celso Providelo. Joe Smith will be notified of the
+    PPA named p3a for Celso Providelo. Joe Smith will be notified of the
     access via email.
 
 
@@ -88,7 +94,7 @@
 "Add subscriber" button,
 
     >>> cprov_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/ppa/+subscriptions")
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+subscriptions")
     >>> cprov_browser.getControl(name='field.subscriber').value = 'launchpad'
     >>> cprov_browser.getControl(
     ...     name='field.date_expires').value = '2200-08-01'
@@ -108,7 +114,7 @@
     >>> for msg in get_feedback_messages(cprov_browser.contents):
     ...     print msg
     You have granted access for Launchpad Developers to install software
-    from PPA for Celso Providelo. Members of Launchpad Developers
+    from PPA named p3a for Celso Providelo. Members of Launchpad Developers
     will be notified of the access via email.
 
 == Story 2: An owner edits a subscription for his private archive ==
@@ -124,13 +130,13 @@
 navigated to the Manage Subscriptions page,
 
     >>> cprov_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/ppa/+subscriptions")
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+subscriptions")
 
 when Celso clicks 'Edit/Cancel' for the Launchpad Developers subscription,
 modifies the description field and clicks Update,
 
     >>> cprov_browser.getLink(
-    ...     url='/~cprov/+archive/ppa/+subscriptions/launchpad/+edit').click()
+    ...     url='/~cprov/+archive/p3a/+subscriptions/launchpad/+edit').click()
     >>> cprov_browser.getControl(name="field.description").value = (
     ...     "a different description")
     >>> cprov_browser.getControl(name="field.actions.update").click()
@@ -139,7 +145,7 @@
 about the update.
 
     >>> print cprov_browser.url
-    http://launchpad.dev/~cprov/+archive/ppa/+subscriptions
+    http://launchpad.dev/~cprov/+archive/p3a/+subscriptions
     >>> print_archive_subscriptions(cprov_browser.contents)
     Name                    Expires       Comment
     Launchpad Developers    2200-08-01    a different description
@@ -155,13 +161,13 @@
 to the Manage Subscriptions page,
 
     >>> cprov_browser.open(
-    ...     "http://launchpad.dev/~cprov/+archive/ppa/+subscriptions")
+    ...     "http://launchpad.dev/~cprov/+archive/p3a/+subscriptions")
 
 when Celso clicks 'Edit/Cancel' for the Launchpad Developers subscription
 and clicks Cancel,
 
     >>> cprov_browser.getLink(
-    ...     url='/~cprov/+archive/ppa/+subscriptions/launchpad/+edit').click()
+    ...     url='/~cprov/+archive/p3a/+subscriptions/launchpad/+edit').click()
     >>> cprov_browser.getControl(name="field.actions.cancel").click()
 
 then the browser is redirected back to the subscriptions page, the canceled
@@ -169,7 +175,7 @@
 cancellation is displayed.
 
     >>> print cprov_browser.url
-    http://launchpad.dev/~cprov/+archive/ppa/+subscriptions
+    http://launchpad.dev/~cprov/+archive/p3a/+subscriptions
     >>> print_archive_subscriptions(cprov_browser.contents)
     Name                    Expires       Comment
     Joe Smith                             Joe is my friend    Edit/Cancel
@@ -177,7 +183,7 @@
     >>> for msg in get_feedback_messages(cprov_browser.contents):
     ...     print msg
     You have revoked Launchpad Developers's access to PPA
-    for Celso Providelo.
+    named p3a for Celso Providelo.
 
 
 == Story 3: A subscriber activates a subscription ==
@@ -197,8 +203,8 @@
     >>> joe_browser.open("http://launchpad.dev/~joesmith")
     >>> joe_browser.getLink('View your private PPA subscriptions').click()
     >>> print_subscriptions_for_person(joe_browser.contents)
-    Archive      Owner
-    PPA for ...  Celso Providelo  View
+    Archive        Owner
+    PPA named ...  Celso Providelo  View
 
 When Joe clicks on the View button for Celso's PPA then the
 details of the subscription are displayed with the newly created
@@ -209,12 +215,12 @@
     >>> print(extract_text(sources_list))
     Custom sources.list entries
     ...
-    deb http://joesmith:[e-mail]/cprov/ppa/ubuntu
-        YOUR_UBUNTU_VERSION_HERE main #Personal access of Joe Smith
-        to PPA for Celso Providelo
-    deb-src http://joesmith:[e-mail]/cprov/ppa/ubuntu
-        YOUR_UBUNTU_VERSION_HERE main #Personal access of Joe Smith
-        to PPA for Celso Providelo
+    deb http://joesmith:[e-mail]/cprov/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Celso Providelo
+    deb-src http://joesmith:[e-mail]/cprov/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Celso Providelo
 
 When Joe navigates back to his current archive subscriptions then the list of
 subscriptions reflects the confirmed subscription, providing a normal
@@ -223,12 +229,12 @@
     >>> joe_browser.open(
     ...     "http://launchpad.dev/~joesmith/+archivesubscriptions")
     >>> print_subscriptions_for_person(joe_browser.contents)
-    Archive      Owner
-    PPA for ...  Celso Providelo  View
+    Archive        Owner
+    PPA named ...  Celso Providelo  View
 
     >>> joe_browser.getLink('View').click()
     >>> print(extract_text(joe_browser.contents))
-    Access to PPA for Celso Providelo...
+    Access to PPA named p3a for Celso Providelo...
 
 === Scenario 2: A user re-generates the token for a subscription ===
 
@@ -254,7 +260,7 @@
     >>> for msg in get_feedback_messages(joe_browser.contents):
     ...     print msg
     Launchpad has generated the new password you requested for your
-    access to the archive PPA for Celso Providelo. Please
+    access to the archive PPA named p3a for Celso Providelo. Please
     follow the instructions below to update your custom "sources.list".
 
 
@@ -268,7 +274,7 @@
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> cprov = getUtility(IPersonSet).getByName('cprov')
     >>> launchpad = getUtility(IPersonSet).getByName('launchpad')
-    >>> ignore = cprov.archive.newSubscription(launchpad, cprov)
+    >>> ignore = private_ppa.newSubscription(launchpad, cprov)
     >>> logout()
     >>> login('[e-mail]')
     >>> foobar = getUtility(IPersonSet).getByName('name16')
@@ -288,8 +294,8 @@
 
     >>> mark_browser.getLink('View your private PPA subscriptions').click()
     >>> print_subscriptions_for_person(mark_browser.contents)
-    Archive      Owner
-    PPA for ...  Celso Providelo  View
+    Archive        Owner
+    PPA named ...  Celso Providelo  View
 
 When Mark clicks on the view button, then he is taken to the page for
 his personal subscription for Celso's private PPA and the newly-created
@@ -300,12 +306,12 @@
     >>> print(extract_text(sources_list))
     Custom sources.list entries
     ...
-    deb http://mark:[e-mail]/cprov/ppa/ubuntu
-        YOUR_UBUNTU_VERSION_HERE main #Personal access of
-        Mark Shuttleworth to PPA for Celso Providelo
-    deb-src http://mark:[e-mail]/cprov/ppa/ubuntu
-        YOUR_UBUNTU_VERSION_HERE main #Personal access of
-        Mark Shuttleworth to PPA for Celso Providelo
+    deb http://mark:[e-mail]/cprov/p3a/ubuntu
+        hoary main #Personal access of
+        Mark Shuttleworth to PPA named p3a for Celso Providelo
+    deb-src http://mark:[e-mail]/cprov/p3a/ubuntu
+        hoary main #Personal access of
+        Mark Shuttleworth to PPA named p3a for Celso Providelo
 
 When Mark navigates back to his current archive subscriptions then the list of
 subscriptions reflects the confirmed subscription, providing a normal
@@ -314,12 +320,12 @@
     >>> mark_browser.open(
     ...     "http://launchpad.dev/~mark/+archivesubscriptions")
     >>> print_subscriptions_for_person(mark_browser.contents)
-    Archive      Owner
-    PPA for ...  Celso Providelo  View
+    Archive        Owner
+    PPA named ...  Celso Providelo  View
 
     >>> mark_browser.getLink('View').click()
     >>> print(extract_text(mark_browser.contents))
-    Access to PPA for Celso Providelo...
+    Access to PPA named p3a for Celso Providelo...
 
 
 == Story 4: A user's subscription expires or is cancelled ==

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-02-11 13:15:30 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2010-02-26 15:48:21 +0000
@@ -28,22 +28,24 @@
     ...     print msg
     Only private archives can have subscribers.
 
-Setup both cprov's and mark's PPAs as a private one:
+Setup private PPAs for both Celso and Mark:
 
-    >>> admin_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
-    >>> admin_browser.getLink("Administer archive").click()
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
-    >>> admin_browser.open("http://launchpad.dev/~mark/+archive/ppa")
-    >>> admin_browser.getLink("Administer archive").click()
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> mark = getUtility(IPersonSet).getByName('mark')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
+    >>> mark_private_ppa = factory.makeArchive(
+    ...     owner=mark, name="p3a", distribution=ubuntu, private=True)
+    >>> logout()
 
 The PPA page includes a link to manage subscriptions:
 
-    >>> cprov_browser.open("http://launchpad.dev/~cprov/+archive/ppa")
+    >>> cprov_browser.open("http://launchpad.dev/~cprov/+archive/p3a")
     >>> cprov_browser.getLink("Manage access").click()
 
 The page includes the required dependencies for the yui2-based date
@@ -62,7 +64,7 @@
 
     >>> main_content = find_main_content(cprov_browser.contents)
     >>> print extract_text(main_content.find('h1'))
-    Manage access to PPA for Celso Providelo
+    Manage access to PPA named p3a for Celso Providelo
 
     >>> print extract_text(find_tag_by_id(cprov_browser.contents,
     ...     'no-subscribers'))
@@ -123,7 +125,7 @@
 
     >>> mark_browser = setupBrowser(
     ...     auth="Basic [e-mail]:test")
-    >>> mark_browser.open("http://launchpad.dev/~mark/+archive/ppa/+subscriptions")
+    >>> mark_browser.open("http://launchpad.dev/~mark/+archive/p3a/+subscriptions")
     >>> mark_browser.getControl(name='field.subscriber').value = 'joesmith'
     >>> mark_browser.getControl(
     ...     name='field.description').value = "Joe is also my friend"
@@ -138,9 +140,9 @@
     >>> for row in find_tags_by_class(joe_browser.contents,
     ...                               'archive-subscription-row'):
     ...     print extract_text(row)
-    Archive                                     Owner
-    PPA for Mark Shuttleworth (ppa:mark/ppa)  Mark Shuttleworth       View
-    PPA for Celso Providelo (ppa:cprov/ppa)     Celso Providelo         View
+    Archive                          Owner
+    PPA named... (ppa:mark/p3a)      Mark Shuttleworth       View
+    PPA named... (ppa:cprov/p3a)     Celso Providelo         View
 
 == Confirming a subscription ==
 
@@ -153,12 +155,12 @@
     >>> print(extract_text(sources_list))
     Custom sources.list entries
     ...
-    deb http://joesmith:[e-mail]/mark/ppa/ubuntu
-        breezy-autotest main #Personal access of Joe Smith
-        to PPA for Mark Shuttleworth
-    deb-src http://joesmith:[e-mail]/mark/ppa/ubuntu
-        breezy-autotest main #Personal access of Joe Smith
-        to PPA for Mark Shuttleworth
+    deb http://joesmith:[e-mail]/mark/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Mark Shuttleworth
+    deb-src http://joesmith:[e-mail]/mark/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Mark Shuttleworth
 
 This page will include information about the signing key, if the archive
 has a signing key:
@@ -169,7 +171,7 @@
     >>> login('[e-mail]')
     >>> mark = getUtility(IPersonSet).getByName('mark')
     >>> a_key = getUtility(IGPGKeySet).get(1)
-    >>> mark.archive.signing_key = a_key
+    >>> mark_private_ppa.signing_key = a_key
     >>> logout()
 
     >>> joe_browser.reload()
@@ -177,11 +179,11 @@
     >>> print(extract_text(sources_list))
     Custom sources.list entries
     ...
-    deb http://joesmith:[e-mail]/mark/ppa/ubuntu
-        breezy-autotest main #Personal access of Joe Smith
-        to PPA for Mark Shuttleworth
-    deb-src http://joesmith:[e-mail]/mark/ppa/ubuntu
-        breezy-autotest main #Personal access of Joe Smith
-        to PPA for Mark Shuttleworth
+    deb http://joesmith:[e-mail]/mark/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Mark Shuttleworth
+    deb-src http://joesmith:[e-mail]/mark/p3a/ubuntu
+        hoary main #Personal access of Joe Smith
+        to PPA named p3a for Mark Shuttleworth
     This repository is signed ...
 

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppas.txt	2009-09-16 22:57:42 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppas.txt	2010-02-26 15:48:21 +0000
@@ -16,15 +16,17 @@
 
 == Set Up a Private PPA ==
 
-Let's make "cprov's" PPA private.  To do this we need to be an
-admin, and go to his admin page.
-
-    >>> admin_browser.open("http://launchpad.dev/~cprov/+archive")
-    >>> admin_browser.getLink("Administer archive").click()
-    >>> admin_browser.getControl(name="field.private").value = True
-    >>> admin_browser.getControl(name="field.buildd_secret").value = "secret"
-    >>> admin_browser.getControl("Save").click()
-
+First we'll create a private PPA for Celso.
+
+    >>> from zope.component import getUtility
+    >>> from lp.registry.interfaces.person import IPersonSet
+    >>> login('[e-mail]')
+    >>> cprov = getUtility(IPersonSet).getByName('cprov')
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
+    >>> logout()
 
 == PPA Listing Page ==
 
@@ -35,6 +37,7 @@
     >>> browser.getControl(name="show_inactive").value = True
     >>> browser.getControl('Search', index=0).click()
     >>> list_ppas_in_browser_page(browser)
+    PPA for Celso Providelo...
     PPA for Mark Shuttleworth...
     PPA for No Privileges Person...
 
@@ -46,6 +49,7 @@
     >>> cprov_browser.getControl(name="show_inactive").value = True
     >>> cprov_browser.getControl('Search', index=0).click()
     >>> list_ppas_in_browser_page(cprov_browser)
+    PPA named p3a for Celso Providelo...
     PPA for Celso Providelo...
     PPA for Mark Shuttleworth...
     PPA for No Privileges Person...
@@ -75,6 +79,7 @@
     >>> name12_browser.getControl(name="show_inactive").value = True
     >>> name12_browser.getControl('Search', index=0).click()
     >>> list_ppas_in_browser_page(name12_browser)
+    PPA for Celso Providelo...
     PPA for Landscape Developers...
     PPA for Mark Shuttleworth...
     PPA for No Privileges Person...
@@ -95,7 +100,7 @@
 
 A non-privileged user cannot access the private PPA pages.
 
-    >>> browser.open("http://launchpad.dev/~cprov/+archive")
+    >>> browser.open("http://launchpad.dev/~cprov/+archive/p3a")
     Traceback (most recent call last):
     ...
     Unauthorized...
@@ -111,13 +116,14 @@
     >>> cprov_browser.open("http://launchpad.dev/~cprov/")
     >>> print_tag_with_id(cprov_browser.contents, 'ppas')
     Personal package archives
+    PPA named p3a for Celso Providelo
     PPA for Celso Providelo
     Create a new PPA
 
-    >>> cprov_browser.getLink("PPA for Celso Providelo").click()
+    >>> cprov_browser.getLink("PPA named p3a for Celso Providelo").click()
 
     >>> print cprov_browser.title
-    PPA for Celso Providelo : Celso Providelo
+    PPA named p3a for Celso Providelo : Celso Providelo
 
 When a non-privileged user browses to a profile page for a person or
 team that has a private PPA for which he is not authorised to see, the
@@ -149,9 +155,9 @@
 Administrators can access all private PPAs.
 
     >>> admin_browser.open("http://launchpad.dev/~cprov")
-    >>> admin_browser.getLink("PPA for Celso Providelo").click()
+    >>> admin_browser.getLink("PPA named p3a for Celso Providelo").click()
     >>> admin_browser.url
-    'http://launchpad.dev/~cprov/+archive/ppa'
+    'http://launchpad.dev/~cprov/+archive/p3a'
 
     >>> admin_browser.open("http://launchpad.dev/~landscape-developers")
     >>> admin_browser.getLink("PPA for Landscape Developers").click()

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-person-packages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2009-11-09 17:08:21 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-person-packages.txt	2010-02-26 15:48:21 +0000
@@ -169,15 +169,6 @@
     ...     for row in rows:
     ...         print extract_text(row)
 
-And another helper function to set the private flag on a PPA:
-
-    >>> def set_private(name, private=True):
-    ...     admin_browser.open("http://launchpad.dev/~%s/+archive/ppa" % (
-    ...         name))
-    ...     admin_browser.getLink("Administer archive").click()
-    ...     admin_browser.getControl(name="field.private").value = private
-    ...     admin_browser.getControl(name="field.buildd_secret").value = "x"
-    ...     admin_browser.getControl("Save").click()
 
 Create some new source packages, source1 and source2, both created by cprov
 so that they appear in his +packages page.
@@ -186,6 +177,7 @@
     >>> from canonical.launchpad.ftests import login, logout
     >>> from canonical.database.sqlbase import flush_database_updates
     >>> from canonical.launchpad.interfaces import IPersonSet
+    >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> from lp.soyuz.tests.test_publishing import (
     ...      SoyuzTestPublisher)
     >>> from lp.soyuz.interfaces.publishing import (
@@ -194,6 +186,9 @@
     >>> login("[e-mail]")
     >>> cprov = getUtility(IPersonSet).getByName('cprov')
     >>> nopriv = getUtility(IPersonSet).getByName('no-priv')
+    >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+    >>> nopriv_private_ppa = factory.makeArchive(
+    ...     owner=nopriv, name="p3a", distribution=ubuntu, private=True)
     >>> mark = getUtility(IPersonSet).getByName('mark')
     >>> test_publisher = SoyuzTestPublisher()
     >>> test_publisher.prepareBreezyAutotest()
@@ -207,14 +202,14 @@
     >>> source2 = test_publisher.getPubSource(
     ...     status=PackagePublishingStatus.PUBLISHED,
     ...     sourcename='source2',
-    ...     archive=nopriv.archive)
+    ...     archive=nopriv_private_ppa)
     >>> source2.sourcepackagerelease.creator=cprov
 
     >>> flush_database_updates()
     >>> logout()
 
 "source1" is now published in cprov and mark's PPA.  "source2" is only
-published in no-priv's PPA.
+published in no-priv's Private PPA.
 
 Make user_browser a known user that does not conflict with "no-priv":
 
@@ -222,23 +217,14 @@
 
 === Cprov's +related-software page ===
 
-So let's look at cprov's +related-software page which has two entries in
-the PPA section:
-
-    >>> user_browser.open("http://launchpad.dev/~cprov/+related-software")
-    >>> print_ppa_rows(user_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
-        ...ago None - -
-    source2 PPA for No Privileges Person - Ubuntutest Breezy-autotest 666
-        ...ago None - -
-
-Now, let's make the PPA for "No Privileges Person" private:
-
-    >>> set_private("no-priv")
-
-For unprivileged users, cprov's displayed PPA packages are now reduced
-to the one in his own PPA because the other iceweasel is only published
-in the newly-private PPA of the "no-priv" user.
+For unprivileged users, cprov's displayed PPA packages only display
+the one in his own public PPA because source2 is only published
+in the private PPA of the "no-priv" user.
+
+XXX Michael Nelson 2010-02-26 bug=394276: The following should be
+a view test of PersonPPAPAckagesView.filterPPAPackageList(). They
+are not always testing what we think they are, as the lines match
+more packages than intended.
 
 The logged-in user's case:
 
@@ -262,20 +248,26 @@
     >>> print_ppa_rows(nopriv_browser)
     source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
         ...ago None - -
-    source2 PPA for No Priv... Person - Ubuntutest Breezy-autotest 666
+    source2 PPA named p3a for No Priv... Ubuntutest Breezy-autotest 666
         ...ago None - -
 
     >>> admin_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(admin_browser)
     source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
         ...ago None - -
-    source2 PPA for No Priv... Person - Ubuntutest Breezy-autotest 666
+    source2 PPA named p3a for No Priv... Ubuntutest Breezy-autotest 666
         ...ago None - -
 
-Let's make mark's archive private and view the page again.
-
-    >>> set_private("mark")
-
+Let's move the publication of source1 from mark's public archive to his
+private one and the view the page again.
+
+    >>> login('[e-mail]')
+    >>> mark_private_ppa = factory.makeArchive(
+    ...     owner=mark, name="p3a", distribution=ubuntu, private=True)
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> removeSecurityProxy(source1_mark.secure_record).archive = (
+    ...     mark_private_ppa)
+    >>> logout()
     >>> user_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(user_browser)
     source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
@@ -286,13 +278,20 @@
     source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
-Notice that the source1 package in mark's PPA is still appearing
-because it is also published in some non-private archives, which
-override the private nature of mark's archive.
-
-Let's make cprov's archive private:
-
-    >>> set_private("cprov")
+Notice that the source1 package is still appearing because it is also
+published in some non-private archives, which override the private nature
+of mark's archive.
+
+Let's move the publication of source1 from cprov's public archive to
+his private one:
+
+    >>> login('[e-mail]')
+    >>> cprov_private_ppa = factory.makeArchive(
+    ...     owner=cprov, name="p3a", distribution=ubuntu, private=True)
+    >>> removeSecurityProxy(source1.secure_record).archive = (
+    ...     cprov_private_ppa)
+    >>> source1.sourcepackagerelease.upload_archive = cprov_private_ppa
+    >>> logout()
 
 It will now disppear from the listings because it's not published in any
 public archives.
@@ -320,12 +319,12 @@
 
     >>> user_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(user_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
     >>> anon_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(anon_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
 Even after the package is superseded, the package remains visibile in
@@ -338,12 +337,12 @@
 
     >>> user_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(user_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
     >>> anon_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(anon_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
 
@@ -358,15 +357,15 @@
 
     >>> admin_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(admin_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
-    source2 PPA for No Priv... Person - Ubuntutest Breezy-autotest 666
+    source2 PPA named p3a for No Priv... - Ubuntutest Breezy-autotest 666
         ...ago None - -
 
 Then delete the 'source2' package.
 
     >>> admin_browser.open(
-    ...     "http://launchpad.dev/~no-priv/+archive/ppa/+delete-packages")
+    ...     "http://launchpad.dev/~no-priv/+archive/p3a/+delete-packages")
     >>> admin_browser.getControl(
     ...    name='field.selected_sources').value = ['%s' % source2.id]
     >>> admin_browser.getControl(
@@ -394,8 +393,8 @@
 
     >>> admin_browser.open("http://launchpad.dev/~cprov/+related-software")
     >>> print_ppa_rows(admin_browser)
-    source1 PPA for Celso Providelo - Ubuntutest Breezy-autotest 666
+    source1 PPA named p3a for Celso... - Ubuntutest Breezy-autotest 666
         ...ago None - -
-    source2 PPA for No Priv... Person - Ubuntutest Breezy-autotest 666
+    source2 PPA named p3a for No Priv... - Ubuntutest Breezy-autotest 666
         ...ago None - -