Merge lp:~jtv/launchpad/bug-539499 into lp:launchpad

[Jeroen T. Vermeulen]

Fix broken slave build id in TranslationTemplatesBuildJob.

= Bug 539499 =

This is a quick interim fix.

TranslationTemplatesBuildJob.getName was meant to produce a slave build id based on branch name and BuildQueue id. TranslationTemplatesBuildBehavior.verifySlaveBuildID checked it for consistency.

Unfortunately getName accidentally used Job.id—a stupid mistake but not unthinkable given the complexity of the build-farm infrastructure. In fact I had been pushing to ditch the whole system of getName/verifySlaveBuildID specializations in favour of a single pair of consistent functions for this.

In case you're wondering where the test is: it's in lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py: test_verifySlaveBuildID_success. It's the perfect setup for detecting this problem. It failed to fail only because when that particular test ran, the Job.id happened to be the same as the BuildQueue.id. (As a test with a temporarily hacked-up extra check confirms).

Instead of hacking up a kludge to protect the test against failure to detect just this specific mistake, I propose I go in and clean up the entire getName/verifySlaveBuildID setup. We need a single pair of implementations using a hash of BuildQueue.id and a few other properties, as discussed on launchpad-dev. It's both safer and easier.

Jeroen

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-03-16 07:47:55 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-03-18 12:39:22 +0000
@@ -21,6 +21,7 @@
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, ISpecificBuildFarmJobClass)
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
 from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
@@ -62,7 +63,8 @@
 
     def getName(self):
         """See `IBuildFarmJob`."""
-        return '%s-%d' % (self.branch.name, self.job.id)
+        buildqueue = getUtility(IBuildQueueSet).getByJob(self.job)
+        return '%s-%d' % (self.branch.name, buildqueue.id)
 
     def getTitle(self):
         """See `IBuildFarmJob`."""