Merge lp:~rockstar/launchpad/delete-recipes into lp:launchpad

[Paul Hummer]

This branch fixes bug #597376. Basically, in some cases, a SourcePackageRecipeBuild won't have a buildqueue entry. In the cases where it does, we'll need to delete the build queue entry and the job itself as part of deleting the build.

[Leonard Richardson (leonardr)]

review: Approve

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipebuild.py'
--- lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-06-02 15:59:47 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipebuild.py	2010-06-29 17:21:31 +0000
@@ -68,6 +68,9 @@
     def getFileByName(filename):
         """Return the file under +files with specified name."""
 
+    def destroySelf():
+        """Delete the build itself."""
+
 
 class ISourcePackageRecipeBuildSource(Interface):
     """A utility of this interface be used to create source package builds."""

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-06-12 13:34:11 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-06-29 17:21:31 +0000
@@ -219,12 +219,13 @@
 
     def destroySelf(self):
         store = Store.of(self)
-        job = self.buildqueue_record.job
-        store.remove(self.buildqueue_record)
-        store.find(
-            SourcePackageRecipeBuildJob,
-            SourcePackageRecipeBuildJob.build == self.id).remove()
-        store.remove(job)
+        if self.buildqueue_record is not None:
+            job = self.buildqueue_record.job
+            store.remove(self.buildqueue_record)
+            store.find(
+                SourcePackageRecipeBuildJob,
+                SourcePackageRecipeBuildJob.build == self.id).remove()
+            store.remove(job)
         store.remove(self)
 
     @classmethod

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-06-12 13:34:11 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-06-29 17:21:31 +0000
@@ -240,6 +240,12 @@
         removeSecurityProxy(recent_build).datecreated += a_second
         self.assertContentEqual([recent_build], get_recent())
 
+    def test_destroySelf(self):
+        # ISourcePackageRecipeBuild should make sure to remove jobs and build
+        # queue entries and then invalidate itself.
+        build = self.factory.makeSourcePackageRecipeBuild()
+        build.destroySelf()
+
 
 class TestAsBuildmaster(TestCaseWithFactory):