Merge lp:~al-maisan/launchpad/xx-select-job-506617 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

The branch at hand generalizes the selection of candidate jobs for idle
builders while enabling specific job classes to influence or refine the db
queries used in the process of selection.

Test to build:

    bin/test -vv -t build

No pertinent "make lint" issues.

[Jeroen T. Vermeulen (jtv)]

We went through this together, resulting in a few very small changes (mainly naming).

I'm approving this branch, but one issue remains open: the new interface, IBuildFarmCandidateJobSelection, plays a role that seems to fit well in the one I added in my branch lp:~jtv/launchpad/bug-500110 called ISpecificBuildFarmJobClass. Consider merging these two interfaces; it may also help prevent conflicts since your branch is going into db-devel whereas mine is for devel.

Jeroen

review: Approve

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-08 12:26:22 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-14 02:33:14 +0000
@@ -9,6 +9,7 @@
 
 __all__ = [
     'IBuildFarmJob',
+    'IBuildFarmCandidateJobSelection',
     'IBuildFarmJobDispatchEstimation',
     'BuildFarmJobType',
     ]
@@ -134,3 +135,41 @@
             the pending jobs of the appropriate type.
         """
 
+
+class IBuildFarmCandidateJobSelection(Interface):
+    """Operations for refining candidate job selection (optional).
+    
+    Job type classes that do *not* need to refine candidate job selection may
+    be derived from `BuildFarmJob` which provides a base implementation of
+    this interface.
+    """
+
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """Provide extra clauses that will refine the candidate job selection.
+
+        Return a 2-tuple with extra tables and clauses to be used to
+        narrow down the list of candidate jobs.
+
+        Example:
+            (('Build', 'BuildPackageJob'),
+             "BuildPackageJob.build = Build.id AND ..")
+
+        :param processor: the type of processor that the candidate jobs are
+            expected to run on.
+        :param virtualized: whether the candidate jobs are expected to run on
+            the `processor` natively or inside a virtual machine.
+        :return: an (extra_tables, extra_query) tuple where `extra_tables` is
+            a collection of tables that need to appear in the FROM clause of
+            the combined query for `extra_query` to work. 
+        """
+
+    def postprocessCandidate(job, logger):
+        """True if the candidate job is fine and should be dispatched
+        to a builder, False otherwise.
+        
+        :param job: The `BuildQueue` instance to be scrutinized.
+        :param logger: The logger to use.
+
+        :return: True if the candidate job should be dispatched
+            to a builder, False otherwise.
+        """

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-01-13 20:19:43 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-01-14 02:33:14 +0000
@@ -41,24 +41,23 @@
 # These dependencies on soyuz will be removed when getBuildRecords()
 # is moved, as well as when the generalisation of findBuildCandidate()
 # is completed.
-from lp.soyuz.model.buildqueue import BuildQueue
+from lp.soyuz.model.buildqueue import BuildQueue, specific_job_classes
 from lp.registry.interfaces.person import validate_public_person
-from lp.registry.interfaces.pocket import PackagePublishingPocket
 from canonical.launchpad.helpers import filenameToContentType
+from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.launchpad.webapp.interfaces import NotFoundError
-from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.buildmaster.interfaces.builder import (
     BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
     CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
-from lp.soyuz.interfaces.publishing import (
-    PackagePublishingStatus)
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from canonical.launchpad.webapp import urlappend
+from canonical.launchpad.webapp.interfaces import (
+    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.lazr.utils import safe_hasattr
 from canonical.librarian.utils import copy_and_close
 
@@ -409,99 +408,6 @@
             return False
         return True
 
-    # XXX cprov 20071116: It should become part of the public
-    # _findBuildCandidate once we start to detect superseded builds
-    # at build creation time.
-    def _findBinaryBuildCandidate(self):
-        """Return the highest priority build candidate for this builder.
-
-        Returns a pending IBuildQueue record queued for this builder
-        processorfamily with the highest lastscore or None if there
-        is no one available.
-        """
-        # If a private build does not yet have its source published then
-        # we temporarily skip it because we want to wait for the publisher
-        # to place the source in the archive, which is where builders
-        # download the source from in the case of private builds (because
-        # it's a secure location).
-        private_statuses = (
-            PackagePublishingStatus.PUBLISHED,
-            PackagePublishingStatus.SUPERSEDED,
-            PackagePublishingStatus.DELETED,
-            )
-        clauses = ["""
-            ((archive.private IS TRUE AND
-              EXISTS (
-                  SELECT SourcePackagePublishingHistory.id
-                  FROM SourcePackagePublishingHistory
-                  WHERE
-                      SourcePackagePublishingHistory.distroseries =
-                         DistroArchSeries.distroseries AND
-                      SourcePackagePublishingHistory.sourcepackagerelease =
-                         Build.sourcepackagerelease AND
-                      SourcePackagePublishingHistory.archive = Archive.id AND
-                      SourcePackagePublishingHistory.status IN %s))
-              OR
-              archive.private IS FALSE) AND
-            buildqueue.job = buildpackagejob.job AND
-            buildpackagejob.build = build.id AND
-            build.distroarchseries = distroarchseries.id AND
-            build.archive = archive.id AND
-            archive.enabled = TRUE AND
-            build.buildstate = %s AND
-            distroarchseries.processorfamily = %s AND
-            buildqueue.builder IS NULL
-        """ % sqlvalues(
-            private_statuses, BuildStatus.NEEDSBUILD, self.processor.family)]
-
-        clauseTables = [
-            'Build', 'BuildPackageJob', 'DistroArchSeries', 'Archive']
-
-        clauses.append("""
-            archive.require_virtualized = %s
-        """ % sqlvalues(self.virtualized))
-
-        # Ensure that if BUILDING builds exist for the same
-        # public ppa archive and architecture and another would not
-        # leave at least 20% of them free, then we don't consider
-        # another as a candidate.
-        #
-        # This clause selects the count of currently building builds on
-        # the arch in question, then adds one to that total before
-        # deriving a percentage of the total available builders on that
-        # arch.  It then makes sure that percentage is under 80.
-        #
-        # The extra clause is only used if the number of available
-        # builders is greater than one, or nothing would get dispatched
-        # at all.
-        num_arch_builders = Builder.selectBy(
-            processor=self.processor, manual=False, builderok=True).count()
-        if num_arch_builders > 1:
-            clauses.append("""
-                EXISTS (SELECT true
-                WHERE ((
-                    SELECT COUNT(build2.id)
-                    FROM Build build2, DistroArchSeries distroarchseries2
-                    WHERE
-                        build2.archive = build.archive AND
-                        archive.purpose = %s AND
-                        archive.private IS FALSE AND
-                        build2.distroarchseries = distroarchseries2.id AND
-                        distroarchseries2.processorfamily = %s AND
-                        build2.buildstate = %s) + 1::numeric)
-                    *100 / %s
-                    < 80)
-            """ % sqlvalues(
-                ArchivePurpose.PPA, self.processor.family,
-                BuildStatus.BUILDING, num_arch_builders))
-
-        query = " AND ".join(clauses)
-        candidate = BuildQueue.selectFirst(
-            query, clauseTables=clauseTables,
-            orderBy=['-buildqueue.lastscore', 'build.id'])
-
-        return candidate
-
     def _getSlaveScannerLogger(self):
         """Return the logger instance from buildd-slave-scanner.py."""
         # XXX cprov 20071120: Ideally the Launchpad logging system
@@ -515,52 +421,59 @@
         """Find a candidate job for dispatch to an idle buildd slave.
 
         The pending BuildQueue item with the highest score for this builder
-        ProcessorFamily or None if no candidate is available.
-
-        For public PPA builds, subsequent builds for a given ppa and
-        architecture will not be returned until the current build for
-        the ppa and architecture is finished.
-
-        :return: A binary build candidate job.
+        or None if no candidate is available.
+
+        :return: A candidate job.
         """
-
         logger = self._getSlaveScannerLogger()
-        candidate = self._findBinaryBuildCandidate()
-
-        # Mark build records targeted to old source versions as SUPERSEDED
-        # and build records target to SECURITY pocket as FAILEDTOBUILD.
-        # Builds in those situation should not be built because they will
-        # be wasting build-time, the former case already has a newer source
-        # and the latter could not be built in DAK.
-        build_set = getUtility(IBuildSet)
-        while candidate is not None:
-            build = build_set.getByQueueEntry(candidate)
-            if build.pocket == PackagePublishingPocket.SECURITY:
-                # We never build anything in the security pocket.
-                logger.debug(
-                    "Build %s FAILEDTOBUILD, queue item %s REMOVED"
-                    % (build.id, candidate.id))
-                build.buildstate = BuildStatus.FAILEDTOBUILD
-                candidate.destroySelf()
-                candidate = self._findBinaryBuildCandidate()
-                continue
-
-            publication = build.current_source_publication
-
-            if publication is None:
-                # The build should be superseded if it no longer has a
-                # current publishing record.
-                logger.debug(
-                    "Build %s SUPERSEDED, queue item %s REMOVED"
-                    % (build.id, candidate.id))
-                build.buildstate = BuildStatus.SUPERSEDED
-                candidate.destroySelf()
-                candidate = self._findBinaryBuildCandidate()
-                continue
-
-            return candidate
-
-        # No candidate was found.
+        candidate = None
+
+        query_tables = set(('buildqueue', 'job'))
+        general_query = """
+            SELECT buildqueue.id FROM %%s
+            WHERE
+                buildqueue.job = job.id
+                AND job.status = %s
+                AND (
+                    (buildqueue.processor = %s
+                     AND buildqueue.virtualized = %s)
+                   OR
+                    (buildqueue.processor IS NULL
+                     AND buildqueue.virtualized IS NULL))
+                AND buildqueue.builder IS NULL
+        """ % sqlvalues(JobStatus.WAITING, self.processor, self.virtualized)
+        order_clause = " ORDER BY buildqueue.lastscore DESC, buildqueue.id"
+
+        extra_tables = set()
+        extra_queries = []
+        job_classes = specific_job_classes()
+        for job_class in job_classes.values():
+            tables, query = job_class.addCandidateSelectionCriteria(
+                self.processor, self.virtualized)
+            if query == '':
+                # This job class does not need to refine candidate jobs
+                # further.
+                continue
+
+            # Table names are case-insensitive in SQL. All table names are in
+            # lower case in order to avoid duplicates in the FROM clause.
+            query_tables = query_tables.union(
+                set(table.lower() for table in tables))
+            extra_queries.append(query)
+        general_query = general_query % ', '.join(query_tables)
+        query = ' AND '.join([general_query] + extra_queries) + order_clause
+
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        candidate_jobs = store.execute(query).get_all()
+
+        for (candidate_id,) in candidate_jobs:
+            candidate = getUtility(IBuildQueueSet).get(candidate_id)
+            job_class = job_classes[candidate.job_type]
+            candidate_approved = job_class.postprocessCandidate(
+                candidate, logger)
+            if candidate_approved:
+                return candidate
+
         return None
 
     def _dispatchBuildCandidate(self, candidate):

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2009-12-24 13:18:16 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-01-14 02:33:14 +0000
@@ -5,14 +5,16 @@
 __all__ = ['BuildFarmJob']
 
 
-from zope.interface import implements
+from zope.interface import classProvides, implements
 
-from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.buildmaster.interfaces.buildfarmjob import (
+    IBuildFarmJob, IBuildFarmCandidateJobSelection)
 
 
 class BuildFarmJob:
     """Mix-in class for `IBuildFarmJob` implementations."""
     implements(IBuildFarmJob)
+    classProvides(IBuildFarmCandidateJobSelection)
 
     def score(self):
         """See `IBuildFarmJob`."""
@@ -48,3 +50,12 @@
         """See `IBuildFarmJob`."""
         return None
 
+    @staticmethod
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """See `IBuildFarmCandidateJobSelection`."""
+        return ([], '')
+
+    @staticmethod
+    def postprocessCandidate(job, logger):
+        """See `IBuildFarmCandidateJobSelection`."""
+        return True

=== modified file 'lib/lp/soyuz/interfaces/buildpackagejob.py'
--- lib/lp/soyuz/interfaces/buildpackagejob.py	2009-11-13 20:39:36 +0000
+++ lib/lp/soyuz/interfaces/buildpackagejob.py	2010-01-14 02:33:14 +0000
@@ -11,16 +11,16 @@
     'IBuildPackageJob',
     ]
 
+from zope.interface import Interface
 from zope.schema import Int
 
 from canonical.launchpad import _
 from lazr.restful.fields import Reference
-from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.services.job.interfaces.job import IJob
 from lp.soyuz.interfaces.build import IBuild
 
 
-class IBuildPackageJob(IBuildFarmJob):
+class IBuildPackageJob(Interface):
     """A read-only interface for build package jobs."""
     id = Int(title=_('ID'), required=True, readonly=True)
 

=== modified file 'lib/lp/soyuz/interfaces/buildqueue.py'
--- lib/lp/soyuz/interfaces/buildqueue.py	2010-01-13 20:36:19 +0000
+++ lib/lp/soyuz/interfaces/buildqueue.py	2010-01-14 02:33:14 +0000
@@ -68,10 +68,6 @@
         title=_('The builder behavior required to run this job.'),
         required=False, readonly=True)
 
-    specific_job_classes = Field(
-        title=_('Job classes that may run on the build farm.'),
-        required=True, readonly=True)
-
     estimated_duration = Timedelta(
         title=_("Estimated Job Duration"), required=True,
         description=_("Estimated job duration interval."))

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-01-12 10:44:24 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-01-14 02:33:14 +0000
@@ -11,21 +11,24 @@
 from storm.locals import Int, Reference, Storm
 
 from zope.interface import classProvides, implements
+from zope.component import getUtility
 
 from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import sqlvalues
 
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, IBuildFarmJobDispatchEstimation)
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
-
-
-class BuildPackageJob(Storm):
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+
+
+class BuildPackageJob(Storm, BuildFarmJob):
     """See `IBuildPackageJob`."""
     implements(IBuildPackageJob)
     classProvides(IBuildFarmJobDispatchEstimation)
@@ -209,3 +212,106 @@
     def virtualized(self):
         """See `IBuildFarmJob`."""
         return self.build.is_virtualized
+
+    @staticmethod
+    def addCandidateSelectionCriteria(processor, virtualized):
+        """See `IBuildFarmCandidateJobSelection`."""
+        # Avoiding circular import.
+        from lp.buildmaster.model.builder import Builder
+
+        private_statuses = (
+            PackagePublishingStatus.PUBLISHED,
+            PackagePublishingStatus.SUPERSEDED,
+            PackagePublishingStatus.DELETED,
+            )
+        extra_tables = [
+            'Archive', 'Build', 'BuildPackageJob', 'DistroArchSeries']
+        extra_clauses = """
+            BuildPackageJob.job = Job.id AND 
+            BuildPackageJob.build = Build.id AND 
+            Build.distroarchseries = DistroArchSeries.id AND
+            Build.archive = Archive.id AND
+            ((Archive.private IS TRUE AND
+              EXISTS (
+                  SELECT SourcePackagePublishingHistory.id
+                  FROM SourcePackagePublishingHistory
+                  WHERE
+                      SourcePackagePublishingHistory.distroseries =
+                         DistroArchSeries.distroseries AND
+                      SourcePackagePublishingHistory.sourcepackagerelease =
+                         Build.sourcepackagerelease AND
+                      SourcePackagePublishingHistory.archive = Archive.id AND
+                      SourcePackagePublishingHistory.status IN %s))
+              OR
+              archive.private IS FALSE) AND
+            build.buildstate = %s
+        """ % sqlvalues(private_statuses, BuildStatus.NEEDSBUILD)
+
+        # Ensure that if BUILDING builds exist for the same
+        # public ppa archive and architecture and another would not
+        # leave at least 20% of them free, then we don't consider
+        # another as a candidate.
+        #
+        # This clause selects the count of currently building builds on
+        # the arch in question, then adds one to that total before
+        # deriving a percentage of the total available builders on that
+        # arch.  It then makes sure that percentage is under 80.
+        #
+        # The extra clause is only used if the number of available
+        # builders is greater than one, or nothing would get dispatched
+        # at all.
+        num_arch_builders = Builder.selectBy(
+            processor=processor, manual=False, builderok=True).count()
+        if num_arch_builders > 1:
+            extra_clauses += """
+                AND EXISTS (SELECT true
+                WHERE ((
+                    SELECT COUNT(build2.id)
+                    FROM Build build2, DistroArchSeries distroarchseries2
+                    WHERE
+                        build2.archive = build.archive AND
+                        archive.purpose = %s AND
+                        archive.private IS FALSE AND
+                        build2.distroarchseries = distroarchseries2.id AND
+                        distroarchseries2.processorfamily = %s AND
+                        build2.buildstate = %s) + 1::numeric)
+                    *100 / %s
+                    < 80)
+            """ % sqlvalues(
+                ArchivePurpose.PPA, processor.family,
+                BuildStatus.BUILDING, num_arch_builders)
+
+        return(extra_tables, extra_clauses)
+
+    @staticmethod
+    def postprocessCandidate(job, logger):
+        """See `IBuildFarmCandidateJobSelection`."""
+        # Mark build records targeted to old source versions as SUPERSEDED
+        # and build records target to SECURITY pocket as FAILEDTOBUILD.
+        # Builds in those situation should not be built because they will
+        # be wasting build-time, the former case already has a newer source
+        # and the latter could not be built in DAK.
+        build_set = getUtility(IBuildSet)
+
+        build = build_set.getByQueueEntry(job)
+        if build.pocket == PackagePublishingPocket.SECURITY:
+            # We never build anything in the security pocket.
+            logger.debug(
+                "Build %s FAILEDTOBUILD, queue item %s REMOVED"
+                % (build.id, job.id))
+            build.buildstate = BuildStatus.FAILEDTOBUILD
+            job.destroySelf()
+            return False
+
+        publication = build.current_source_publication
+        if publication is None:
+            # The build should be superseded if it no longer has a
+            # current publishing record.
+            logger.debug(
+                "Build %s SUPERSEDED, queue item %s REMOVED"
+                % (build.id, job.id))
+            build.buildstate = BuildStatus.SUPERSEDED
+            job.destroySelf()
+            return False
+
+        return True

=== modified file 'lib/lp/soyuz/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py	2010-01-13 11:11:40 +0000
+++ lib/lp/soyuz/model/buildqueue.py	2010-01-14 02:33:14 +0000
@@ -7,7 +7,8 @@
 
 __all__ = [
     'BuildQueue',
-    'BuildQueueSet'
+    'BuildQueueSet',
+    'specific_job_classes',
     ]
 
 import logging
@@ -38,6 +39,22 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
 
+def specific_job_classes():
+    """Job classes that may run on the build farm."""
+    job_classes = dict()
+    # Get all components that implement the `IBuildFarmJob` interface.
+    components = getSiteManager()
+    implementations = sorted(components.getUtilitiesFor(IBuildFarmJob))
+    # The above yields a collection of 2-tuples where the first element
+    # is the name of the `BuildFarmJobType` enum and the second element
+    # is the implementing class respectively.
+    for job_enum_name, job_class in implementations:
+        job_enum = getattr(BuildFarmJobType, job_enum_name)
+        job_classes[job_enum] = job_class
+
+    return job_classes
+
+
 class BuildQueue(SQLBase):
     implements(IBuildQueue)
     _table = "BuildQueue"
@@ -62,25 +79,9 @@
         return IBuildFarmJobBehavior(self.specific_job)
 
     @property
-    def specific_job_classes(self):
-        """See `IBuildQueue`."""
-        job_classes = dict()
-        # Get all components that implement the `IBuildFarmJob` interface.
-        components = getSiteManager()
-        implementations = sorted(components.getUtilitiesFor(IBuildFarmJob))
-        # The above yields a collection of 2-tuples where the first element
-        # is the name of the `BuildFarmJobType` enum and the second element
-        # is the implementing class respectively.
-        for job_enum_name, job_class in implementations:
-            job_enum = getattr(BuildFarmJobType, job_enum_name)
-            job_classes[job_enum] = job_class
-
-        return job_classes
-
-    @property
     def specific_job(self):
         """See `IBuildQueue`."""
-        specific_class = self.specific_job_classes[self.job_type]
+        specific_class = specific_job_classes()[self.job_type]
         store = Store.of(self)
         result_set = store.find(
             specific_class, specific_class.job == self.job)

=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-01-11 23:43:59 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-01-14 02:33:14 +0000
@@ -12,11 +12,11 @@
 from canonical.launchpad.webapp.testing import verifyObject
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjob import (
     IBuildFarmJobDispatchEstimation)
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus
-from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
@@ -24,6 +24,7 @@
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
 
+
 def find_job(test, name, processor='386'):
     """Find build and queue instance for the given source and processor."""
     for build in test.builds:

=== modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
--- lib/lp/soyuz/tests/test_buildqueue.py	2010-01-13 11:11:40 +0000
+++ lib/lp/soyuz/tests/test_buildqueue.py	2010-01-14 02:33:14 +0000
@@ -13,10 +13,12 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.model.builder import specific_job_classes
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus
-from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build
@@ -705,7 +707,7 @@
 
         # The class registered for 'PACKAGEBUILD' is `BuildPackageJob`.
         self.assertEqual(
-            bq.specific_job_classes[BuildFarmJobType.PACKAGEBUILD],
+            specific_job_classes()[BuildFarmJobType.PACKAGEBUILD],
             BuildPackageJob,
             "The class registered for 'PACKAGEBUILD' is `BuildPackageJob`")
 
@@ -721,14 +723,14 @@
         """Other job type classes are picked up as well."""
         from zope import component
         from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
-        class FakeBranchBuild:
+        class FakeBranchBuild(BuildFarmJob):
             pass
 
         _build, bq = find_job(self, 'gedit')
         # First make sure that we don't have a job type class registered for
         # 'BRANCHBUILD' yet.
         self.assertTrue(
-            bq.specific_job_classes.get(BuildFarmJobType.BRANCHBUILD) is None)
+            specific_job_classes().get(BuildFarmJobType.BRANCHBUILD) is None)
 
         # Pretend that our `FakeBranchBuild` class implements the
         # `IBuildFarmJob` interface.
@@ -738,7 +740,7 @@
         # Now we should see the `FakeBranchBuild` class "registered" in the
         # `specific_job_classes` dictionary under the 'BRANCHBUILD' key.
         self.assertEqual(
-            bq.specific_job_classes[BuildFarmJobType.BRANCHBUILD],
+            specific_job_classes()[BuildFarmJobType.BRANCHBUILD],
             FakeBranchBuild)