Merge lp:~julian-edwards/launchpad/ppa-copy-to-main-bug-426163 into lp:launchpad

[Julian Edwards]

[Julian Edwards (julian-edwards)]

= Summary =
Ensure that packages copied from the primary archive into a PPA don't get a
non-main component

== Proposed fix ==
Right now, when packages are copied from Ubuntu into a PPA, if the source was
in a non-main component then that component is retained in the PPA. This is
bad because PPAs are not supposed to have non-main components!

== Pre-implementation notes ==
I chatted with Celso about this. The actual fix for this is quite trivial;
that is to override the component when the publishing record in the PPA is
created. However, we identified more than one place where publications are
created and this overriding happens. Therefore, this branch contains some
refactoring.

== Implementation details ==
The various methods that created publishing records are now refactored into
the IPublishingSet utility. There's two new methods, one for source and one
for binary. They both override the component to main if the context archive
is a PPA.

File-by-file changes:

* lib/lp/soyuz/doc/publishing.txt:
  I did a moin -> reST conversion. Also updated tests for the new methods on
IPublishingSet. Had to fixe the last test in the file which was copying stuff
into a PPA and expecting a non-main component!

* lib/lp/soyuz/model/publishing.py
  Fixed some code that creates publications so that they use the utility.
  Also added the new utility methods here.

* lib/lp/soyuz/model/queue.py
  Calling the new utility methods instead of creating publishing records
directly.

* lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt
  This test got broken by the changes because it was relying on the fact that
the publishing records had no security wrapper. Now that they created in a
utility, they will get a wrapper, and this has the knock on effect of also
putting things like SourcePackageReleaseFile in a wrapper which means the
pagetest interaction can't process the upload. I made it call out to a script
instead which runs zopeless. (the objects are *only* ever created in zopeless
scripts in production)

== Tests ==
bin/test -cvvt publishing.txt -t xx-queue-pages-delayed-copies.txt

== Demo and Q/A ==
Can test this on dogfood by using the +copy-packages page to copy some
packages into a PPA. If the packages appear in main, then it's all good!

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/model/queue.py
  lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt
  lib/lp/soyuz/model/publishing.py
  lib/lp/soyuz/doc/publishing.txt
  lib/lp/soyuz/interfaces/publishing.py

== Pylint notices ==

lib/lp/soyuz/interfaces/publishing.py
    32: [F0401] Unable to import 'lazr.enum' (No module named enum)
    39: [F0401] Unable to import 'lazr.restful.fields' (No module named
restful)
    40: [F0401] Unable to import 'lazr.restful.declarations' (No module named
restful)

[Aaron Bentley (abentley)]

This looks basically good, but there are a few things I'd like changed.

1. Please document the parameters of newBinaryPublication and newSourcePublication
2. Both methods take a status parameter which they ignore. Either they should not accept the parameter, or they should not ignore it. Celso suggests they should not accept the parameter
3. xx-queue-pages-delayed-copies.txt appears to reimplement canonical.launchpad.scripts.tests.run_script. If possible, please use run_script.

[Julian Edwards (julian-edwards)]

Thanks for the review Aaron.

On Monday 14 September 2009 18:15:48 Aaron Bentley wrote:
> This looks basically good, but there are a few things I'd like changed.
>
> 1. Please document the parameters of newBinaryPublication and
> newSourcePublication

Done.

> 2. Both methods take a status parameter which they
> ignore. Either they should not accept the parameter, or they should not
> ignore it. Celso suggests they should not accept the parameter

Right, I had intended to take that out and completely forgot, as you can see
from the half-assed attempt! Thanks for spotting it, both methods now create
new publications with a default status of PENDING.

> 3.
> xx-queue-pages-delayed-copies.txt appears to reimplement
> canonical.launchpad.scripts.tests.run_script. If possible, please use
> run_script.
>

I've changed that.

Partial diff below.

Cheers
Julian

=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt 2009-09-11 10:47:43 +0000
+++ lib/lp/soyuz/doc/publishing.txt 2009-09-15 07:55:17 +0000
@@ -1014,7 +1014,6 @@
     ... distroseries=test_source_pub.distroseries,
     ... component=test_source_pub.component,
     ... section=test_source_pub.section,
- ... status=test_source_pub.status,
     ... pocket=test_source_pub.pocket)
     >>> print ppa_pub.component.name
     main
@@ -1029,7 +1028,6 @@
     ... component=test_bin_pub.component,
     ... section=test_bin_pub.section,
     ... priority=test_bin_pub.priority,
- ... status=test_bin_pub.status,
     ... pocket=test_bin_pub.pocket)
     >>> print ppa_pub.binarypackagerelease.component.name
     universe

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py 2009-09-10 15:25:45 +0000
+++ lib/lp/soyuz/interfaces/publishing.py 2009-09-15 09:10:22 +0000
@@ -847,17 +847,34 @@
     """Auxiliary methods for dealing with sets of publications."""

     def newBinaryPublication(archive, binarypackagerelease, distroarchseries,
- component, section, priority, status, pocket):
+ component, section, priority, pocket):
         """Create a new `BinaryPackagePublishingHistory`.

+ :param archive: An...

[Aaron Bentley (abentley)]

Thanks for your changes. This looks good.

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt	2009-08-28 06:41:25 +0000
+++ lib/lp/soyuz/doc/publishing.txt	2009-09-11 10:47:43 +0000
@@ -1,4 +1,6 @@
-== SourcePackagePublishingHistory ==
+==============================
+SourcePackagePublishingHistory
+==============================
 
 This class provides public access to publishing records via a SQL view.
 
@@ -268,7 +270,8 @@
     base
 
 
-== Stanza generation ==
+Stanza generation
+=================
 
     >>> from canonical.launchpad.interfaces import (
     ...     IArchiveSafePublisher,
@@ -328,7 +331,8 @@
       u'http://ftpmaster.internal/ubuntu/pool/main/a/alsa-utils/alsa-utils_1.0.8-1ubuntu1.dsc')]
 
 
-== Deletion and obsolescence ==
+Deletion and obsolescence
+=========================
 
 ArchivePublisherBase, which is common to SourcePackagePublishingHistory
 and BinaryPackagePublishingHistory, contains the methods requestDeletion
@@ -374,7 +378,8 @@
     True
 
 
-== Copying and published binarypackages lookup ==
+Copying and published binarypackages lookup
+===========================================
 
 ISourcePackagePublishingHistory provides the getPublishedBinaries
 which returns all published binaries build from a source in the pocket
@@ -609,7 +614,8 @@
     >>> syncUpdate(deleted)
 
 
-== Copying and inspecting architecture independent binaries ==
+Copying and inspecting architecture independent binaries
+========================================================
 
 copyTo() behaves differently for architecture independent and
 architecture specific binaries. We will create a
@@ -690,7 +696,8 @@
     pirulito 666 in breezy-autotest i386
 
 
-== Copying to PPAs ==
+Copying to PPAs
+===============
 
 Another common copy use-case is rebuild the same source in another
 suite. To simulate this we will create a publication in Celso's PPA.
@@ -819,7 +826,8 @@
     []
 
 
-== getSourceAndBinaryLibraryFiles ==
+getSourceAndBinaryLibraryFiles
+==============================
 
 This method retrieves LibraryFileAlias records for all source and binary
 files associated with this publication.
@@ -847,7 +855,8 @@
     foo_666.dsc
 
 
-== Publishing records age ==
+Publishing records age
+======================
 
 Both ISourcePackagePublishingHistory and IBinaryPackagePublishingHistory
 implement the 'age' property which return a timedelta representing
@@ -860,7 +869,8 @@
     datetime.timedelta(...)
 
 
-== Secure Source Publishing ==
+Secure Source Publishing
+========================
 
 'secure_record' returns a ISecureSourcePackagePublishing instance
 corresponding to this publication. This instance also implements
@@ -875,7 +885,8 @@
     False
 
 
-== Binary and Binary File Publishing ===
+Binary and Binary File Publishing
+=================================
 
 Symmetric behaviour is offered for BinaryPackagePublishing,
 BinaryPackageFile and ISecureBinaryPackagePublishingHistory
@@ -935,17 +946,23 @@
     [u'http://ftpmaster.internal/debian/pool/universe/m/mozilla-firefox/mozilla-firefox_0.9_i386.deb']
 
 
-== IPublishingSet ==
+IPublishingSet
+==============
 
 This utility implements the following methods:
 
+ * newBinaryPublication();
+ * newSourcePublication();
+
+which create new publishing records, and:
+
  * getBuildsForSources();
  * getUnpublishedBuildsForSources();
  * getFilesForSources();
  * getBinaryPublicationsForSources();
  * getPackageDiffsForSources();
 
-They receive a list of `SourcePackagePublishingHistory` objects and
+which receive a list of `SourcePackagePublishingHistory` objects and
 fetch the corresponding information for all of them.
 
 Their returned `ResultSet` (they all use storm natively) follows a
@@ -963,27 +980,69 @@
  * getSourceAndBinaryLibraryFiles -> IPublishingSet.getFilesForSources;
  * getPublishedBinaries -> IPublishingSet.getBinaryPublicationsForSources;
 
-So, they were already tested implicitly before in this file, the
+So, they were already tested implicitly before in this file, they
 simply use the IPublishing methods passing only a single source
 publication. Now we will document how they work for multiple source
 publications.
 
+    >>> from lp.soyuz.interfaces.publishing import (
+    ...     IPublishingSet)
+
+    >>> publishing_set = getUtility(IPublishingSet)
+
+    >>> verifyObject(IPublishingSet, publishing_set)
+    True
+
+
+Creating new publication records
+--------------------------------
+
+newSourcePublication() and newBinaryPublication() will create source and
+binary publication records respectively.  They are already implicitly tested
+above via the copyTo methods which use them to create new records.  However,
+they have one extra feature which is important for PPAs - they will ensure
+that the published component is always 'main'.
+
+When copying publications from non-main components in the primary archive,
+the PPA publication will always be main:
+
+    >>> test_source_pub = test_publisher.getPubSource(
+    ...     sourcename='overrideme', component='universe')
+    >>> ppa_pub = publishing_set.newSourcePublication(
+    ...     archive=mark.archive,
+    ...     sourcepackagerelease=test_source_pub.sourcepackagerelease,
+    ...     distroseries=test_source_pub.distroseries,
+    ...     component=test_source_pub.component,
+    ...     section=test_source_pub.section,
+    ...     status=test_source_pub.status,
+    ...     pocket=test_source_pub.pocket)
+    >>> print ppa_pub.component.name
+    main
+
+    >>> test_bin_pubs = test_publisher.getPubBinaries(
+    ...     pub_source=test_source_pub)
+    >>> test_bin_pub = test_bin_pubs[0]
+    >>> ppa_pub = publishing_set.newBinaryPublication(
+    ...     archive=mark.archive,
+    ...     binarypackagerelease=test_bin_pub.binarypackagerelease,
+    ...     distroarchseries=test_bin_pub.distroarchseries,
+    ...     component=test_bin_pub.component,
+    ...     section=test_bin_pub.section,
+    ...     priority=test_bin_pub.priority,
+    ...     status=test_bin_pub.status,
+    ...     pocket=test_bin_pub.pocket)
+    >>> print ppa_pub.binarypackagerelease.component.name
+    universe
+    >>> print ppa_pub.component.name
+    main
+
 IPublishingSet is an essential component for
 `ArchiveSourcePublications` feature, see more  information below in
 its corresponding test section.
 
-    >>> from lp.soyuz.interfaces.publishing import (
-    ...     IPublishingSet)
-
-    >>> publishing_set = getUtility(IPublishingSet)
-
-    >>> verifyObject(IPublishingSet, publishing_set)
-    True
-
 We will assembly a list of source publications based on what was
 ever published in Celso's PPA.
 
-    >>> cprov = getUtility(IPersonSet).getByName('cprov')
     >>> cprov_sources = list(cprov.archive.getPublishedSources())
     >>> len(cprov_sources)
     8
@@ -1301,7 +1360,8 @@
     AssertionError: The 'sources' parameter must be a list.
 
 
-== ArchiveSourcePublications ==
+ArchiveSourcePublications
+=========================
 
 `ArchiveSourcePublications` wraps `IPublishingSet` methods to build a
 set of objects which decorate `ISourcePackagePublishingHistory` with
@@ -1516,7 +1576,8 @@
     i386 build of foo 999 in ubuntutest breezy-autotest RELEASE
 
 
-== IPublishingSet.getBuildStatusSummariesForSourceIdsAndArchive() ==
+IPublishingSet.getBuildStatusSummariesForSourceIdsAndArchive()
+==============================================================
 
 This extra method on IPublishingSet allows a summary of the build status
 for a set of sources to be presented. The corresponding archive is a
@@ -1586,7 +1647,8 @@
     >>> print_build_summaries(build_summaries)
 
 
-== IPublishing ancestry lookup and override ==
+IPublishing ancestry lookup and override
+========================================
 
 `IPublishing` is implemented by both kinds of package publications we
 have `SourcePackagePublishingHistory` and
@@ -1671,7 +1733,8 @@
 
 `overrideFromAncestry` operates directly on top of the default
 behavior of `getAncestry`. It looks up the most recent ancestry for a
-publication and override it in place.
+publication and override it in place.  If there is no previous publication
+then the package's component is used.
 
     >>> print test_source.component.name
     universe
@@ -1680,17 +1743,19 @@
     >>> print test_source.component.name
     multiverse
 
-It works in the same way for binaries and follows the new publishing
-context.
+It works in the same way for binaries.
+
+    >>> multiverse = getUtility(IComponentSet)['multiverse']
+    >>> test_binary.binarypackagerelease.component = multiverse
 
     >>> print test_binary.component.name
     universe
 
     >>> copied_binary = test_binary.copyTo(
-    ...     test_source.distroseries, test_source.pocket, cprov.archive)[0]
+    ...     hoary_test, test_source.pocket, archive=test_binary.archive)[0]
     >>> print copied_binary.component.name
     universe
 
     >>> copied_binary.overrideFromAncestry()
     >>> print copied_binary.component.name
-    main
+    multiverse

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2009-08-28 07:39:05 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2009-09-10 15:25:45 +0000
@@ -846,6 +846,20 @@
 class IPublishingSet(Interface):
     """Auxiliary methods for dealing with sets of publications."""
 
+    def newBinaryPublication(archive, binarypackagerelease, distroarchseries,
+                             component, section, priority, status, pocket):
+        """Create a new `BinaryPackagePublishingHistory`.
+
+        datecreated will be UTC_NOW.
+        """
+
+    def newSourcePublication(archive, sourcepackagerelease, distroseries,
+                             component, section, status, pocket):
+        """Create a new `SourcePackagePublishingHistory`.
+
+        datecreated will be UTC_NOW.
+        """
+
     def getByIdAndArchive(id, archive, source=True):
         """Return the publication matching id AND archive.
 

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/model/publishing.py	2009-09-11 10:47:43 +0000
@@ -45,6 +45,7 @@
     LibraryFileAlias, LibraryFileContent)
 from lp.soyuz.model.packagediff import PackageDiff
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.queue import PackageUploadStatus
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, IArchiveSafePublisher,
@@ -779,17 +780,15 @@
     def copyTo(self, distroseries, pocket, archive):
         """See `ISourcePackagePublishingHistory`."""
         current = self.secure_record
-        secure_copy = SecureSourcePackagePublishingHistory(
-            distroseries=distroseries,
-            pocket=pocket,
-            archive=archive,
-            sourcepackagerelease=current.sourcepackagerelease,
-            component=current.component,
-            section=current.section,
-            status=PackagePublishingStatus.PENDING,
-            datecreated=UTC_NOW,
-            embargo=False)
-        return SourcePackagePublishingHistory.get(secure_copy.id)
+        return getUtility(IPublishingSet).newSourcePublication(
+            archive,
+            current.sourcepackagerelease,
+            distroseries,
+            current.component,
+            current.section,
+            PackagePublishingStatus.PENDING,
+            pocket
+            )
 
     def getStatusSummaryForBuilds(self):
         """See `ISourcePackagePublishingHistory`."""
@@ -1045,21 +1044,19 @@
 
         copies = []
         for architecture in destination_architectures:
-            copy = SecureBinaryPackagePublishingHistory(
-                archive=archive,
-                binarypackagerelease=self.binarypackagerelease,
-                distroarchseries=architecture,
-                component=current.component,
-                section=current.section,
-                priority=current.priority,
-                status=PackagePublishingStatus.PENDING,
-                datecreated=UTC_NOW,
-                pocket=pocket,
-                embargo=False)
+            copy = getUtility(IPublishingSet).newBinaryPublication(
+                archive,
+                self.binarypackagerelease,
+                architecture,
+                current.component,
+                current.section,
+                current.priority,
+                PackagePublishingStatus.PENDING,
+                pocket
+                )
             copies.append(copy)
 
-        return [
-            BinaryPackagePublishingHistory.get(copy.id) for copy in copies]
+        return copies
 
     def getAncestry(self, archive=None, distroseries=None, pocket=None,
                     status=None):
@@ -1105,6 +1102,53 @@
 
     implements(IPublishingSet)
 
+    def newBinaryPublication(self, archive, binarypackagerelease,
+                             distroarchseries, component, section, priority,
+                             status, pocket):
+        """See `IPublishingSet`."""
+        if archive.is_ppa:
+            # PPA component must always be 'main', so we override it
+            # here.
+            component = getUtility(IComponentSet)['main']
+        pub = SecureBinaryPackagePublishingHistory(
+            archive=archive,
+            binarypackagerelease=binarypackagerelease,
+            distroarchseries=distroarchseries,
+            component=component,
+            section=section,
+            priority=priority,
+            status=PackagePublishingStatus.PENDING,
+            datecreated=UTC_NOW,
+            pocket=pocket,
+            embargo=False)
+
+        # One day, this will not be necessary when we have time to kill
+        # the Secure* records.
+        return BinaryPackagePublishingHistory.get(pub.id)
+
+    def newSourcePublication(self, archive, sourcepackagerelease,
+                             distroseries, component, section, status,
+                             pocket):
+        """See `IPublishingSet`."""
+        if archive.is_ppa:
+            # PPA component must always be 'main', so we override it
+            # here.
+            component = getUtility(IComponentSet)['main']
+        pub = SecureSourcePackagePublishingHistory(
+            distroseries=distroseries,
+            pocket=pocket,
+            archive=archive,
+            sourcepackagerelease=sourcepackagerelease,
+            component=component,
+            section=section,
+            status=PackagePublishingStatus.PENDING,
+            datecreated=UTC_NOW,
+            embargo=False)
+
+        # One day, this will not be necessary when we have time to kill
+        # the Secure* records.
+        return SourcePackagePublishingHistory.get(pub.id)
+
     def getBuildsForSourceIds(
         self, source_publication_ids, archive=None, build_states=None):
         """See `IPublishingSet`."""

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2009-08-16 12:38:12 +0000
+++ lib/lp/soyuz/model/queue.py	2009-09-14 15:19:37 +0000
@@ -43,15 +43,11 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.encoding import guess as guess_encoding, ascii_smash
-from lp.soyuz.model.publishing import (
-    BinaryPackagePublishingHistory, SecureBinaryPackagePublishingHistory,
-    SecureSourcePackagePublishingHistory, SourcePackagePublishingHistory)
 from canonical.launchpad.helpers import get_email_template
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, IArchiveSet)
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
-from lp.soyuz.interfaces.component import IComponentSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.soyuz.interfaces.queue import (
     PackageUploadStatus, PackageUploadCustomFormat)
@@ -59,7 +55,7 @@
 from lp.registry.interfaces.pocket import (
     PackagePublishingPocket, pocketsuffix)
 from lp.soyuz.interfaces.publishing import (
-    ISourcePackagePublishingHistory, PackagePublishingStatus)
+    IPublishingSet, ISourcePackagePublishingHistory, PackagePublishingStatus)
 from lp.soyuz.interfaces.queue import (
     IPackageUpload, IPackageUploadBuild, IPackageUploadCustom,
     IPackageUploadQueue, IPackageUploadSource, IPackageUploadSet,
@@ -1305,7 +1301,6 @@
         other_dars = other_dars - set([target_dar])
         # First up, publish everything in this build into that dar.
         published_binaries = []
-        main_component = getUtility(IComponentSet)['main']
         for binary in self.build.binarypackages:
             target_dars = set([target_dar])
             if not binary.architecturespecific:
@@ -1332,28 +1327,17 @@
                         "Could not find the corresponding DEBUG archive "
                         "for %s" % (distribution.title))
 
-            # We override PPA to always publish in the main component.
-            if self.packageupload.archive.is_ppa:
-                component = main_component
-            else:
-                component = binary.component
-
             for each_target_dar in target_dars:
-                # XXX: dsilvers 2005-10-20 bug=3408:
-                # What do we do about embargoed binaries here?
-                sbpph = SecureBinaryPackagePublishingHistory(
+                bpph = getUtility(IPublishingSet).newBinaryPublication(
+                    archive=archive,
                     binarypackagerelease=binary,
                     distroarchseries=each_target_dar,
+                    component=binary.component,
                     section=binary.section,
                     priority=binary.priority,
                     status=PackagePublishingStatus.PENDING,
-                    datecreated=UTC_NOW,
-                    pocket=self.packageupload.pocket,
-                    embargo=False,
-                    component=component,
-                    archive=archive,
+                    pocket=self.packageupload.pocket
                     )
-                bpph = BinaryPackagePublishingHistory.get(sbpph.id)
                 published_binaries.append(bpph)
         return published_binaries
 
@@ -1470,31 +1454,21 @@
     def publish(self, logger=None):
         """See `IPackageUploadSource`."""
         # Publish myself in the distroseries pointed at by my queue item.
-        # XXX: dsilvers: 2005-10-20 bug=3408:
-        # What do we do here to support embargoed sources?
         debug(logger, "Publishing source %s/%s to %s/%s" % (
             self.sourcepackagerelease.name,
             self.sourcepackagerelease.version,
             self.packageupload.distroseries.distribution.name,
             self.packageupload.distroseries.name))
 
-        if self.packageupload.archive.is_ppa:
-            # We override PPA to always publish in the main component.
-            component = getUtility(IComponentSet)['main']
-        else:
-            component = self.sourcepackagerelease.component
-
-        sspph = SecureSourcePackagePublishingHistory(
+        return getUtility(IPublishingSet).newSourcePublication(
+            archive=self.packageupload.archive,
+            sourcepackagerelease=self.sourcepackagerelease,
             distroseries=self.packageupload.distroseries,
-            sourcepackagerelease=self.sourcepackagerelease,
-            component=component,
+            component=self.sourcepackagerelease.component,
             section=self.sourcepackagerelease.section,
             status=PackagePublishingStatus.PENDING,
-            datecreated=UTC_NOW,
-            pocket=self.packageupload.pocket,
-            embargo=False,
-            archive=self.packageupload.archive)
-        return SourcePackagePublishingHistory.get(sspph.id)
+            pocket=self.packageupload.pocket
+            )
 
 
 class PackageUploadCustom(SQLBase):

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt'
--- lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt	2009-08-28 06:39:38 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt	2009-09-14 15:15:54 +0000
@@ -23,6 +23,7 @@
     >>> [bin_hppa, bin_i386] = stp.getPubBinaries(archive=cprov.archive)
     >>> build = bin_hppa.binarypackagerelease.build
     >>> breezy_autotest = ubuntu.getSeries('breezy-autotest')
+    >>> stp.addFakeChroots(breezy_autotest)
     >>> delayed_copy = getUtility(IPackageUploadSet).createDelayedCopy(
     ...     archive=ubuntu.main_archive, distroseries=breezy_autotest,
     ...     pocket=PackagePublishingPocket.RELEASE, signing_key=None)
@@ -100,14 +101,22 @@
     http://launchpad.dev/~cprov/+archive/ppa
 
 When the delayed-copy is processed (moved to DONE queue) its contents
-becomes available to everyone.
+become available to everyone.
 
-    # Process the delayed-copy.
-    >>> login('[e-mail]')
-    >>> stp.addFakeChroots(breezy_autotest)
-    >>> unused = delayed_copy.realiseUpload()
-    >>> transaction.commit()
-    >>> logout()
+    # Process the delayed-copy using an external script call.  Since some
+    # DB objects that have no security adapter are modified during the
+    # delayed copy, the modification must be done in Zopeless mode.
+    >>> import os.path
+    >>> import subprocess
+    >>> import sys
+    >>> from canonical.config import config
+    >>> script = os.path.join(config.root, "scripts/process-accepted.py")
+    >>> process = subprocess.Popen(
+    ...     [sys.executable, script, "ubuntu"],
+    ...     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    >>> stdout, stderr = process.communicate()
+    >>> if process.returncode != 0:
+    ...     print stderr
 
 Any user can access the DONE queue and access the delayed-copy
 'changesfile' and view its files in the expandable area.