launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/GRAR into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/GRAR/+merge/97782

GRAR
-- 
https://code.launchpad.net/~wgrant/launchpad/GRAR/+merge/97782
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/GRAR into lp:launchpad.

=== modified file 'lib/lp/soyuz/browser/tests/test_builder.py'
--- lib/lp/soyuz/browser/tests/test_builder.py	2012-03-15 08:54:32 +0000
+++ lib/lp/soyuz/browser/tests/test_builder.py	2012-03-16 01:31:20 +0000
@@ -73,6 +73,11 @@
         # Create a non-buildfarm job to ensure that the BuildQueue and
         # Job IDs differ, detecting bug #919116.
         Job()
+        # And create BuildFarmJobs of the various types to throw IDs off
+        # eeven further, detecting more preloading issues.
+        self.factory.makeBinaryPackageBuild().queueBuild()
+        self.factory.makeSourcePackageRecipeBuildJob()
+        self.factory.makeTranslationTemplatesBuildJob()
 
     def test_builders_binary_package_build_query_count(self):
         def create_build():

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2012-01-02 11:21:14 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2012-03-16 01:31:20 +0000
@@ -69,7 +69,7 @@
         from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         return list(IStore(BinaryPackageBuild).find(
             BinaryPackageBuild,
-            [BuildPackageJob.id.is_in([job.id for job in jobs]),
+            [BuildPackageJob.job_id.is_in([job.id for job in jobs]),
              BuildPackageJob.build_id == BinaryPackageBuild.id]))
 
     def score(self):