Merge lp:~mwhudson/launchpad/delete-package-branch-link-pocket-bug-387554 into lp:launchpad

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

Hi,

I think this branch fixes bug 387554, although I think the description of this bug is a bit wrong.

See https://bugs.edge.launchpad.net/launchpad-code/+bug/387554/comments/10 for more.

Cheers,
mwh

[Tim Penhey (thumper)]

You are good to land :-)

Thanks for tracking this down.

review: Approve

=== modified file 'lib/lp/code/model/seriessourcepackagebranch.py'
--- lib/lp/code/model/seriessourcepackagebranch.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/model/seriessourcepackagebranch.py	2009-08-04 02:54:15 +0000
@@ -131,4 +131,5 @@
             SeriesSourcePackageBranch,
             SeriesSourcePackageBranch.distroseries == distroseries.id,
             SeriesSourcePackageBranch.sourcepackagename ==
-            sourcepackagename.id).remove()
+            sourcepackagename.id,
+            SeriesSourcePackageBranch.pocket == pocket).remove()

=== modified file 'lib/lp/code/model/tests/test_seriessourcepackagebranch.py'
--- lib/lp/code/model/tests/test_seriessourcepackagebranch.py	2009-07-17 02:25:09 +0000
+++ lib/lp/code/model/tests/test_seriessourcepackagebranch.py	2009-08-04 02:54:41 +0000
@@ -22,7 +22,6 @@
     def setUp(self):
         TestCaseWithFactory.setUp(self)
         self.link_set = SeriesSourcePackageBranchSet()
-        self.distro = self.factory.makeDistribution()
 
     def makeLinkedPackageBranch(self, distribution, sourcepackagename):
         """Make a new package branch and make it official."""
@@ -50,19 +49,42 @@
         b2 = self.makeLinkedPackageBranch(distribution, sourcepackagename)
 
         # Make one more on same source package on different distro.
-        b3 = self.makeLinkedPackageBranch(None, sourcepackagename)
+        self.makeLinkedPackageBranch(None, sourcepackagename)
 
         # Make one more on different source package, same different distro.
-        b4 = self.makeLinkedPackageBranch(distribution, None)
+        self.makeLinkedPackageBranch(distribution, None)
 
         # And one more unrelated linked package branch.
-        b5 = self.makeLinkedPackageBranch(None, None)
+        self.makeLinkedPackageBranch(None, None)
 
         links = self.link_set.findForDistributionSourcePackage(
             distro_source_package)
         self.assertEqual(
             sorted([b1, b2]), sorted([link.branch for link in links]))
 
+    def test_delete(self):
+        # SeriesSourcePackageBranchSet.delete removes the link between a
+        # particular branch and a (distro_series, pocket, sourcepackagename)
+        # tupled.
+        distro_series = self.factory.makeDistroRelease()
+        sourcepackagename = self.factory.makeSourcePackageName()
+        sourcepackage = self.factory.makeSourcePackage(
+            sourcepackagename=sourcepackagename, distroseries=distro_series)
+        branch_release = self.factory.makePackageBranch(
+            distroseries=distro_series, sourcepackagename=sourcepackagename)
+        branch_updates = self.factory.makePackageBranch(
+            distroseries=distro_series, sourcepackagename=sourcepackagename)
+        self.link_set.new(
+            distro_series, PackagePublishingPocket.RELEASE, sourcepackagename,
+            branch_release, branch_release.owner)
+        self.link_set.new(
+            distro_series, PackagePublishingPocket.UPDATES, sourcepackagename,
+            branch_updates, branch_updates.owner)
+        self.link_set.delete(sourcepackage, PackagePublishingPocket.UPDATES)
+        links = self.link_set.findForSourcePackage(sourcepackage)
+        self.assertEqual(
+            sorted([branch_release]), sorted([link.branch for link in links]))
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)