Merge lp:~jml/launchpad/behavior-refactor into lp:launchpad

[Jonathan Lange]

[Jonathan Lange (jml)]

Beef up the BuilderSlave object a bit, and remove useless parameters from the IBuildFarmJobBehavior interface, change the IBuilder interface so that it no longer delegates to IBuildFarmJobBehaviour.

[Michael Nelson (michael.nelson)]

Thanks for cleaning up and making it a lot easier to read Jonathan.

You're fixing up the incorrect docstring, which was the only issue I saw.

Cheers.

review: Approve (code)

=== modified file 'lib/canonical/cachedproperty.py'
--- lib/canonical/cachedproperty.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/cachedproperty.py	2010-01-13 02:56:16 +0000
@@ -7,6 +7,7 @@
 
 __metaclass__ = type
 
+# XXX: JonathanLange 2010-01-11 bug=505731: Move this to lp.services.
 
 def cachedproperty(attrname_or_fn):
     """A decorator for methods that makes them properties with their return

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/interfaces/buildfarmjobbehavior.py	2009-12-24 06:44:57 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjobbehavior.py	2010-01-13 02:56:16 +0000
@@ -30,7 +30,7 @@
     def setBuilder(builder):
         """Sets the associated builder reference for this instance."""
 
-    def logStartBuild(build_queue_item, logger):
+    def logStartBuild(logger):
         """Log the start of a specific build queue item.
 
         The form of the log message will vary depending on the type of build.
@@ -38,21 +38,20 @@
         :param logger: A logger to be used to log diagnostic information.
         """
 
-    def dispatchBuildToSlave(build_queue_item, logger):
+    def dispatchBuildToSlave(build_queue_item_id, logger):
         """Dispatch a specific build to the slave.
 
-        :param build_queue_item: The `BuildQueueItem` that will be built.
-        :logger: A logger to be used to log diagnostic information.
+        :param build_queue_item_id: An identifier for the build queue item.
+        :param logger: A logger to be used to log diagnostic information.
         """
 
-    def verifyBuildRequest(build_queue_item, logger):
+    def verifyBuildRequest(logger):
         """Carry out any pre-build checks.
 
-        :param build_queue_item: The `BuildQueueItem` that is to be built.
-        :logger: A logger to be used to log diagnostic information.
+        :param logger: A logger to be used to log diagnostic information.
         """
 
-    def slaveStatus(self, raw_slave_status):
+    def slaveStatus(raw_slave_status):
         """Return a dict of custom slave status values for this behavior.
 
         :param raw_slave_status: The value returned by the build slave's

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-01-11 21:54:24 +0000
+++ lib/lp/buildmaster/manager.py	2010-01-13 02:56:16 +0000
@@ -7,7 +7,7 @@
 
 __all__ = [
     'BaseDispatchResult',
-    'BuilddManager'
+    'BuilddManager',
     'FailDispatchResult',
     'RecordingSlave',
     'ResetDispatchResult',
@@ -70,6 +70,7 @@
     major slave-scanner throughput issue while avoiding large-scale changes to
     its code base.
     """
+
     def __init__(self, name, url, vm_host):
         self.name = name
         self.url = url
@@ -81,6 +82,11 @@
     def __repr__(self):
         return '<%s:%s>' % (self.name, self.url)
 
+    def cacheFile(self, logger, libraryfilealias):
+        """Cache the file on the server."""
+        self.ensurepresent(
+            libraryfilealias.content.sha1, libraryfilealias.http_url, '', '')
+
     def ensurepresent(self, *args):
         """Download files needed for the build."""
         self.calls.append(('ensurepresent', args))

=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/model/buildfarmjobbehavior.py	2009-12-04 12:49:25 +0000
+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py	2010-01-13 02:56:16 +0000
@@ -33,7 +33,7 @@
         """The builder should be set once and not changed."""
         self._builder = builder
 
-    def verifyBuildRequest(self, build_queue_item, logger):
+    def verifyBuildRequest(self, logger):
         """The default behavior is a no-op."""
         pass
 
@@ -55,12 +55,12 @@
         """
         super(IdleBuildBehavior, self).__init__(None)
 
-    def logStartBuild(self, build_queue_item, logger):
+    def logStartBuild(self, logger):
         """See `IBuildFarmJobBehavior`."""
         raise BuildBehaviorMismatch(
             "Builder was idle when asked to log the start of a build.")
 
-    def dispatchBuildToSlave(self, build_queue_item, logger):
+    def dispatchBuildToSlave(self, build_queue_item_id, logger):
         """See `IBuildFarmJobBehavior`."""
         raise BuildBehaviorMismatch(
             "Builder was idle when asked to dispatch a build to the slave.")

=== modified file 'lib/lp/buildmaster/tests/buildfarmjobbehavior.txt'
--- lib/lp/buildmaster/tests/buildfarmjobbehavior.txt	2009-12-04 12:49:25 +0000
+++ lib/lp/buildmaster/tests/buildfarmjobbehavior.txt	2010-01-13 02:56:16 +0000
@@ -31,7 +31,7 @@
     ...     """A custom build behavior for building blah."""
     ...     implements(IBuildFarmJobBehavior)
     ...
-    ...     def dispatchBuildToSlave(self, build_queue_item, logger):
+    ...     def dispatchBuildToSlave(self, build_queue_item_id, logger):
     ...         print "Did something special to dispatch MySpecialBuild."
     ...
     ...     @property
@@ -127,7 +127,7 @@
 idle, such as making a call to log the start of a build, will raise an
 appropriate exception.
 
-    >>> bob.logStartBuild(None, None)
+    >>> bob.current_build_behavior.logStartBuild(None)
     Traceback (most recent call last):
      ...
     BuildBehaviorMismatch: Builder was idle when asked to log the start of a

=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2010-01-10 23:08:55 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-01-13 02:56:16 +0000
@@ -121,6 +121,8 @@
     False
     >>> bob_builder.is_available
     True
+    >>> bob_builder.builderok
+    True
 
 
 == Builder dispatching API ==
@@ -167,6 +169,7 @@
     >>> dispatched_job = bob_builder.findAndStartJob()
     >>> job == dispatched_job
     True
+    >>> bob_builder.builderok = True
 
     >>> flush_database_updates()
 

=== modified file 'lib/lp/soyuz/interfaces/builder.py'
--- lib/lp/soyuz/interfaces/builder.py	2010-01-10 23:59:31 +0000
+++ lib/lp/soyuz/interfaces/builder.py	2010-01-13 02:56:16 +0000
@@ -12,6 +12,7 @@
     'BuildJobMismatch',
     'BuildSlaveFailure',
     'CannotBuild',
+    'CannotFetchFile',
     'CannotResumeHost',
     'IBuilder',
     'IBuilderSet',
@@ -34,6 +35,15 @@
     """The class of errors raised by the buildd classes"""
 
 
+class CannotFetchFile(BuildDaemonError):
+    """The slave was unable to fetch the file."""
+
+    def __init__(self, file_url, error_information):
+        super(CannotFetchFile, self).__init__()
+        self.file_url = file_url
+        self.error_information = error_information
+
+
 class ProtocolVersionMismatch(BuildDaemonError):
     """The build slave had a protocol version. This is a serious error."""
 
@@ -59,7 +69,7 @@
     """The build slave has suffered an error and cannot be used."""
 
 
-class IBuilder(IHasOwner, IBuildFarmJobBehavior):
+class IBuilder(IHasOwner):
     """Build-slave information and state.
 
     Builder instance represents a single builder slave machine within the
@@ -144,16 +154,6 @@
         title=u"The current behavior of the builder for the current job.",
         required=False)
 
-    def cacheFileOnSlave(logger, libraryfilealias):
-        """Ask the slave to cache a librarian file to its local disk.
-
-        This is used in preparation for a build.
-
-        :param logger: A logger used for providing debug information.
-        :param libraryfilealias: A library file alias representing the needed
-            file.
-        """
-
     def checkCanBuildForDistroArchSeries(distro_arch_series):
         """Check that the slave can compile for the given distro_arch_release.
 

=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehavior.py'
--- lib/lp/soyuz/model/binarypackagebuildbehavior.py	2009-12-03 14:38:48 +0000
+++ lib/lp/soyuz/model/binarypackagebuildbehavior.py	2010-01-13 02:56:16 +0000
@@ -11,9 +11,7 @@
     'BinaryPackageBuildBehavior',
     ]
 
-import socket
-import xmlrpclib
-
+from canonical.cachedproperty import cachedproperty
 from canonical.launchpad.webapp import urlappend
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior)
@@ -23,10 +21,8 @@
 from lp.soyuz.adapters.archivedependencies import (
     get_primary_current_component, get_sources_list_for_building)
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import IBuildSet
-from lp.soyuz.interfaces.builder import BuildSlaveFailure, CannotBuild
+from lp.soyuz.interfaces.builder import CannotBuild
 
-from zope.component import getUtility
 from zope.interface import implements
 
 
@@ -35,91 +31,77 @@
 
     implements(IBuildFarmJobBehavior)
 
-    def logStartBuild(self, build_queue_item, logger):
+    @cachedproperty
+    def build(self):
+        return self.buildfarmjob.build
+
+    def logStartBuild(self, logger):
         """See `IBuildFarmJobBehavior`."""
-        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
-        spr = build.sourcepackagerelease
-
+        spr = self.build.sourcepackagerelease
         logger.info("startBuild(%s, %s, %s, %s)", self._builder.url,
-                    spr.name, spr.version, build.pocket.title)
+                    spr.name, spr.version, self.build.pocket.title)
 
     @property
     def status(self):
         """See `IBuildFarmJobBehavior`."""
-        build = getUtility(IBuildSet).getByQueueEntry(
-            self._builder.currentjob)
-        msg = 'Building %s' % build.title
-        archive = build.archive
+        msg = 'Building %s' % self.build.title
+        archive = self.build.archive
         if not archive.owner.private and (archive.is_ppa or archive.is_copy):
             return '%s [%s/%s]' % (msg, archive.owner.name, archive.name)
         else:
             return msg
 
-    def dispatchBuildToSlave(self, build_queue_item, logger):
+    def dispatchBuildToSlave(self, build_queue_id, logger):
         """See `IBuildFarmJobBehavior`."""
 
         # Start the binary package build on the slave builder. First
         # we send the chroot.
-        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
-        chroot = build.distroarchseries.getChroot()
-        self._builder.cacheFileOnSlave(logger, chroot)
+        chroot = self.build.distroarchseries.getChroot()
+        self._builder.slave.cacheFile(logger, chroot)
 
         # Build filemap structure with the files required in this build
         # and send them to the slave.
         # If the build is private we tell the slave to get the files from the
         # archive instead of the librarian because the slaves cannot
         # access the restricted librarian.
-        private = build.archive.private
+        private = self.build.archive.private
         if private:
-            self._cachePrivateSourceOnSlave(build_queue_item, logger)
+            self._cachePrivateSourceOnSlave(logger)
         filemap = {}
-        for source_file in build.sourcepackagerelease.files:
+        for source_file in self.build.sourcepackagerelease.files:
             lfa = source_file.libraryfile
             filemap[lfa.filename] = lfa.content.sha1
             if not private:
-                self._builder.cacheFileOnSlave(
-                    logger, source_file.libraryfile)
+                self._builder.slave.cacheFile(logger, source_file.libraryfile)
 
         # Generate a string which can be used to cross-check when obtaining
         # results so we know we are referring to the right database object in
         # subsequent runs.
-        buildid = "%s-%s" % (build.id, build_queue_item.id)
+        buildid = "%s-%s" % (self.build.id, build_queue_id)
         chroot_sha1 = chroot.content.sha1
         logger.debug(
             "Initiating build %s on %s" % (buildid, self._builder.url))
 
-        try:
-            args = self._extraBuildArgs(build)
-            status, info = self._builder.slave.build(
-                buildid, "debian", chroot_sha1, filemap, args)
-            message = """%s (%s):
-            ***** RESULT *****
-            %s
-            %s
-            %s: %s
-            ******************
-            """ % (
-                self._builder.name,
-                self._builder.url,
-                filemap,
-                args,
-                status,
-                info,
-                )
-            logger.info(message)
-        except xmlrpclib.Fault, info:
-            # Mark builder as 'failed'.
-            logger.debug(
-                "Disabling builder: %s" % self._builder.url, exc_info=1)
-            self._builder.failbuilder(
-                "Exception (%s) when setting up to new job" % info)
-            raise BuildSlaveFailure
-        except socket.error, info:
-            error_message = "Exception (%s) when setting up new job" % info
-            self._builder.handleTimeout(logger, error_message)
-            raise BuildSlaveFailure
+        args = self._extraBuildArgs(self.build)
+        status, info = self._builder.slave.build(
+            buildid, "debian", chroot_sha1, filemap, args)
+        message = """%s (%s):
+        ***** RESULT *****
+        %s
+        %s
+        %s: %s
+        ******************
+        """ % (
+            self._builder.name,
+            self._builder.url,
+            filemap,
+            args,
+            status,
+            info,
+            )
+        logger.info(message)
 
-    def verifyBuildRequest(self, build_queue_item, logger):
+    def verifyBuildRequest(self, logger):
         """Assert some pre-build checks.
 
         The build request is checked:
@@ -128,7 +110,7 @@
          * Ensure that the build pocket allows builds for the current
            distroseries state.
         """
-        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
+        build = self.build
         assert not (not self._builder.virtualized and build.is_virtualized), (
             "Attempt to build non-virtual item on a virtual builder.")
 
@@ -149,8 +131,7 @@
                 "Missing CHROOT for %s/%s/%s" % (
                     build.distroseries.distribution.name,
                     build.distroseries.name,
-                    build.distroarchseries.architecturetag)
-                )
+                    build.distroarchseries.architecturetag))
 
         # The main distribution has policies to prevent uploads to some
         # pockets (e.g. security) during different parts of the distribution
@@ -196,16 +177,9 @@
 
         return extra_info
 
-    def _cachePrivateSourceOnSlave(self, build_queue_item, logger):
+    def _cachePrivateSourceOnSlave(self, logger):
         """Ask the slave to download source files for a private build.
 
-        The slave will cache the files for the source in build_queue_item
-        to its local disk in preparation for a private build.  Private builds
-        will always take the source files from the archive rather than the
-        librarian since the archive has more granular access to each
-        archive's files.
-
-        :param build_queue_item: The `IBuildQueue` being built.
         :param logger: A logger used for providing debug information.
         """
         # The URL to the file in the archive consists of these parts:
@@ -215,21 +189,20 @@
         # Avoid circular imports.
         from lp.soyuz.model.publishing import makePoolPath
 
-        build = getUtility(IBuildSet).getByQueueEntry(build_queue_item)
-        archive = build.archive
+        archive = self.build.archive
         archive_url = archive.archive_url
-        component_name = build.current_component.name
-        for source_file in build.sourcepackagerelease.files:
+        component_name = self.build.current_component.name
+        for source_file in self.build.sourcepackagerelease.files:
             file_name = source_file.libraryfile.filename
             sha1 = source_file.libraryfile.content.sha1
-            source_name = build.sourcepackagerelease.sourcepackagename.name
-            poolpath = makePoolPath(source_name, component_name)
+            spn = self.build.sourcepackagerelease.sourcepackagename
+            poolpath = makePoolPath(spn.name, component_name)
             url = urlappend(archive_url, poolpath)
             url = urlappend(url, file_name)
             logger.debug("Asking builder on %s to ensure it has file %s "
                          "(%s, %s)" % (
                             self._builder.url, file_name, url, sha1))
-            self._builder._sendFileToSlave(
+            self._builder.slave._sendFileToSlave(
                 url, sha1, "buildd", archive.buildd_secret)
 
     def _extraBuildArgs(self, build):

=== modified file 'lib/lp/soyuz/model/builder.py'
--- lib/lp/soyuz/model/builder.py	2010-01-11 03:03:19 +0000
+++ lib/lp/soyuz/model/builder.py	2010-01-13 02:56:16 +0000
@@ -20,8 +20,6 @@
 import urllib2
 import xmlrpclib
 
-from lazr.delegates import delegates
-
 from zope.interface import implements
 from zope.component import getUtility
 
@@ -34,7 +32,7 @@
 from canonical.config import config
 from canonical.buildd.slave import BuilderStatus
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
-    BuildBehaviorMismatch, IBuildFarmJobBehavior)
+    BuildBehaviorMismatch)
 from lp.buildmaster.master import BuilddMaster
 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
 from canonical.database.sqlbase import SQLBase, sqlvalues
@@ -49,8 +47,8 @@
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 from lp.soyuz.interfaces.builder import (
-    BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotResumeHost,
-    IBuilder, IBuilderSet, ProtocolVersionMismatch)
+    BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
+    CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingStatus)
@@ -61,6 +59,7 @@
 
 
 class TimeoutHTTPConnection(httplib.HTTPConnection):
+
     def connect(self):
         """Override the standard connect() methods to set a timeout"""
         ret = httplib.HTTPConnection.connect(self)
@@ -74,12 +73,13 @@
 
 class TimeoutTransport(xmlrpclib.Transport):
     """XMLRPC Transport to setup a socket with defined timeout"""
+
     def make_connection(self, host):
         host, extra_headers, x509 = self.get_host_info(host)
         return TimeoutHTTP(host)
 
 
-class BuilderSlave(xmlrpclib.Server):
+class BuilderSlave(xmlrpclib.ServerProxy):
     """Add in a few useful methods for the XMLRPC slave."""
 
     def __init__(self, urlbase, vm_host):
@@ -114,11 +114,48 @@
 
         return (stdout, stderr, resume_process.returncode)
 
+    def cacheFile(self, logger, libraryfilealias):
+        """Make sure that the file at 'libraryfilealias' is on the slave.
+
+        :param logger: A python `Logger` object.
+        :param libraryfilealias: An `ILibraryFileAlias`.
+        """
+        url = libraryfilealias.http_url
+        logger.debug("Asking builder on %s to ensure it has file %s "
+                     "(%s, %s)" % (self.urlbase, libraryfilealias.filename,
+                                   url, libraryfilealias.content.sha1))
+        self._sendFileToSlave(url, libraryfilealias.content.sha1)
+
+    def _sendFileToSlave(self, url, sha1, username="", password=""):
+        """Helper to send the file at 'url' with 'sha1' to this builder."""
+        present, info = self.ensurepresent(sha1, url, username, password)
+        if not present:
+            raise CannotFetchFile(url, info)
+
+    def build(self, buildid, builder_type, chroot_sha1, filemap, args):
+        """Build a thing on this build slave.
+
+        :param buildid: A string identifying this build.
+        :param builder_type: The type of builder needed.
+        :param chroot_sha1: XXX
+        :param filemap: A dictionary mapping from paths to SHA-1 hashes of
+            the file contents.
+        :param args: A dictionary of extra arguments. The contents depend on
+            the build job type.
+        """
+        # Can't upcall to xmlrpclib.ServerProxy, since it doesn't actually
+        # have a 'build' method.
+        build_method = xmlrpclib.ServerProxy.__getattr__(self, 'build')
+        try:
+            return build_method(
+                self, buildid, builder_type, chroot_sha1, filemap, args)
+        except xmlrpclib.Fault, info:
+            raise BuildSlaveFailure(info)
+
 
 class Builder(SQLBase):
 
     implements(IBuilder, IHasBuildRecords)
-    delegates(IBuildFarmJobBehavior, context="current_build_behavior")
     _table = 'Builder'
 
     _defaultOrder = ['id']
@@ -168,7 +205,6 @@
             # we just return it.
             return self._current_build_behavior
 
-
     def _setCurrentBuildBehavior(self, new_behavior):
         """Set the current build behavior."""
         self._current_build_behavior = new_behavior
@@ -178,31 +214,6 @@
     current_build_behavior = property(
         _getCurrentBuildBehavior, _setCurrentBuildBehavior)
 
-    def cacheFileOnSlave(self, logger, libraryfilealias):
-        """See `IBuilder`."""
-        url = libraryfilealias.http_url
-        logger.debug("Asking builder on %s to ensure it has file %s "
-                     "(%s, %s)" % (self.url, libraryfilealias.filename,
-                                   url, libraryfilealias.content.sha1))
-        self._sendFileToSlave(url, libraryfilealias.content.sha1)
-
-    def _sendFileToSlave(self, url, sha1, username="", password=""):
-        """Helper to send the file at 'url' with 'sha1' to this builder."""
-        if not self.builderok:
-            raise BuildDaemonError("Attempted to give a file to a known-bad"
-                                   " builder")
-        present, info = self.slave.ensurepresent(
-            sha1, url, username, password)
-        if not present:
-            message = """Slave '%s' (%s) was unable to fetch file.
-            ****** URL ********
-            %s
-            ****** INFO *******
-            %s
-            *******************
-            """ % (self.name, self.url, url, info)
-            raise BuildDaemonError(message)
-
     def checkCanBuildForDistroArchSeries(self, distro_arch_series):
         """See IBuilder."""
         # XXX cprov 2007-06-15:
@@ -277,12 +288,16 @@
 
     def startBuild(self, build_queue_item, logger):
         """See IBuilder."""
-        # Set the build behavior depending on the provided build queue item.
         self.current_build_behavior = build_queue_item.required_build_behavior
-        self.logStartBuild(build_queue_item, logger)
+        self.current_build_behavior.logStartBuild(logger)
 
         # Make sure the request is valid; an exception is raised if it's not.
-        self.verifyBuildRequest(build_queue_item, logger)
+        self.current_build_behavior.verifyBuildRequest(logger)
+
+        # Set the build behavior depending on the provided build queue item.
+        if not self.builderok:
+            raise BuildDaemonError(
+                "Attempted to start a build on a known-bad builder.")
 
         # If we are building a virtual build, resume the virtual machine.
         if self.virtualized:
@@ -290,12 +305,33 @@
 
         # Do it.
         build_queue_item.markAsBuilding(self)
-        self.dispatchBuildToSlave(build_queue_item, logger)
+        try:
+            self.current_build_behavior.dispatchBuildToSlave(
+                build_queue_item.id, logger)
+        except BuildSlaveFailure, e:
+            logger.debug("Disabling builder: %s" % self.url, exc_info=1)
+            self.failbuilder(
+                "Exception (%s) when setting up to new job" % (e,))
+        except CannotFetchFile, e:
+            message = """Slave '%s' (%s) was unable to fetch file.
+            ****** URL ********
+            %s
+            ****** INFO *******
+            %s
+            *******************
+            """ % (self.name, self.url, e.file_url, e.error_information)
+            raise BuildDaemonError(message)
+        except socket.error, e:
+            error_message = "Exception (%s) when setting up new job" % (e,)
+            self.handleTimeout(logger, error_message)
+            raise BuildSlaveFailure
+
 
     # XXX cprov 2009-06-24: This code does not belong to the content
     # class domain. Here we cannot make sensible decisions about what
     # we are allowed to present according to the request user. Then
     # bad things happens, see bug #391721.
+
     @property
     def status(self):
         """See IBuilder"""
@@ -317,6 +353,7 @@
     # that the builder history will display binary build records, as
     # returned by getBuildRecords() below. See the bug for a discussion
     # of the options.
+
     def getBuildRecords(self, build_state=None, name=None, arch_tag=None,
                         user=None):
         """See IHasBuildRecords."""

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-01-07 05:32:58 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-01-13 02:56:16 +0000
@@ -16,7 +16,7 @@
 from canonical.database.sqlbase import sqlvalues
 
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType, IBuildFarmJob, IBuildFarmJobDispatchEstimation)
+    BuildFarmJobType, IBuildFarmJobDispatchEstimation)
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.job.interfaces.job import JobStatus
@@ -27,7 +27,7 @@
 
 class BuildPackageJob(Storm):
     """See `IBuildPackageJob`."""
-    implements(IBuildFarmJob, IBuildPackageJob)
+    implements(IBuildPackageJob)
     classProvides(IBuildFarmJobDispatchEstimation)
 
     __storm_table__ = 'buildpackagejob'
@@ -54,7 +54,7 @@
             'universe': 250,
             'restricted': 750,
             'main': 1000,
-            'partner' : 1250,
+            'partner': 1250,
             }
 
         score_urgency = {
@@ -146,8 +146,8 @@
         # buildlog_ubuntu_dapper_i386_foo_1.0-ubuntu0_FULLYBUILT.txt
         # it fix request from bug # 30617
         return ('buildlog_%s-%s-%s.%s_%s_%s.txt' % (
-            distroname, distroseriesname, archname, sourcename, version, state
-            ))
+            distroname, distroseriesname, archname, sourcename, version,
+            state))
 
     def getName(self):
         """See `IBuildPackageJob`."""
@@ -176,7 +176,7 @@
     def composePendingJobsQuery(min_score, processor, virtualized):
         """See `IBuildFarmJob`."""
         return """
-            SELECT 
+            SELECT
                 BuildQueue.job,
                 BuildQueue.lastscore,
                 BuildQueue.estimated_duration,
@@ -209,4 +209,3 @@
     def virtualized(self):
         """See `IBuildFarmJob`."""
         return self.build.is_virtualized
-

=== modified file 'lib/lp/soyuz/tests/soyuzbuilddhelpers.py'
--- lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/tests/soyuzbuilddhelpers.py	2010-01-13 02:56:16 +0000
@@ -26,6 +26,7 @@
 import xmlrpclib
 
 from canonical.config import config
+from lp.soyuz.interfaces.builder import CannotFetchFile
 
 
 class MockBuilder:
@@ -185,6 +186,16 @@
 
         return (stdout, stderr, resume_process.returncode)
 
+    def _sendFileToSlave(self, url, sha1, username="", password=""):
+        present, info = self.ensurepresent(sha1, url, username, password)
+        if not present:
+            raise CannotFetchFile(url, info)
+
+    def cacheFile(self, logger, libraryfilealias):
+        self._sendFileToSlave(
+            libraryfilealias.http_url, libraryfilealias.content.sha1)
+
+
 class BuildingSlave(OkSlave):
     """A mock slave that looks like it's currently building."""