Merge lp:~al-maisan/launchpad/missing-permission into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Adds the missing getTitle() implementation to SourcePackageRecipeBuildJob.

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-16 05:54:16 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-18 00:48:16 +0000
@@ -68,7 +68,7 @@
         """An appropriate name for this job."""
 
     def getTitle():
-        """A string to identify and describe the job to users return None."""
+        """A string to identify and describe the job to users."""
 
     def jobStarted():
         """'Job started' life cycle event, handle as appropriate."""

=== modified file 'lib/lp/soyuz/model/sourcepackagerecipebuild.py'
--- lib/lp/soyuz/model/sourcepackagerecipebuild.py	2010-01-14 22:13:45 +0000
+++ lib/lp/soyuz/model/sourcepackagerecipebuild.py	2010-01-18 00:48:16 +0000
@@ -181,3 +181,10 @@
         store = IMasterStore(SourcePackageRecipeBuildJob)
         store.add(specific_job)
         return specific_job
+
+    def getTitle(self):
+        """See `IBuildFarmJob`."""
+        return "%s-%s-%s-recipe-build-job" % (
+            self.build.distroseries.displayname,
+            self.build.sourcepackagename.name,
+            self.build.archive.displayname)

=== modified file 'lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py	2010-01-14 03:21:36 +0000
+++ lib/lp/soyuz/tests/test_sourcepackagerecipebuild.py	2010-01-18 00:48:16 +0000
@@ -48,6 +48,17 @@
         job = spb.makeJob()
         self.assertProvides(job, ISourcePackageRecipeBuildJob)
 
+    def test_getTitle(self):
+        # A build farm job implements getTitle().
+        spb = self.makeSourcePackageRecipeBuild()
+        job = spb.makeJob()
+        # The title describes the job and should be recognizable by users.
+        # Hence the choice of the "ingredients" below.
+        title = "%s-%s-%s-recipe-build-job" % (
+            job.build.distroseries.displayname, job.build.sourcepackagename,
+            job.build.archive.displayname)
+        self.assertEqual(job.getTitle(), title)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)