Merge lp:~al-maisan/launchpad/buildd-testfix into lp:launchpad

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

testfix for revno: 10018 that broke buildd-slavescanner.txt

The following tests pass:

    bin/test -vv -t build

[Julian Edwards (julian-edwards)]

Looks good, thanks.

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-12-03 14:38:48 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-12-10 17:10:27 +0000
@@ -236,8 +236,8 @@
 
 Do the test execution:
 
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
     >>> buildergroup.updateBuild(bqItem3)
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -251,10 +251,6 @@
     >>> build.buildstate.title
     'Failed to build'
 
-Cleanup in preparation for the next test:
-
-    bqItem3.destroySelf()
-
 WAITING - DEPWAIT -> a required dependency is missing, again notice
 from builder, but Build.buildstate has the right state:
 
@@ -270,9 +266,9 @@
 
 Do the test execution:
 
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
     >>> buildergroup.updateBuild(bqItem4)
     CRITICAL:root:***** bob is MANUALDEPWAIT *****
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -288,10 +284,6 @@
     >>> build.buildstate.title
     'Dependency wait'
 
-Cleanup in preparation for the next test:
-
-    bqItem4.destroySelf()
-
 WAITING - CHROOTFAIL -> the Chroot for this distroseries is damage, nor
 builder, but right state stored in Build entry:
 
@@ -303,9 +295,9 @@
 
     >>> bqItem5.builder.setSlaveForTesting(
     ...     WaitingSlave('BuildStatus.CHROOTFAIL'))
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
     >>> buildergroup.updateBuild(bqItem5)
     CRITICAL:root:***** bob is CHROOTWAIT *****
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -319,10 +311,6 @@
     >>> build.buildstate.title
     'Chroot problem'
 
-Cleanup in preparation for the next test:
-
-    bqItem5.destroySelf()
-
 WAITING - BUILDERFAIL -> builder has failed by internal error, job is
 available for next build round:
 
@@ -451,8 +439,8 @@
 (precisely on binary upload time), the build will be considered
 FAILEDTOUPLOAD:
 
+    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
     >>> buildergroup.updateBuild(bqItem10)
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
     >>> build.builder is not None
     True
     >>> build.datebuilt is not None
@@ -509,10 +497,6 @@
 that can be sorted by modifying the execution order of procedures
 inside Buildergroup.buildStatus_OK method.
 
-Cleanup in preparation for the next test:
-
-     bqItem10.destroySelf()
-
 
 === Successfully collected and uploaded  (FULLYBUILT) ===
 
@@ -569,10 +553,6 @@
     >>> build.upload_log is None
     True
 
-Cleanup in preparation for the next test:
-
-    bqItem10.destroySelf()
-
 WAITING -> GIVENBACK - slave requested build record to be rescheduled.
 
     >>> bqItem11 = a_build.createBuildQueueEntry()
@@ -625,10 +605,17 @@
     ...
     AssertionError: i386 build of mozilla-firefox 0.9 in ubuntu warty RELEASE (2) can not be built for pocket RELEASE: illegal status
 
+We need 'a_builder' released (from 'bqItem12') so it can be associated with
+'bqItem10' below.
+
+    >>> bqItem12.builder = None
 
 The buildlog is collected and compressed locally using gzip algorithm,
 let's see how this method works:
 
+    >>> bqItem10 = getUtility(IBuildSet).getByBuildID(
+    ...     6).createBuildQueueEntry()
+    >>> setupBuildQueue(bqItem10, a_builder)
     >>> bqItem10.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
 
 Before collecting and processing the buildlog we will store the files
@@ -740,6 +727,9 @@
 Remove build upload results root
 
     >>> shutil.rmtree(config.builddmaster.root)
+    >>> bqItem10.destroySelf()
+    >>> setupBuildQueue(bqItem12, a_builder)
+
 
 == Setup chroots ==
 
@@ -1283,8 +1273,7 @@
 
     >>> cprov_archive.private = False
     >>> cprov_archive.require_virtualized = True
-    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
-    >>> for build_file in build.sourcepackagerelease.files:
+    >>> for build_file in a_build.sourcepackagerelease.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = False
     >>> mark_archive = getUtility(IPersonSet).getByName('mark').archive
 

=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py	2009-11-24 07:02:21 +0000
+++ lib/lp/soyuz/model/build.py	2009-12-10 17:10:27 +0000
@@ -1232,6 +1232,7 @@
         result_set = store.find(
             Build,
             BuildPackageJob.build == Build.id,
-            BuildPackageJob.job == queue_entry.job)
+            BuildPackageJob.job == BuildQueue.jobID,
+            BuildQueue.job == queue_entry.job)
 
         return result_set.one()