Merge lp:~rockstar/launchpad/branch-scanner-job into lp:launchpad/db-devel

[Paul Hummer]

[Paul Hummer (rockstar)]

This branch creates a BranchScanJob and accompanying tests. The end goal of
all this work is so that the branch scanner can be converted into a job. The
next step is to create a script that will run the branch scan job, and then
have the mirror-puller create scan jobs after its done mirroring things.

[Muharem Hrnjadovic (al-maisan)]

Hello Paul, this looks good. Please do make the minor fixes ("make lint" fixes etc.) we discussed prior to merging the branch.

review: Approve

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2009-12-24 14:18:35 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-01-13 03:21:24 +0000
@@ -46,24 +46,24 @@
         Build a package from a bazaar branch and a recipe.
         """)
 
-    TRANSLATION = DBItem(4, """
-        TranslationJob
+    TRANSLATIONTEMPLATESBUILD = DBItem(4, """
+        TranslationTemplatesBuildJob
 
-        Perform a translation job.
+        Generate translation templates from a bazaar branch.
         """)
 
 
 class IBuildFarmJob(Interface):
-    """Operations that Soyuz build farm jobs must implement."""
+    """Operations that jobs for the build farm must implement."""
 
     def score():
         """Calculate a job score appropriate for the job type in question."""
 
     def getLogFileName():
-        """The preferred file name for the log of this Soyuz job."""
+        """The preferred file name for this job's log."""
 
     def getName():
-        """An appropriate name for this Soyuz job."""
+        """An appropriate name for this job."""
 
     def jobStarted():
         """'Job started' life cycle event, handle as appropriate."""

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2009-07-26 14:19:49 +0000
+++ lib/lp/buildmaster/manager.py	2010-01-13 03:21:24 +0000
@@ -340,19 +340,11 @@
                     transaction.commit()
                 continue
 
-            candidate = builder.findBuildCandidate()
-            if candidate is None:
-                self.logger.debug(
-                    "No build candidates available for builder.")
-                continue
-
             slave = RecordingSlave(builder.name, builder.url, builder.vm_host)
-            builder.setSlaveForTesting(slave)
-
-            builder.dispatchBuildCandidate(candidate)
+            candidate = builder.findAndStartJob(buildd_slave=slave)
             if builder.currentjob is not None:
                 recording_slaves.append(slave)
-            transaction.commit()
+                transaction.commit()
 
         return recording_slaves
 

=== modified file 'lib/lp/code/interfaces/branchjob.py'
--- lib/lp/code/interfaces/branchjob.py	2010-01-07 04:58:38 +0000
+++ lib/lp/code/interfaces/branchjob.py	2010-01-13 03:21:24 +0000
@@ -13,6 +13,8 @@
     'IBranchJob',
     'IBranchDiffJob',
     'IBranchDiffJobSource',
+    'IBranchScanJob',
+    'IBranchScanJobSource',
     'IBranchUpgradeJob',
     'IBranchUpgradeJobSource',
     'IReclaimBranchSpaceJob',
@@ -74,6 +76,25 @@
         """
 
 
+class IBranchScanJob(Interface):
+    """ A job to scan branches."""
+
+    def run():
+        """Scan a branch for new revisions."""
+
+
+class IBranchScanJobSource(Interface):
+
+    def create(branch):
+        """Scan a branch for new revisions.
+
+        :param branch: The database branch to upgrade.
+        """
+
+    def iterReady():
+        """Iterate through all IBranchScanJobs."""
+
+
 class IBranchUpgradeJob(IRunnableJob):
     """A job to upgrade branches with out-of-date formats."""
 

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-01-07 04:57:13 +0000
+++ lib/lp/code/model/branchjob.py	2010-01-13 03:21:24 +0000
@@ -48,6 +48,7 @@
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.diff import StaticDiff
 from lp.code.model.revision import RevisionSet
+from lp.codehosting.scanner.bzrsync import BzrSync
 from lp.codehosting.vfs import branch_id_to_path, get_multi_server
 from lp.services.job.model.job import Job
 from lp.services.job.interfaces.job import JobStatus
@@ -59,10 +60,11 @@
     BranchMergeProposalStatus, BranchSubscriptionDiffSize,
     BranchSubscriptionNotificationLevel)
 from lp.code.interfaces.branchjob import (
-    IBranchDiffJob, IBranchDiffJobSource, IBranchJob, IBranchUpgradeJob,
-    IBranchUpgradeJobSource, IReclaimBranchSpaceJob,
-    IReclaimBranchSpaceJobSource, IRevisionsAddedJob, IRevisionMailJob,
-    IRevisionMailJobSource, IRosettaUploadJob, IRosettaUploadJobSource)
+    IBranchDiffJob, IBranchDiffJobSource, IBranchJob, IBranchScanJob,
+    IBranchScanJobSource, IBranchUpgradeJob, IBranchUpgradeJobSource,
+    IReclaimBranchSpaceJob, IReclaimBranchSpaceJobSource, IRevisionsAddedJob,
+    IRevisionMailJob, IRevisionMailJobSource, IRosettaUploadJob,
+    IRosettaUploadJobSource)
 from lp.translations.interfaces.translations import (
     TranslationsBranchImportMode)
 from lp.translations.interfaces.translationimportqueue import (
@@ -119,6 +121,17 @@
         from disk.
         """)
 
+    TRANSLATION_TEMPLATES_BUILD = DBItem(6, """
+        Generate translation templates
+
+        This job generates translations templates from a source branch.
+        """)
+
+    SCAN_BRANCH = DBItem(7, """
+
+            Scan Branch
+        This job scans a branch for new revisions.
+        """)
 
 class BranchJob(SQLBase):
     """Base class for jobs related to branches."""
@@ -243,6 +256,26 @@
         return static_diff
 
 
+class BranchScanJob(BranchJobDerived):
+    """A Job that scans a branch for new revisions."""
+
+    implements(IBranchScanJob)
+
+    classProvides(IBranchScanJobSource)
+    class_job_type = BranchJobType.SCAN_BRANCH
+
+    @classmethod
+    def create(cls, branch):
+        """See `IBranchUpgradeJobSource`."""
+        branch_job = BranchJob(branch, BranchJobType.SCAN_BRANCH, {})
+        return cls(branch_job)
+
+    def run(self):
+        """See `IBranchScanJob`."""
+        bzrsync = BzrSync(self.branch)
+        bzrsync.syncBranchAndClose()
+
+
 class BranchUpgradeJob(BranchJobDerived):
     """A Job that upgrades branches to the current stable format."""
 

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-01-11 05:08:06 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-01-13 03:21:24 +0000
@@ -46,11 +46,12 @@
     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
     CodeReviewNotificationLevel)
 from lp.code.interfaces.branchjob import (
-    IBranchDiffJob, IBranchJob, IBranchUpgradeJob, IReclaimBranchSpaceJob,
-    IReclaimBranchSpaceJobSource, IRevisionMailJob, IRosettaUploadJob)
+    IBranchDiffJob, IBranchJob, IBranchScanJob, IBranchUpgradeJob,
+    IReclaimBranchSpaceJob, IReclaimBranchSpaceJobSource, IRevisionMailJob,
+    IRosettaUploadJob)
 from lp.code.model.branchjob import (
     BranchDiffJob, BranchJob, BranchJobDerived, BranchJobType,
-    BranchUpgradeJob, ReclaimBranchSpaceJob, RevisionMailJob,
+    BranchScanJob, BranchUpgradeJob, ReclaimBranchSpaceJob, RevisionMailJob,
     RevisionsAddedJob, RosettaUploadJob)
 from lp.code.model.branchrevision import BranchRevision
 from lp.code.model.revision import RevisionSet
@@ -112,6 +113,7 @@
     def test_run_diff_content(self):
         """Ensure that run generates expected diff."""
         self.useBzrBranches()
+<<<<<<< TREE
 
         tree_location = tempfile.mkdtemp()
         self.addCleanup(lambda: shutil.rmtree(tree_location)) 
@@ -119,6 +121,16 @@
         branch, tree = self.create_branch_and_tree(tree_location=tree_location)
         tree_file = os.path.join(tree_location, 'file')
         open(tree_file, 'wb').write('foo\n')
+=======
+
+        tree_location = tempfile.mkdtemp()
+        self.addCleanup(lambda: shutil.rmtree(tree_location)) 
+
+        branch, tree = self.create_branch_and_tree(
+            tree_location=tree_location)
+        tree_file = os.path.join(tree_location, 'file')
+        open(tree_file, 'wb').write('foo\n')
+>>>>>>> MERGE-SOURCE
         tree.add('file')
         tree.commit('First commit')
         open(tree_file, 'wb').write('bar\n')
@@ -184,6 +196,44 @@
         self.assertIsInstance(diff.diff.text, str)
 
 
+class TestBranchScanJob(TestCaseWithFactory):
+    """Tests for `BranchScanJob`."""
+
+    layer = LaunchpadZopelessLayer
+
+    def test_providesInterface(self):
+        """Ensure that BranchScanJob implements IBranchScanJob."""
+        branch = self.factory.makeAnyBranch()
+        job = BranchScanJob.create(branch)
+        verifyObject(IBranchScanJob, job)
+
+    def test_run(self):
+        """Ensure the job scans the branch."""
+        self.useBzrBranches()
+
+        db_branch, bzr_tree = self.create_branch_and_tree()
+        bzr_tree.commit('First commit', rev_id='rev1')
+        bzr_tree.commit('Second commit', rev_id='rev2')
+        bzr_tree.commit('Third commit', rev_id='rev3')
+        LaunchpadZopelessLayer.commit()
+
+        job = BranchScanJob.create(db_branch)
+        LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
+        job.run()
+        LaunchpadZopelessLayer.switchDbUser(config.launchpad.dbuser)
+
+        self.assertEqual(db_branch.revision_count, 3)
+
+        bzr_tree.commit('Fourth commit', rev_id='rev4')
+        bzr_tree.commit('Fifth commit', rev_id='rev5')
+
+        job = BranchScanJob.create(db_branch)
+        LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
+        job.run()
+
+        self.assertEqual(db_branch.revision_count, 5)
+
+
 class TestBranchUpgradeJob(TestCaseWithFactory):
     """Tests for `BranchUpgradeJob`."""
 

=== modified file 'lib/lp/code/templates/branchmergeproposal-macros.pt'
--- lib/lp/code/templates/branchmergeproposal-macros.pt	2009-12-18 21:31:12 +0000
+++ lib/lp/code/templates/branchmergeproposal-macros.pt	2010-01-13 03:21:24 +0000
@@ -55,7 +55,7 @@
         <tal:registrant replace="structure proposal/registrant/fmt:link" />
         <tal:date replace="proposal/date_review_requested/fmt:displaydate"/>
       </td>
-      <td>
+      <td style="text-align: right">
         <tal:size replace='proposal/preview_diff/diff_lines_count' condition="proposal/preview_diff"/>
       </td>
       <td>

=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2009-11-13 19:34:17 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-01-13 03:21:24 +0000
@@ -128,7 +128,8 @@
 Now let's check the build candidates which will be considered for the
 builder 'bob':
 
-    >>> job = bob_builder.findBuildCandidate()
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> job = removeSecurityProxy(bob_builder)._findBuildCandidate()
 
 The single BuildQueue found is a non-virtual pending build:
 
@@ -157,14 +158,16 @@
     ...    'foo.dsc', len(content), StringIO(content), 'application/dsc')
 
     >>> sprf = build.sourcepackagerelease.files[0]
-    >>> from zope.security.proxy import removeSecurityProxy
     >>> naked_sprf = removeSecurityProxy(sprf)
     >>> naked_sprf.libraryfile = getUtility(ILibraryFileAliasSet)[alias_id]
     >>> flush_database_updates()
 
 Check the dispatching method itself:
 
-    >>> bob_builder.dispatchBuildCandidate(job)
+    >>> dispatched_job = bob_builder.findAndStartJob()
+    >>> job == dispatched_job
+    True
+
     >>> flush_database_updates()
 
 Verify if the job (BuildQueue) was updated appropriately:
@@ -224,7 +227,7 @@
     >>> bob_builder.vm_host = 'localhost.ppa'
     >>> syncUpdate(bob_builder)
 
-    >>> job = bob_builder.findBuildCandidate()
+    >>> job = removeSecurityProxy(bob_builder)._findBuildCandidate()
     >>> print job
     None
 
@@ -245,11 +248,11 @@
     >>> bob_builder.virtualized = True
     >>> syncUpdate(bob_builder)
 
-    >>> job = bob_builder.findBuildCandidate()
+    >>> job = removeSecurityProxy(bob_builder)._findBuildCandidate()
     >>> ppa_job.id == job.id
     True
 
-For further details regarding IBuilder.findBuildCandidate() please see
+For further details regarding IBuilder._findBuildCandidate() please see
 lib/lp/soyuz/tests/test_builder.py.
 
 Start buildd-slave to be able to dispatch jobs.
@@ -262,7 +265,7 @@
 
     >>> bob_builder.virtualized = False
     >>> flush_database_updates()
-    >>> bob_builder.dispatchBuildCandidate(ppa_job)
+    >>> removeSecurityProxy(bob_builder)._dispatchBuildCandidate(ppa_job)
     Traceback (most recent call last):
     ...
     AssertionError: Attempt to build non-virtual item on a virtual builder.
@@ -273,7 +276,10 @@
     >>> bob_builder.virtualized = True
     >>> flush_database_updates()
 
-    >>> bob_builder.dispatchBuildCandidate(ppa_job)
+    >>> dispatched_job = bob_builder.findAndStartJob()
+    >>> ppa_job == dispatched_job
+    True
+
     >>> flush_database_updates()
 
 PPA job is building.
@@ -328,7 +334,7 @@
 implementation.
 
     >>> BuilddSlaveTestSetup().setUp()
-    >>> bob_builder.dispatchBuildCandidate(sec_job)
+    >>> removeSecurityProxy(bob_builder)._dispatchBuildCandidate(sec_job)
     Traceback (most recent call last):
     ...
     AssertionError: Soyuz is not yet capable of building SECURITY uploads.
@@ -336,7 +342,7 @@
 
 To solve this problem temporarily until we start building security
 uploads, we will mark builds targeted to the SECURITY pocket as
-FAILEDTOBUILD during the findBuildCandidate look-up.
+FAILEDTOBUILD during the _findBuildCandidate look-up.
 
 We will also create another build candidate in breezy-autotest/i386 to
 check if legitimate pending candidates will remain valid.
@@ -360,7 +366,7 @@
 
     >>> new_pub = old_pub.copyTo(
     ...     pending_build.distroseries, old_pub.pocket, pending_build.archive)
-    >>> candidate = bob_builder.findBuildCandidate()
+    >>> candidate = removeSecurityProxy(bob_builder)._findBuildCandidate()
     >>> flush_database_updates()
     >>> candidate.id == pending_job.id
     True

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-01-05 16:30:29 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-01-13 03:21:24 +0000
@@ -754,11 +754,8 @@
 
 == Build Dispatching ==
 
-Build dispatching can be entirely done via IBuilder content class via
-the following API:
-
- * findCandidate:  returns a suitable BuildQueue candidate
- * dispatchBuildCandidate: dispatch a build for a given candidate.
+Build dispatching can be entirely done via IBuilder content class
+using the findAndStartJob method.
 
 We will use SoyuzTestPublisher to simulate the required context in the
 next tests. Let's initialise it.
@@ -805,14 +802,14 @@
 superseded source package releases in the queue and marks the
 corresponding build record as SUPERSEDED.
 
-    >>> old_candidate = a_builder.findBuildCandidate()
+    >>> old_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> build = getUtility(IBuildSet).getByQueueEntry(old_candidate)
     >>> print build.buildstate.name
     NEEDSBUILD
 
 The 'candidate' is constant until we dispatch it.
 
-    >>> new_candidate = a_builder.findBuildCandidate()
+    >>> new_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> new_candidate.id == old_candidate.id
     True
 
@@ -820,7 +817,7 @@
 whether the candidate will still be found.
 
     >>> build.archive.enabled = False
-    >>> new_candidate = a_builder.findBuildCandidate()
+    >>> new_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> new_candidate is None
     True
 
@@ -829,7 +826,7 @@
 candidate will be found again.
 
     >>> build.archive.enabled = True
-    >>> new_candidate = a_builder.findBuildCandidate()
+    >>> new_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> new_candidate.id == old_candidate.id
     True
 
@@ -852,7 +849,7 @@
 
 Now, there we have another build candidate.
 
-    >>> new_candidate = a_builder.findBuildCandidate()
+    >>> new_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
     >>> new_candidate.id != old_candidate.id
     True
 
@@ -882,9 +879,10 @@
 
 Let's try to find a new build candidate:
 
-    >>> another_candidate = a_builder.findBuildCandidate()
+    >>> another_candidate = removeSecurityProxy(
+    ...     a_builder)._findBuildCandidate()
 
-Since there are no more candidates at all, findBuildCandidate()
+Since there are no more candidates at all, _findBuildCandidate()
 returned None:
 
     >>> print another_candidate
@@ -897,7 +895,8 @@
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser(config.builddmaster.dbuser)
 
-    >>> another_candidate = a_builder.findBuildCandidate()
+    >>> another_candidate = removeSecurityProxy(
+    ...     a_builder)._findBuildCandidate()
     >>> another_candidate.id == new_candidate.id
     True
 
@@ -921,7 +920,8 @@
     >>> print build.buildstate.name
     NEEDSBUILD
 
-    >>> another_candidate = a_builder.findBuildCandidate()
+    >>> another_candidate = removeSecurityProxy(
+    ...     a_builder)._findBuildCandidate()
     >>> print another_candidate
     None
 
@@ -954,7 +954,7 @@
     >>> a_builder.is_available
     True
     >>> candidate = a_build.createBuildQueueEntry()
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -982,7 +982,7 @@
     >>> a_builder.is_available
     True
     >>> candidate = a_build.createBuildQueueEntry()
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1034,7 +1034,7 @@
 So, at moment, partner archive is still not relevant for builds in
 hoary/i386. It's not passed to the builder.
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1084,7 +1084,8 @@
 binary in hoary/i386, the partner archive gets included in the builder
 sources_list.
 
-    >>> a_builder.dispatchBuildCandidate(partner_candidate)
+    >>> removeSecurityProxy(
+    ...     a_builder)._dispatchBuildCandidate(partner_candidate)
     ensurepresent called, url=...
     ensurepresent called, url=http://localhost:58000/.../foo_666.dsc
     OkSlave BUILDING
@@ -1126,7 +1127,7 @@
     >>> create_binary_publication_for(
     ...    cprov_archive, hoary, PackagePublishingStatus.PUBLISHED)
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1183,7 +1184,7 @@
 
 This is so that the mangling tools will run over the built packages.
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://private-ppa.launchpad.dev/cprov/ppa/ubuntu/pool/main/m/mozilla-firefox/firefox_0.9.2.orig.tar.gz
@@ -1223,7 +1224,7 @@
     >>> LaunchpadZopelessLayer.switchDbUser(config.builddmaster.dbuser)
     >>> login(ANONYMOUS)
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, ...
     ...
     Ogre-component: main
@@ -1302,7 +1303,7 @@
     >>> setupBuildQueue(candidate, a_builder)
     >>> last_stub_mail_count = len(stub.test_emails)
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1331,7 +1332,7 @@
     >>> create_binary_publication_for(
     ...    mark_archive, hoary, PackagePublishingStatus.PUBLISHED)
 
-    >>> a_builder.dispatchBuildCandidate(candidate)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(candidate)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1376,7 +1377,7 @@
 
     >>> hoary_i386.distroseries.status.name
     'DEVELOPMENT'
-    >>> a_builder.dispatchBuildCandidate(updates_bqItem)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(updates_bqItem)
     Traceback (most recent call last):
     ...
     AssertionError: i386 build of evolution 1.0 in ubuntu hoary UPDATES (...) can not be built for pocket UPDATES: invalid pocket due to the series status of hoary.
@@ -1401,7 +1402,7 @@
     >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.UPDATES)
     >>> last_stub_mail_count = len(stub.test_emails)
-    >>> a_builder.dispatchBuildCandidate(bqItem3)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(bqItem3)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1423,7 +1424,7 @@
     >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.PROPOSED)
     >>> last_stub_mail_count = len(stub.test_emails)
-    >>> a_builder.dispatchBuildCandidate(bqItem3)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(bqItem3)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1446,7 +1447,7 @@
     >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.BACKPORTS)
     >>> last_stub_mail_count = len(stub.test_emails)
-    >>> a_builder.dispatchBuildCandidate(bqItem3)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(bqItem3)
     ensurepresent called, url=...
     ensurepresent called,
         url=http://localhost:58000/3/firefox_0.9.2.orig.tar.gz
@@ -1477,13 +1478,13 @@
 because Embargoed-Archives and Restricted-UI implementations are not
 yet ready.
 
-    >>> a_builder.dispatchBuildCandidate(bqItem3)
+    >>> removeSecurityProxy(a_builder)._dispatchBuildCandidate(bqItem3)
     Traceback (most recent call last):
     ...
     AssertionError: Soyuz is not yet capable of building SECURITY uploads.
 
-Builds for security pocket are marked as FAILEDTOBUILD inside
-findBuildCandidate method, see doc/buildd-dispatching.txt
+Builds for security pocket are marked as FAILEDTOBUILD inside the
+_findBuildCandidate() method, see doc/buildd-dispatching.txt
 
 
 == Builder Status Handler ==

=== modified file 'lib/lp/soyuz/interfaces/builder.py'
--- lib/lp/soyuz/interfaces/builder.py	2009-12-03 14:38:48 +0000
+++ lib/lp/soyuz/interfaces/builder.py	2010-01-13 03:21:24 +0000
@@ -242,24 +242,6 @@
         :return: A librarian file alias.
         """
 
-    def findBuildCandidate():
-        """Return the candidate for building.
-
-        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.
-        """
-
-    def dispatchBuildCandidate(candidate):
-        """Dispatch the given job to this builder.
-
-        This method can only be executed in the builddmaster machine, since
-        it will actually issues the XMLRPC call to the buildd-slave.
-        """
-
     def handleTimeout(logger, error_message):
         """Handle buildd slave communication timeout situations.
 
@@ -274,6 +256,14 @@
         :param error_message: The error message to be used for logging.
         """
 
+    def findAndStartJob(buildd_slave=None):
+        """Find a job to run and send it to the buildd slave.
+
+        :param buildd_slave: An optional buildd slave that this builder should
+            talk to.
+        :return: the `IBuildQueue` instance found or None if no job was found.
+        """
+
 
 class IBuilderSet(Interface):
     """Collections of builders.

=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2010-01-05 23:32:19 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2010-01-13 03:21:24 +0000
@@ -29,7 +29,7 @@
     'name_priority_map',
     ]
 
-from zope.schema import Bool, Choice, Datetime, Int, List, TextLine, Text
+from zope.schema import Bool, Choice, Datetime, Int, TextLine, Text
 from zope.interface import Interface, Attribute
 from lazr.enum import DBEnumeratedType, DBItem
 
@@ -534,20 +534,6 @@
             title=_("Source Package Version"),
             required=False, readonly=True))
 
-    source_file_urls = exported(
-        List(
-            value_type=Text(),
-            title=_("Source File URLs"),
-            description=_("URL list for this source publication's "
-                          "files from the source upload.")))
-
-    binary_file_urls = exported(
-        List(
-            value_type=Text(),
-            title=_("Binary File URLs"),
-            description=_("URL list for this source publication's "
-                          "files resulting from the build.")))
-
     package_creator = exported(
         Reference(
             IPerson,
@@ -690,6 +676,21 @@
                 }
         """
 
+    @export_read_operation()
+    def sourceFileUrls():
+        """URLs for this source publication's uploaded source files.
+
+        :return: A collection of URLs for this source.
+        """
+
+    @export_read_operation()
+    def binaryFileUrls():
+        """URLs for this source publication's binary files.
+
+        :return: A collection of URLs for this source.
+        """
+
+
 #
 # Binary package publishing
 #

=== modified file 'lib/lp/soyuz/model/builder.py'
--- lib/lp/soyuz/model/builder.py	2009-12-24 06:57:25 +0000
+++ lib/lp/soyuz/model/builder.py	2010-01-13 03:21:24 +0000
@@ -386,9 +386,9 @@
         return True
 
     # XXX cprov 20071116: It should become part of the public
-    # findBuildCandidate once we start to detect superseded builds
+    # _findBuildCandidate once we start to detect superseded builds
     # at build creation time.
-    def _findBuildCandidate(self):
+    def _findBinaryBuildCandidate(self):
         """Return the highest priority build candidate for this builder.
 
         Returns a pending IBuildQueue record queued for this builder
@@ -487,10 +487,21 @@
         logger = logging.getLogger('slave-scanner')
         return logger
 
-    def findBuildCandidate(self):
-        """See `IBuilder`."""
+    def _findBuildCandidate(self):
+        """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.
+        """
+
         logger = self._getSlaveScannerLogger()
-        candidate = self._findBuildCandidate()
+        candidate = self._findBinaryBuildCandidate()
 
         # Mark build records targeted to old source versions as SUPERSEDED
         # and build records target to SECURITY pocket as FAILEDTOBUILD.
@@ -507,7 +518,7 @@
                     % (build.id, candidate.id))
                 build.buildstate = BuildStatus.FAILEDTOBUILD
                 candidate.destroySelf()
-                candidate = self._findBuildCandidate()
+                candidate = self._findBinaryBuildCandidate()
                 continue
 
             publication = build.current_source_publication
@@ -520,7 +531,7 @@
                     % (build.id, candidate.id))
                 build.buildstate = BuildStatus.SUPERSEDED
                 candidate.destroySelf()
-                candidate = self._findBuildCandidate()
+                candidate = self._findBinaryBuildCandidate()
                 continue
 
             return candidate
@@ -528,8 +539,14 @@
         # No candidate was found.
         return None
 
-    def dispatchBuildCandidate(self, candidate):
-        """See `IBuilder`."""
+    def _dispatchBuildCandidate(self, candidate):
+        """Dispatch the pending job to the associated buildd slave.
+
+        This method can only be executed in the builddmaster machine, since
+        it will actually issues the XMLRPC call to the buildd-slave.
+
+        :param candidate: The job to dispatch.
+        """
         logger = self._getSlaveScannerLogger()
         try:
             self.startBuild(candidate, logger)
@@ -563,6 +580,21 @@
                 exc_info=True)
             self.failbuilder(error_message)
 
+    def findAndStartJob(self, buildd_slave=None):
+        """See IBuilder."""
+        logger = self._getSlaveScannerLogger()
+        candidate = self._findBuildCandidate()
+
+        if candidate is None:
+            logger.debug("No build candidates available for builder.")
+            return None
+
+        if buildd_slave is not None:
+            self.setSlaveForTesting(buildd_slave)
+
+        self._dispatchBuildCandidate(candidate)
+        return candidate
+
 
 class BuilderSet(object):
     """See IBuilderSet"""

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-01-05 19:56:35 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-01-13 03:21:24 +0000
@@ -865,24 +865,20 @@
         return [
             ProxiedLibraryFileAlias(file, parent).http_url for file in files]
 
-    @property
-    def source_file_urls(self):
+    def sourceFileUrls(self):
         """See `ISourcePackagePublishingHistory`."""
         source_urls = self._proxied_urls(
             [file.libraryfile for file in self.sourcepackagerelease.files],
              self.archive)
-
         return source_urls
 
-    @property
-    def binary_file_urls(self):
+    def binaryFileUrls(self):
         """See `ISourcePackagePublishingHistory`."""
         publishing_set = getUtility(IPublishingSet)
         binaries = publishing_set.getBinaryFilesForSources(
             self).config(distinct=True)
         binary_urls = self._proxied_urls(
             [binary for _source, binary, _content in binaries], self.archive)
-
         return binary_urls
 
 

=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-01-13 03:21:24 +0000
@@ -201,12 +201,10 @@
             if not builder.is_available:
                 self.logger.warn('builder is not available. Ignored.')
                 continue
-            candidate = builder.findBuildCandidate()
+
+            candidate = builder.findAndStartJob()
             if candidate is None:
-                self.logger.debug(
-                    "No candidates available for builder.")
                 continue
-            builder.dispatchBuildCandidate(candidate)
             self.txn.commit()
 
         self.logger.info("Slave Scan Process Finished.")

=== modified file 'lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt'
--- lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2010-01-05 23:32:19 +0000
+++ lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt	2010-01-13 03:21:24 +0000
@@ -111,7 +111,6 @@
     >>> from lazr.restful.testing.webservice import pprint_entry
     >>> pprint_entry(pubs['entries'][0])
     archive_link: u'http://.../~cprov/+archive/ppa'
-    binary_file_urls: []
     component_name: u'main'
     date_created: ...
     date_made_pending: None
@@ -130,7 +129,6 @@
     scheduled_deletion_date: None
     section_name: u'base'
     self_link: u'http://.../~cprov/+archive/ppa/+sourcepub/...'
-    source_file_urls: [u'http://launchpad.dev/~cprov/+archive/ppa/+files/testwebservice_666.dsc']
     source_package_name: u'testwebservice'
     source_package_version: u'666'
     status: u'Pending'
@@ -342,23 +340,23 @@
 
     >>> pubs = webservice.named_get(
     ...     cprov_archive['self_link'], 'getPublishedSources').jsonBody()
-    >>> def print_source_urls(pubs):
-    ...     for source_file_urls in sorted(
-    ...         entry['source_file_urls'] for entry in pubs['entries']):
-    ...         print source_file_urls
-    >>> print_source_urls(pubs)
-    []
+    >>> for pub_link in sorted(
+    ...     entry['self_link'] for entry in pubs['entries']):
+    ...     source_urls = webservice.named_get(
+    ...         pub_link, 'sourceFileUrls').jsonBody()
+    ...     print source_urls
+    [u'http://launchpad.dev/~cprov/+archive/ppa/+files/foobar-1.0.dsc']
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/firefox_0.9.2.orig.tar.gz', u'http://launchpad.dev/~cprov/+archive/ppa/+files/iceweasel-1.0.dsc']
-    [u'http://launchpad.dev/~cprov/+archive/ppa/+files/foobar-1.0.dsc']
+    []
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/testwebservice_666.dsc']
 
-    >>> def print_binary_urls(pubs):
-    ...     for binary_file_urls in sorted(
-    ...         entry['binary_file_urls'] for entry in pubs['entries']):
-    ...         print binary_file_urls
-    >>> print_binary_urls(pubs)
-    []
-    []
+    >>> for pub_link in sorted(
+    ...     entry['self_link'] for entry in pubs['entries']):
+    ...     binary_urls = webservice.named_get(
+    ...         pub_link, 'binaryFileUrls').jsonBody()
+    ...     print binary_urls
     []
     [u'http://launchpad.dev/~cprov/+archive/ppa/+files/mozilla-firefox_0.9_i386.deb']
+    []
+    []
 

=== modified file 'lib/lp/soyuz/tests/test_builder.py'
--- lib/lp/soyuz/tests/test_builder.py	2009-12-02 15:18:46 +0000
+++ lib/lp/soyuz/tests/test_builder.py	2010-01-13 03:21:24 +0000
@@ -6,10 +6,11 @@
 import unittest
 
 from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import LaunchpadZopelessLayer
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
-    BuildBehaviorMismatch, IBuildFarmJobBehavior)
+    IBuildFarmJobBehavior)
 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
@@ -34,13 +35,13 @@
         # Create some i386 builders ready to build PPA builds.  Two
         # already exist in sampledata so we'll use those first.
         self.builder1 = getUtility(IBuilderSet)['bob']
-        self.builder2 = getUtility(IBuilderSet)['frog']
+        self.frog_builder = getUtility(IBuilderSet)['frog']
         self.builder3 = self.factory.makeBuilder(name='builder3')
         self.builder4 = self.factory.makeBuilder(name='builder4')
         self.builder5 = self.factory.makeBuilder(name='builder5')
         self.builders = [
             self.builder1,
-            self.builder2,
+            self.frog_builder,
             self.builder3,
             self.builder4,
             self.builder5,
@@ -81,7 +82,8 @@
         # there's only one builder available.
 
         # Asking frog to find a candidate should give us the joesppa build.
-        next_job = self.frog_builder.findBuildCandidate()
+        next_job = removeSecurityProxy(
+            self.frog_builder)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.assertEqual('joesppa', build.archive.name)
 
@@ -89,7 +91,8 @@
         # returned.
         self.bob_builder.builderok = False
         self.bob_builder.manual = False
-        next_job = self.frog_builder.findBuildCandidate()
+        next_job = removeSecurityProxy(
+            self.frog_builder)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.assertEqual('joesppa', build.archive.name)
 
@@ -162,7 +165,7 @@
     def test_findBuildCandidate_first_build_started(self):
         # A PPA cannot start a build if it would use 80% or more of the
         # builders.
-        next_job = self.builder4.findBuildCandidate()
+        next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failIfEqual('joesppa', build.archive.name)
 
@@ -170,7 +173,7 @@
         # When joe's first ppa build finishes, his fourth i386 build
         # will be the next build candidate.
         self.joe_builds[0].buildstate = BuildStatus.FAILEDTOBUILD
-        next_job = self.builder4.findBuildCandidate()
+        next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)
 
@@ -179,7 +182,7 @@
         # for the one architecture.
         self.ppa_joe.private = True
         self.ppa_joe.buildd_secret = 'sekrit'
-        next_job = self.builder4.findBuildCandidate()
+        next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)
 
@@ -205,7 +208,8 @@
         # Normal archives are not restricted to serial builds per
         # arch.
 
-        next_job = self.builder2.findBuildCandidate()
+        next_job = removeSecurityProxy(
+            self.frog_builder)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('primary', build.archive.name)
         self.failUnlessEqual('gedit', build.sourcepackagerelease.name)
@@ -213,8 +217,9 @@
         # Now even if we set the build building, we'll still get the
         # second non-ppa build for the same archive as the next candidate.
         build.buildstate = BuildStatus.BUILDING
-        build.builder = self.builder2
-        next_job = self.builder2.findBuildCandidate()
+        build.builder = self.frog_builder
+        next_job = removeSecurityProxy(
+            self.frog_builder)._findBuildCandidate()
         build = getUtility(IBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('primary', build.archive.name)
         self.failUnlessEqual('firefox', build.sourcepackagerelease.name)

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2009-12-28 22:58:18 +0000
+++ lib/lp/translations/configure.zcml	2010-01-13 03:21:24 +0000
@@ -572,6 +572,35 @@
             interface="lp.translations.interfaces.poexportrequest.IPOExportRequestSet"/>
     </securedutility>
 
+    <!-- TranslationTemplateBuildJob -->
+    <class
+        class="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob">
+        <allow
+            interface="lp.translations.interfaces.translationtemplatesbuildjob.ITranslationTemplatesBuildJob"/>
+    </class>
+    <securedutility
+        component="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"
+        provides="lp.translations.interfaces.translationtemplatesbuildjob.ITranslationTemplatesBuildJobSource">
+        <allow interface="lp.translations.interfaces.translationtemplatesbuildjob.ITranslationTemplatesBuildJobSource"/>
+    </securedutility>
+    <utility
+        component="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"
+        provides="lp.translations.interfaces.translationtemplatesbuildjob.ITranslationTemplatesBuildJob"
+        name="TRANSLATIONTEMPLATESBUILD"/>
+
+    <!-- TranslationTemplateBuildBehavior -->
+    <class
+        class="lp.translations.model.translationtemplatesbuildbehavior.TranslationTemplatesBuildBehavior">
+        <allow
+            interface="lp.buildmaster.interfaces.buildfarmjobbehavior.IBuildFarmJobBehavior"/>
+    </class>
+
+    <adapter
+        provides="lp.buildmaster.interfaces.buildfarmjobbehavior.IBuildFarmJobBehavior"
+        for="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"
+        factory="lp.translations.model.translationtemplatesbuildbehavior.TranslationTemplatesBuildBehavior"
+        />
+
   <webservice:register module="lp.translations.interfaces.webservice" />
 
 </configure>

=== added file 'lib/lp/translations/interfaces/translationtemplatesbuildjob.py'
--- lib/lp/translations/interfaces/translationtemplatesbuildjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/interfaces/translationtemplatesbuildjob.py	2010-01-13 03:21:24 +0000
@@ -0,0 +1,37 @@
+# Copyright 2010 Canonical Ltd. This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0213
+
+__metaclass__ = type
+
+__all__ = [
+    'ITranslationTemplatesBuildJob',
+    'ITranslationTemplatesBuildJobSource',
+    ]
+
+from zope.interface import Interface
+
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.code.interfaces.branchjob import IBranchJob
+
+
+class ITranslationTemplatesBuildJob(IBranchJob, IBuildFarmJob):
+    """Build-farm job type for generating translation templates."""
+
+
+class ITranslationTemplatesBuildJobSource(Interface):
+    """Container for `ITranslationTemplatesBuildJob`s."""
+
+    def create(branch):
+        """Create new `ITranslationTemplatesBuildJob`.
+
+        Also creates the matching `IBuildQueue` and `IJob`.
+
+        :param branch: A `Branch` that this job will check out and
+            generate templates for.
+        :return: A new `ITranslationTemplatesBuildJob`.
+        """
+
+    def getForJob(job):
+        """Find `ITranslationTemplatesBuildJob` matching given `Job`."""

=== added file 'lib/lp/translations/model/translationtemplatesbuildbehavior.py'
--- lib/lp/translations/model/translationtemplatesbuildbehavior.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/model/translationtemplatesbuildbehavior.py	2010-01-13 03:21:24 +0000
@@ -0,0 +1,79 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""An `IBuildFarmJobBehavior` for `TranslationTemplatesBuildJob`.
+
+Dispatches translation template build jobs to build-farm slaves.
+"""
+
+__metaclass__ = type
+__all__ = [
+    'TranslationTemplatesBuildBehavior',
+    ]
+
+import socket
+import xmlrpclib
+
+from zope.component import getUtility
+from zope.interface import implements
+
+from canonical.launchpad.interfaces import ILaunchpadCelebrities
+
+from lp.buildmaster.interfaces.buildfarmjobbehavior import (
+    IBuildFarmJobBehavior)
+from lp.buildmaster.model.buildfarmjobbehavior import (
+    BuildFarmJobBehaviorBase)
+from lp.soyuz.interfaces.builder import BuildSlaveFailure
+from lp.translations.interfaces.translationtemplatesbuildjob import (
+    ITranslationTemplatesBuildJobSource)
+
+
+class TranslationTemplatesBuildBehavior(BuildFarmJobBehaviorBase):
+    """Dispatches `TranslationTemplateBuildJob`s to slaves."""
+    implements(IBuildFarmJobBehavior)
+
+    # Identify the type of job to the slave.
+    build_type = 'translation-templates'
+
+    def dispatchBuildToSlave(self, build_queue_item, logger):
+        """See `IBuildFarmJobBehavior`."""
+        # XXX JeroenVermeulen 2009-12-24 bug=500110: This method is not
+        # covered by tests yet.  Either unify it with Soyuz code into a
+        # generalised method, or test it.
+        templatesbuildjob = self._findTranslationTemplatesBuildJob(
+            build_queue_item)
+        chroot = self._getChroot()
+        chroot_sha1 = chroot.content.sha1
+        self._builder.cacheFileOnSlave(logger, chroot)
+        buildid = templatesbuildjob.getName()
+
+        args = { 'branch_url': build_queue_item.branch.url }
+        filemap = {}
+
+        try:
+            status, info = self._builder.slave.build(
+                buildid, self.build_type, chroot_sha1, filemap, args)
+        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
+
+    def _getChroot(self):
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        return ubuntu.currentseries.nominatedarchindep.getChroot()
+
+    def _findTranslationTemplatesBuildJob(self, build_queue_item):
+        """Find the `TranslationTemplatesBuildJob` for a job.
+
+        :param build_queue_item: A `BuildQueue` entry.
+        :return: The matching `TranslationTemplatesBuildJob`.
+        """
+        jobsource = getUtility(ITranslationTemplatesBuildJobSource)
+        return jobsource.getForJob(build_queue_item.job)

=== added file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-01-13 03:21:24 +0000
@@ -0,0 +1,85 @@
+# Copyright 2010 Canonical Ltd. This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+__all__ = [
+    'TranslationTemplatesBuildJob',
+    ]
+
+import re
+from datetime import timedelta
+
+from zope.component import getUtility
+from zope.interface import classProvides, implements
+
+from canonical.launchpad.webapp.interfaces import (
+    DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, MASTER_FLAVOR)
+
+from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.model.buildfarmjob import BuildFarmJob
+from lp.code.model.branchjob import BranchJob, BranchJobDerived, BranchJobType
+from lp.soyuz.model.buildqueue import BuildQueue
+from lp.translations.interfaces.translationtemplatesbuildjob import (
+    ITranslationTemplatesBuildJob, ITranslationTemplatesBuildJobSource)
+
+
+class TranslationTemplatesBuildJob(BranchJobDerived, BuildFarmJob):
+    """An `IBuildFarmJob` implementation that generates templates.
+
+    Implementation-wise, this is actually a `BranchJob`.
+    """
+    implements(ITranslationTemplatesBuildJob)
+    classProvides(ITranslationTemplatesBuildJobSource)
+
+    duration_estimate = timedelta(seconds=10)
+
+    unsafe_chars = '[^a-zA-Z0-9_+-]'
+
+    def __init__(self, branch_job):
+        super(TranslationTemplatesBuildJob, self).__init__(branch_job)
+
+    def score(self):
+        """See `IBuildFarmJob`."""
+        # Hard-code score for now; anything other than 1000 is probably
+        # inappropriate.
+        return 1000
+
+    def getLogFileName(self):
+        """See `IBuildFarmJob`."""
+        sanitized_name = re.sub(self.unsafe_chars, '_', self.getName())
+        return "translationtemplates_%s" % sanitized_name
+
+    def getName(self):
+        """See `IBuildFarmJob`."""
+        return '%s-%d' % (self.branch.name, self.job.id)
+
+    @classmethod
+    def create(cls, branch):
+        """See `ITranslationTemplatesBuildJobSource`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, MASTER_FLAVOR)
+
+        # We don't have any JSON metadata for this BranchJob type.
+        metadata = {}
+        branch_job = BranchJob(
+            branch, BranchJobType.TRANSLATION_TEMPLATES_BUILD, metadata)
+        store.add(branch_job)
+        specific_job = TranslationTemplatesBuildJob(branch_job)
+
+        duration_estimate = cls.duration_estimate
+        build_queue_entry = BuildQueue(
+            estimated_duration=duration_estimate,
+            job_type=BuildFarmJobType.TRANSLATIONTEMPLATESBUILD,
+            job=specific_job.job.id)
+        store.add(build_queue_entry)
+
+        return specific_job
+
+    @classmethod
+    def getForJob(cls, job):
+        """See `ITranslationTemplatesBuildJobSource`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        branch_job = store.find(BranchJob, BranchJob.job == job).one()
+        if branch_job is None:
+            return None
+        else:
+            return cls(branch_job)

=== added file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	1970-01-01 00:00:00 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-01-13 03:21:24 +0000
@@ -0,0 +1,132 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from unittest import TestLoader
+
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.launchpad.interfaces import (
+    ILaunchpadCelebrities, ILibraryFileAliasSet)
+from canonical.launchpad.webapp.testing import verifyObject
+from canonical.testing import ZopelessDatabaseLayer
+
+from lp.testing import TestCaseWithFactory
+
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
+from lp.buildmaster.interfaces.buildfarmjobbehavior import (
+    IBuildFarmJobBehavior)
+from lp.services.job.model.job import Job
+from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
+from lp.soyuz.model.buildqueue import BuildQueue
+from lp.translations.interfaces.translationtemplatesbuildjob import (
+    ITranslationTemplatesBuildJob, ITranslationTemplatesBuildJobSource)
+
+
+def get_job_id(job):
+    """Peek inside a `Job` and retrieve its id."""
+    return removeSecurityProxy(job).id
+
+
+class TestTranslationTemplatesBuildJob(TestCaseWithFactory):
+    """Test `TranslationTemplatesBuildJob`."""
+
+    layer = ZopelessDatabaseLayer
+
+    def setUp(self):
+        super(TestTranslationTemplatesBuildJob, self).setUp()
+        self.jobset = getUtility(ITranslationTemplatesBuildJobSource)
+        self.branch = self.factory.makeBranch()
+        self.specific_job = self.jobset.create(self.branch)
+
+    def test_new_TranslationTemplatesBuildJob(self):
+        # TranslationTemplateBuildJob implements IBuildFarmJob and
+        # ITranslationTemplatesBuildJob.
+        verifyObject(IBuildFarmJob, self.specific_job)
+        verifyObject(ITranslationTemplatesBuildJob, self.specific_job)
+
+        # The class also implements a utility.
+        verifyObject(ITranslationTemplatesBuildJobSource, self.jobset)
+
+        # Each of these jobs knows the branch it will operate on.
+        self.assertEqual(self.branch, self.specific_job.branch)
+
+    def test_has_Job(self):
+        # Associated with each TranslationTemplateBuildJob is a Job.
+        base_job = self.specific_job.job
+        self.assertIsInstance(base_job, Job)
+
+        # From a Job, the TranslationTemplatesBuildJobSource can find the
+        # TranslationTemplatesBuildJob back for us.
+        specific_job_for_base_job = removeSecurityProxy(
+            self.jobset.getForJob(base_job))
+        self.assertEqual(self.specific_job, specific_job_for_base_job)
+
+    def test_has_BuildQueue(self):
+        # There's also a BuildQueue item associated with the job.
+        queueset = getUtility(IBuildQueueSet)
+        job_id = get_job_id(self.specific_job.job)
+        buildqueue = queueset.get(job_id)
+
+        self.assertIsInstance(buildqueue, BuildQueue)
+        self.assertEqual(job_id, get_job_id(buildqueue.job))
+
+    def test_getName(self):
+        # Each job gets a unique name.
+        other_job = self.jobset.create(self.branch)
+        self.assertNotEqual(self.specific_job.getName(), other_job.getName())
+
+    def test_getLogFileName(self):
+        # Each job has a unique log file name.
+        other_job = self.jobset.create(self.branch)
+        self.assertNotEqual(
+            self.specific_job.getLogFileName(), other_job.getLogFileName())
+
+    def test_score(self):
+        # For now, these jobs always score themselves at 1,000.  In the
+        # future however the scoring system is to be revisited.
+        self.assertEqual(1000, self.specific_job.score())
+
+
+class TestTranslationTemplatesBuildBehavior(TestCaseWithFactory):
+    """Test `TranslationTemplatesBuildBehavior`."""
+
+    layer = ZopelessDatabaseLayer
+
+    def setUp(self):
+        super(TestTranslationTemplatesBuildBehavior, self).setUp()
+        self.jobset = getUtility(ITranslationTemplatesBuildJobSource)
+        self.branch = self.factory.makeBranch()
+        self.specific_job = self.jobset.create(self.branch)
+        self.behavior = IBuildFarmJobBehavior(self.specific_job)
+
+    def test_getChroot(self):
+        # _getChroot produces the current chroot for the current Ubuntu
+        # release, on the nominated architecture for
+        # architecture-independent builds.
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        current_ubuntu = ubuntu.currentseries
+        distroarchseries = current_ubuntu.nominatedarchindep
+
+        # Set an arbitrary chroot file.
+        fake_chroot_file = getUtility(ILibraryFileAliasSet)[1]
+        distroarchseries.addOrUpdateChroot(fake_chroot_file)
+
+        chroot = self.behavior._getChroot()
+
+        self.assertNotEqual(None, chroot)
+        self.assertEqual(fake_chroot_file, chroot)
+
+    def test_findTranslationTemplatesBuildJob(self):
+        job = self.specific_job.job
+        job_id = removeSecurityProxy(job).id
+        buildqueue = getUtility(IBuildQueueSet).get(job_id)
+        specific_job_for_buildqueue = removeSecurityProxy(
+            self.behavior._findTranslationTemplatesBuildJob(buildqueue))
+        self.assertEqual(self.specific_job, specific_job_for_buildqueue)
+
+
+def test_suite():
+    return TestLoader().loadTestsFromName(__name__)

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2009-12-02 02:46:05 +0000
+++ utilities/sourcedeps.conf	2010-01-13 03:21:24 +0000
@@ -8,7 +8,7 @@
 lpreview lp:~launchpad-pqm/bzr-lpreview/devel;revno=23
 mailman lp:~launchpad-pqm/mailman/2.1;revno=976
 old_xmlplus lp:~launchpad/dtdparser/trunk;revno=4
-pygettextpo lp:~launchpad/pygettextpo/trunk;revno=23
+pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=23
 pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=48
 subunit lp:~launchpad-pqm/subunit/trunk;revno=61
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040