Merge lp:~cjwatson/launchpad/change-override-forbid-release-stable into lp:launchpad

[Colin Watson]

Prevent changeOverride creating publications in RELEASE pockets that will never be published.

== Summary ==

Bug 530020: override changes can result in stranded publications that will never be published, since the RELEASE pockets of released DSes in the primary Ubuntu archive are immutable.

== Proposed fix ==

Move the cannotModifySuite method from the publisher down to DistroSeries so that changeOverride can use it (there are enough copies of this logic already without adding more!), and raise an exception in changeOverride if that indicates that the newly-created publication would be stranded.

== Implementation details ==

I cleaned up some useless "current = self" code in changeOverride. This made sense before the removal of secure publication records in r7659.7.1, but now it's just more typing.

== LOC Rationale ==

+42. I'm doing this so that I can land https://code.launchpad.net/~cjwatson/launchpad/export-change-override/+merge/109549, which is looking like it should come out at least 76 lines in credit once the old script is removed, so I think this will be OK.

== Tests ==

bin/test -vvct test_publishing.TestChangeOverride

== Demo and Q/A ==

On dogfood, attempt to run 'change-override.py -s precise -p extra base-files' and 'change-override.py -s quantal -p extra base-files'; these should respectively fail and succeed.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2012-03-28 13:27:58 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2012-06-19 10:11:30 +0000
@@ -263,10 +263,10 @@
         PPA uploads are always auto-approved.
         RELEASE and PROPOSED pocket uploads (to main archives) are only
         auto-approved if the distroseries is in a non-FROZEN state
-        pre-release.  (We already performed the
-        IDistroSeries.canUploadToPocket check in the checkUpload base
-        method, which will deny RELEASE uploads post-release, but it doesn't
-        hurt to repeat this for that case.)
+        pre-release.  (We already performed the IArchive.canModifySuite
+        check in the checkUpload base method, which will deny RELEASE
+        uploads post-release, but it doesn't hurt to repeat this for that
+        case.)
         """
         if upload.is_ppa:
             return True

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2012-01-11 08:52:22 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2012-06-19 10:11:30 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -330,11 +330,10 @@
                 return self._release_builder_and_remove_queue_item()
 
         # Explode before collect a binary that is denied in this
-        # distroseries/pocket
-        if not self.archive.allowUpdatesToReleasePocket():
-            assert self.distro_series.canUploadToPocket(self.pocket), (
-                "%s (%s) can not be built for pocket %s: illegal status"
-                % (self.title, self.id, self.pocket.name))
+        # distroseries/pocket/archive
+        assert self.archive.canModifySuite(self.distro_series, self.pocket), (
+            "%s (%s) can not be built for pocket %s in %s: illegal status"
+            % (self.title, self.id, self.pocket.name, self.archive))
 
         # Ensure we have the correct build root as:
         # <BUILDMASTER_ROOT>/incoming/<UPLOAD_LEAF>/<TARGET_PATH>/[FILES]

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2012-04-23 22:18:46 +0000
+++ lib/lp/registry/doc/distroseries.txt	2012-06-19 10:11:30 +0000
@@ -166,10 +166,11 @@
 
 See distroseries-publishing-lookups.txt for more information.
 
-canUploadToPocket method helps us to decide if an upload is allowed or
-not, according to the distroseries status and the upload target pocket.
+canModifySuite method helps us to decide if an upload is allowed or not,
+according to the distroseries status and the upload target pocket.
 
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
+    >>> archive = ubuntu.main_archive
     >>> breezy_autotest = ubuntu['breezy-autotest']
     >>> hoary = ubuntu['hoary']
 
@@ -178,16 +179,18 @@
 
     >>> warty.status.name
     'CURRENT'
-    >>> warty.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    >>> archive.canModifySuite(warty, PackagePublishingPocket.RELEASE)
     False
-    >>> warty.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    >>> archive.canModifySuite(warty, PackagePublishingPocket.SECURITY)
     True
 
     >>> breezy_autotest.status.name
     'EXPERIMENTAL'
-    >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    >>> archive.canModifySuite(
+    ...     breezy_autotest, PackagePublishingPocket.RELEASE)
     True
-    >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    >>> archive.canModifySuite(
+    ...     breezy_autotest, PackagePublishingPocket.SECURITY)
     False
 
 The FROZEN status is special.  Uploads are allowed for all pockets as
@@ -198,20 +201,21 @@
 
     >>> hoary.status.name
     'FROZEN'
-    >>> hoary.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    >>> archive.canModifySuite(hoary, PackagePublishingPocket.RELEASE)
     True
-    >>> hoary.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    >>> archive.canModifySuite(hoary, PackagePublishingPocket.SECURITY)
     True
 
 The PROPOSED pocket is also special.  Pre-release, it may be used for
 staging uploads on their way into the RELEASE pocket; post-release, it may
 be used for staging uploads on their way into the UPDATES pocket.
 
-    >>> warty.canUploadToPocket(PackagePublishingPocket.PROPOSED)
-    True
-    >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.PROPOSED)
-    True
-    >>> hoary.canUploadToPocket(PackagePublishingPocket.PROPOSED)
+    >>> archive.canModifySuite(warty, PackagePublishingPocket.PROPOSED)
+    True
+    >>> archive.canModifySuite(
+    ...     breezy_autotest, PackagePublishingPocket.PROPOSED)
+    True
+    >>> archive.canModifySuite(hoary, PackagePublishingPocket.PROPOSED)
     True
 
 Package searching
@@ -517,8 +521,12 @@
 ------------------------------------------------
 
     >>> from lp.registry.interfaces.sourcepackage import ISourcePackage
-    >>> from lp.soyuz.interfaces.distroseriesbinarypackage import IDistroSeriesBinaryPackage
-    >>> from lp.soyuz.interfaces.distroseriessourcepackagerelease import IDistroSeriesSourcePackageRelease
+    >>> from lp.soyuz.interfaces.distroseriesbinarypackage import (
+    ...     IDistroSeriesBinaryPackage,
+    ...     )
+    >>> from lp.soyuz.interfaces.distroseriessourcepackagerelease import (
+    ...     IDistroSeriesSourcePackageRelease,
+    ...     )
 
     >>> pmount_src_name = SourcePackageName.byName('pmount')
     >>> pmount_source = hoary.getSourcePackage(pmount_src_name)
@@ -722,7 +730,9 @@
     4
     >>> warty_mozilla_pub_bin = warty_mozilla_pub_binaries[0]
 
-    >>> from lp.soyuz.interfaces.publishing import IBinaryPackagePublishingHistory
+    >>> from lp.soyuz.interfaces.publishing import (
+    ...     IBinaryPackagePublishingHistory,
+    ...     )
     >>> verifyObject(IBinaryPackagePublishingHistory, warty_mozilla_pub_bin)
     True
 

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2012-01-10 09:55:24 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2012-06-19 10:11:30 +0000
@@ -402,26 +402,6 @@
         development moves on to the other pockets.
         """
 
-    def canUploadToPocket(pocket):
-        """Decides whether or not allow uploads for a given pocket.
-
-        Only allow uploads for RELEASE pocket in unreleased
-        distroseries and the opposite, only allow uploads for
-        non-RELEASE pockets in released distroseries.
-        For instance, in edgy time :
-
-                warty         -> DENY
-                edgy          -> ALLOW
-                warty-updates -> ALLOW
-                edgy-security -> DENY
-
-        Note that FROZEN is not considered either 'stable' or 'unstable'
-        state.  Uploads to a FROZEN distroseries will end up in the
-        UNAPPROVED queue.
-
-        Return True if the upload is allowed and False if denied.
-        """
-
     def getLatestUploads():
         """Return the latest five source uploads for this DistroSeries.
 

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2012-05-14 03:07:32 +0000
+++ lib/lp/registry/model/distroseries.py	2012-06-19 10:11:30 +0000
@@ -709,33 +709,6 @@
         """See `HasMilestonesMixin`."""
         return (Milestone.distroseries == self)
 
-    def canUploadToPocket(self, pocket):
-        """See `IDistroSeries`."""
-        # Allow everything for distroseries in FROZEN state.
-        if self.status == SeriesStatus.FROZEN:
-            return True
-
-        # Define stable/released states.
-        stable_states = (SeriesStatus.SUPPORTED,
-                         SeriesStatus.CURRENT)
-
-        # Deny uploads for RELEASE pocket in stable states.
-        if (pocket == PackagePublishingPocket.RELEASE and
-            self.status in stable_states):
-            return False
-
-        # Deny uploads for post-release-only pockets in unstable states.
-        pre_release_pockets = (
-            PackagePublishingPocket.RELEASE,
-            PackagePublishingPocket.PROPOSED,
-            )
-        if (pocket not in pre_release_pockets and
-            self.status not in stable_states):
-            return False
-
-        # Allow anything else.
-        return True
-
     def updatePackageCount(self):
         """See `IDistroSeries`."""
         self.sourcecount = IStore(SourcePackagePublishingHistory).find(
@@ -1610,34 +1583,12 @@
         if is_careful:
             return True
 
-        # PPA and PARTNER allow everything.
-        if publication.archive.allowUpdatesToReleasePocket():
-            return True
-
-        # FROZEN state also allow all pockets to be published.
-        if self.status == SeriesStatus.FROZEN:
-            return True
-
-        # If we're not republishing, we want to make sure that
-        # we're not publishing packages into the wrong pocket.
-        # Unfortunately for careful mode that can't hold true
-        # because we indeed need to republish everything.
-        pre_release_pockets = (
-            PackagePublishingPocket.RELEASE,
-            PackagePublishingPocket.PROPOSED,
-            )
-        if self.isUnstable() and publication.pocket not in pre_release_pockets:
-            log.error("Tried to publish %s (%s) into a non-release "
-                      "pocket on unstable series %s, skipping"
-                      % (publication.displayname, publication.id,
-                         self.displayname))
-            return False
-        if (not self.isUnstable() and
-            publication.pocket == PackagePublishingPocket.RELEASE):
-            log.error("Tried to publish %s (%s) into release pocket "
-                      "on stable series %s, skipping"
-                      % (publication.displayname, publication.id,
-                         self.displayname))
+        if not publication.archive.canModifySuite(self, publication.pocket):
+            log.error(
+                "Tried to publish %s (%s) into the %s pocket on series %s "
+                "(%s), skipping" % (
+                    publication.displayname, publication.id,
+                    publication.pocket, self.displayname, self.status.name))
             return False
 
         return True

=== modified file 'lib/lp/soyuz/adapters/copypolicy.py'
--- lib/lp/soyuz/adapters/copypolicy.py	2012-03-28 13:27:58 +0000
+++ lib/lp/soyuz/adapters/copypolicy.py	2012-06-19 10:11:30 +0000
@@ -45,8 +45,7 @@
         # If the pocket is RELEASE or PROPOSED and we're not frozen then you
         # can upload to it.  Any other states mean the upload is unapproved.
         #
-        # This check is orthogonal to the
-        # IDistroSeries.canUploadToPocket check.
+        # This check is orthogonal to the IArchive.canModifySuite check.
         auto_approve_pockets = (
             PackagePublishingPocket.RELEASE,
             PackagePublishingPocket.PROPOSED,

=== modified file 'lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt'
--- lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt	2012-06-19 10:11:30 +0000
@@ -174,9 +174,9 @@
 
 Note that, also the publications targeted to post-release pockets are
 returned, but they won't be dispatched until they can be accepted (see
-IDistroSeries.canUploadToPocket). This nuance will be more explored
-when fixing #67790 when we will start publishing and building
-post-release pocket in FROZEN state.
+IArchive.canModifySuite). This nuance will be more explored when fixing
+#67790 when we will start publishing and building post-release pocket in
+FROZEN state.
 
 Summing up, all the 8 test publications will be returned from the lookup:
 

=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/soyuz/doc/publishing.txt	2012-06-19 10:11:30 +0000
@@ -475,7 +475,9 @@
 
 'distroseries' and 'archive' will be constant.
 
+    >>> from lp.registry.interfaces.series import SeriesStatus
     >>> distroseries = source.distroseries
+    >>> distroseries.status = SeriesStatus.CURRENT
     >>> archive = source.archive
 
 'pocket' will be UPDATES.

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2012-06-12 04:05:44 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2012-06-19 10:11:30 +0000
@@ -576,6 +576,28 @@
         :return: True if they can, False if they cannot.
         """
 
+    def canModifySuite(distroseries, pocket):
+        """Decides whether or not to allow uploads for a given DS/pocket.
+
+        Some archive types (e.g. PPAs) allow uploads to the RELEASE pocket
+        regardless of the distroseries state.  For others (principally
+        primary archives), only allow uploads for RELEASE pocket in
+        unreleased distroseries, and conversely only allow uploads for
+        non-RELEASE pockets in released distroseries.
+        For instance, in edgy time :
+
+                warty         -> DENY
+                edgy          -> ALLOW
+                warty-updates -> ALLOW
+                edgy-security -> DENY
+
+        Note that FROZEN is not considered either 'stable' or 'unstable'
+        state.  Uploads to a FROZEN distroseries will end up in the
+        UNAPPROVED queue.
+
+        Return True if the upload is allowed and False if denied.
+        """
+
     def checkUploadToPocket(distroseries, pocket):
         """Check if an upload to a particular archive and pocket is possible.
 

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2012-06-15 10:21:34 +0000
+++ lib/lp/soyuz/model/archive.py	2012-06-19 10:11:30 +0000
@@ -67,6 +67,7 @@
     )
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.role import IHasOwner
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.registry.model.teammembership import TeamParticipation
@@ -1227,6 +1228,37 @@
             strict_component=True)
         return reason is None
 
+    def canModifySuite(self, distroseries, pocket):
+        """See `IArchive`."""
+        # PPA and PARTNER allow everything.
+        if self.allowUpdatesToReleasePocket():
+            return True
+
+        # Allow everything for distroseries in FROZEN state.
+        if distroseries.status == SeriesStatus.FROZEN:
+            return True
+
+        # Define stable/released states.
+        stable_states = (SeriesStatus.SUPPORTED,
+                         SeriesStatus.CURRENT)
+
+        # Deny uploads for RELEASE pocket in stable states.
+        if (pocket == PackagePublishingPocket.RELEASE and
+            distroseries.status in stable_states):
+            return False
+
+        # Deny uploads for post-release-only pockets in unstable states.
+        pre_release_pockets = (
+            PackagePublishingPocket.RELEASE,
+            PackagePublishingPocket.PROPOSED,
+            )
+        if (pocket not in pre_release_pockets and
+            distroseries.status not in stable_states):
+            return False
+
+        # Allow anything else.
+        return True
+
     def checkUploadToPocket(self, distroseries, pocket):
         """See `IArchive`."""
         if self.is_partner:
@@ -1247,7 +1279,7 @@
             # state.
             # XXX julian 2005-05-29 bug=117557:
             # This is a greasy hack until bug #117557 is fixed.
-            if not distroseries.canUploadToPocket(pocket):
+            if not self.canModifySuite(distroseries, pocket):
                 return CannotUploadToPocket(distroseries, pocket)
 
     def _checkUpload(self, person, distroseries, sourcepackagename, component,

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2012-02-13 04:20:08 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2012-06-19 10:11:30 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212
@@ -327,9 +327,8 @@
     def can_be_retried(self):
         """See `IBuild`."""
         # First check that the slave scanner would pick up the build record
-        # if we reset it.  PPA and Partner builds are always ok.
-        if (self.archive.purpose == ArchivePurpose.PRIMARY and
-            not self.distro_series.canUploadToPocket(self.pocket)):
+        # if we reset it.
+        if not self.archive.canModifySuite(self.distro_series, self.pocket):
             # The slave scanner would not pick this up, so it cannot be
             # re-tried.
             return False

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2012-05-21 07:34:15 +0000
+++ lib/lp/soyuz/model/publishing.py	2012-06-19 10:11:30 +0000
@@ -787,17 +787,13 @@
             raise AssertionError("changeOverride must be passed either a"
                                  " new component or new section")
 
-        # Retrieve current publishing info
-        current = self
-
         # Check there is a change to make
         if new_component is None:
-            new_component = current.component
+            new_component = self.component
         if new_section is None:
-            new_section = current.section
+            new_section = self.section
 
-        if (new_component == current.component and
-            new_section == current.section):
+        if new_component == self.component and new_section == self.section:
             return
 
         # See if the archive has changed by virtue of the component
@@ -805,18 +801,25 @@
         distribution = self.distroseries.distribution
         new_archive = distribution.getArchiveByComponent(
             new_component.name)
-        if new_archive != None and new_archive != current.archive:
+        if new_archive != None and new_archive != self.archive:
             raise ArchiveOverriderError(
                 "Overriding component to '%s' failed because it would "
                 "require a new archive." % new_component.name)
 
+        # Refuse to create new publication records that will never be
+        # published.
+        if not self.archive.canModifySuite(self.distroseries, self.pocket):
+            raise ArchiveOverriderError(
+                "Cannot change overrides in suite '%s'" %
+                self.distroseries.getSuite(self.pocket))
+
         return getUtility(IPublishingSet).newSourcePublication(
-            distroseries=current.distroseries,
-            sourcepackagerelease=current.sourcepackagerelease,
-            pocket=current.pocket,
+            distroseries=self.distroseries,
+            sourcepackagerelease=self.sourcepackagerelease,
+            pocket=self.pocket,
             component=new_component,
             section=new_section,
-            archive=current.archive)
+            archive=self.archive)
 
     def copyTo(self, distroseries, pocket, archive, override=None,
                create_dsd_job=True, creator=None, sponsor=None,
@@ -1202,20 +1205,17 @@
             raise AssertionError("changeOverride must be passed a new"
                                  "component, section and/or priority.")
 
-        # Retrieve current publishing info
-        current = self
-
         # Check there is a change to make
         if new_component is None:
-            new_component = current.component
+            new_component = self.component
         if new_section is None:
-            new_section = current.section
+            new_section = self.section
         if new_priority is None:
-            new_priority = current.priority
+            new_priority = self.priority
 
-        if (new_component == current.component and
-            new_section == current.section and
-            new_priority == current.priority):
+        if (new_component == self.component and
+            new_section == self.section and
+            new_priority == self.priority):
             return
 
         # See if the archive has changed by virtue of the component changing:
@@ -1227,6 +1227,13 @@
                 "Overriding component to '%s' failed because it would "
                 "require a new archive." % new_component.name)
 
+        # Refuse to create new publication records that will never be
+        # published.
+        if not self.archive.canModifySuite(self.distroseries, self.pocket):
+            raise ArchiveOverriderError(
+                "Cannot change overrides in suite '%s'" %
+                self.distroseries.getSuite(self.pocket))
+
         # Append the modified package publishing entry
         return BinaryPackagePublishingHistory(
             binarypackagename=self.binarypackagerelease.binarypackagename,
@@ -1234,11 +1241,11 @@
             distroarchseries=self.distroarchseries,
             status=PackagePublishingStatus.PENDING,
             datecreated=UTC_NOW,
-            pocket=current.pocket,
+            pocket=self.pocket,
             component=new_component,
             section=new_section,
             priority=new_priority,
-            archive=current.archive)
+            archive=self.archive)
 
     def copyTo(self, distroseries, pocket, archive):
         """See `BinaryPackagePublishingHistory`."""

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2012-05-25 15:31:50 +0000
+++ lib/lp/soyuz/model/queue.py	2012-06-19 10:11:30 +0000
@@ -277,11 +277,10 @@
         """See `IPackageUpload`."""
         # Explode if something wrong like warty/RELEASE pass through
         # NascentUpload/UploadPolicies checks for 'ubuntu' main distro.
-        if not self.archive.allowUpdatesToReleasePocket():
-            assert self.distroseries.canUploadToPocket(self.pocket), (
-                "Not permitted acceptance in the %s pocket in a "
-                "series in the '%s' state." % (
-                self.pocket.name, self.distroseries.status.name))
+        assert self.archive.canModifySuite(self.distroseries, self.pocket), (
+            "Not permitted acceptance in the %s pocket in a "
+            "series in the '%s' state." % (
+            self.pocket.name, self.distroseries.status.name))
 
         if self.status == PackageUploadStatus.ACCEPTED:
             raise QueueInconsistentStateError(
@@ -738,11 +737,10 @@
             "Can not publish a non-ACCEPTED queue record (%s)" % self.id)
         # Explode if something wrong like warty/RELEASE pass through
         # NascentUpload/UploadPolicies checks
-        if not self.archive.allowUpdatesToReleasePocket():
-            assert self.distroseries.canUploadToPocket(self.pocket), (
-                "Not permitted to publish to the %s pocket in a "
-                "series in the '%s' state." % (
-                self.pocket.name, self.distroseries.status.name))
+        assert self.archive.canModifySuite(self.distroseries, self.pocket), (
+            "Not permitted to publish to the %s pocket in a "
+            "series in the '%s' state." % (
+            self.pocket.name, self.distroseries.status.name))
 
         publishing_records = []
         # In realising an upload we first load all the sources into

=== modified file 'lib/lp/soyuz/scripts/tests/test_changeoverride.py'
--- lib/lp/soyuz/scripts/tests/test_changeoverride.py	2012-01-01 02:58:52 +0000
+++ lib/lp/soyuz/scripts/tests/test_changeoverride.py	2012-06-19 10:11:30 +0000
@@ -12,6 +12,7 @@
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.registry.interfaces.series import SeriesStatus
 from lp.services.librarian.interfaces import ILibraryFileAliasSet
 from lp.services.log.logger import BufferLogger
 from lp.soyuz.enums import PackagePublishingPriority
@@ -263,6 +264,7 @@
         This test checks the expected behaviour for each of them.
         """
         self._setupOverridePublishingContext()
+        self.warty.status = SeriesStatus.DEVELOPMENT
 
         changer = self.getChanger(
             component="universe", section="web", priority='extra')
@@ -364,6 +366,7 @@
         This behaviour is inherited from `SoyuzScript`.
         """
         self._setupOverridePublishingContext()
+        self.warty.status = SeriesStatus.DEVELOPMENT
         changer = self.getChanger(
             component="universe", section="web", priority='extra',
             package_version='0.9')
@@ -398,6 +401,7 @@
         This behaviour is inherited from `SoyuzScript`.
         """
         self._setupOverridePublishingContext()
+        self.warty.status = SeriesStatus.DEVELOPMENT
         changer = self.getChanger(
             component="universe", section="web", priority='extra',
             arch_tag='i386')

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2012-01-20 15:42:44 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2012-06-19 10:11:30 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test native publication workflow for Soyuz. """
@@ -24,6 +24,7 @@
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
 from lp.services.config import config
@@ -58,6 +59,7 @@
     BinaryPackagePublishingHistory,
     SourcePackagePublishingHistory,
     )
+from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
 from lp.testing import (
     StormStatementRecorder,
     TestCaseWithFactory,
@@ -1645,3 +1647,46 @@
         # archive too.
         self.assertContentEqual(
             [], getUtility(IPublishingSet).publishBinaries(**args))
+
+
+class TestChangeOverride(TestNativePublishingBase):
+    """Test that changing overrides works."""
+
+    def setUpOverride(self, status, pocket=PackagePublishingPocket.RELEASE,
+                      binary=False):
+        self.distroseries.status = status
+        if binary:
+            pub = self.getPubBinaries(pocket=pocket)[0]
+        else:
+            pub = self.getPubSource(pocket=pocket)
+        universe = getUtility(IComponentSet)["universe"]
+        return pub.changeOverride(new_component=universe)
+
+    def assertCanOverride(self, *args, **kwargs):
+        new_pub = self.setUpOverride(*args, **kwargs)
+        self.assertEqual("universe", new_pub.component.name)
+
+    def assertCannotOverride(self, *args, **kwargs):
+        self.assertRaises(
+            ArchiveOverriderError, self.setUpOverride, *args, **kwargs)
+
+    def test_changeOverride_forbids_stable_RELEASE(self):
+        # changeOverride is not allowed in the RELEASE pocket of a stable
+        # distroseries.
+        self.assertCannotOverride(SeriesStatus.CURRENT)
+        self.assertCannotOverride(SeriesStatus.CURRENT, binary=True)
+
+    def test_changeOverride_allows_development_RELEASE(self):
+        # changeOverride is allowed in the RELEASE pocket of a development
+        # distroseries.
+        self.assertCanOverride(SeriesStatus.DEVELOPMENT)
+        self.assertCanOverride(SeriesStatus.DEVELOPMENT, binary=True)
+
+    def test_changeOverride_allows_stable_PROPOSED(self):
+        # changeOverride is allowed in the PROPOSED pocket of a stable
+        # distroseries.
+        self.assertCanOverride(
+            SeriesStatus.CURRENT, pocket=PackagePublishingPocket.PROPOSED)
+        self.assertCanOverride(
+            SeriesStatus.CURRENT, pocket=PackagePublishingPocket.PROPOSED,
+            binary=True)