Launchpad itself

Merge lp:~jtv/launchpad/buildfarmjob-getspecificjob-translationtemplatesbuild into lp:launchpad/db-devel

  1. buildfarmjob-getspecificjob-translationtemplatesbuild
  2. Merge into db-devel
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 9793
Proposed branch: lp:~jtv/launchpad/buildfarmjob-getspecificjob-translationtemplatesbuild
Merge into: lp:launchpad/db-devel
Prerequisite: lp:~jtv/launchpad/translationtemplatesbuild
Diff against target: 77 lines (+26/-0)
3 files modified
lib/lp/translations/configure.zcml (+6/-0)
lib/lp/translations/model/translationtemplatesbuild.py (+10/-0)
lib/lp/translations/tests/test_translationtemplatesbuild.py (+10/-0)
To merge this branch: bzr merge lp:~jtv/launchpad/buildfarmjob-getspecificjob-translationtemplatesbuild
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+34965@code.launchpad.net

Commit message

Make BuildFarmJob.getSpecificJob work for TranslationTemplateBuilds.

Description of the change

= BuildFarmJob.getSpecificJob for TranslationTemplatesBuild =

Completes the work on today's update of the Translations buildfarm classes to the current model: make sure BuildFarmJob.getSpecificJob works for TranslationTemplateBuild objects.

Jeroen

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

Great, thanks Jeroen. If you haven't already, (or maybe as part of your QA), please ensure it displays as you'd expect in the builder history pages.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml 2010-09-10 11:51:15 +0000
+++ lib/lp/translations/configure.zcml 2010-09-10 11:51:17 +0000
@@ -609,6 +609,12 @@
609 component="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"609 component="lp.translations.model.translationtemplatesbuildjob.TranslationTemplatesBuildJob"
610 provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"610 provides="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"
611 name="TRANSLATIONTEMPLATESBUILD"/>611 name="TRANSLATIONTEMPLATESBUILD"/>
612 <adapter
613 provides="lp.buildmaster.interfaces.buildfarmjob.ISpecificBuildFarmJob"
614 for="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"
615 factory="lp.translations.model.translationtemplatesbuild.get_translation_templates_build_for_build_farm_job"
616 name="TRANSLATIONTEMPLATESBUILD"
617 permission="zope.Public"/>
612618
613 <!-- TranslationTemplatesBuild -->619 <!-- TranslationTemplatesBuild -->
614 <class620 <class
615621
=== modified file 'lib/lp/translations/model/translationtemplatesbuild.py'
--- lib/lp/translations/model/translationtemplatesbuild.py 2010-09-10 11:51:15 +0000
+++ lib/lp/translations/model/translationtemplatesbuild.py 2010-09-10 11:51:17 +0000
@@ -13,10 +13,12 @@
13 Reference,13 Reference,
14 Storm,14 Storm,
15 )15 )
16from storm.store import Store
16from zope.interface import (17from zope.interface import (
17 classProvides,18 classProvides,
18 implements,19 implements,
19 )20 )
21from zope.security.proxy import ProxyFactory
2022
21from canonical.launchpad.interfaces.lpstorm import IMasterStore23from canonical.launchpad.interfaces.lpstorm import IMasterStore
22from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived24from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived
@@ -69,3 +71,11 @@
69 self.branch, BranchJobType.TRANSLATION_TEMPLATES_BUILD, metadata)71 self.branch, BranchJobType.TRANSLATION_TEMPLATES_BUILD, metadata)
70 store.add(branch_job)72 store.add(branch_job)
71 return TranslationTemplatesBuildJob(branch_job)73 return TranslationTemplatesBuildJob(branch_job)
74
75
76def get_translation_templates_build_for_build_farm_job(build_farm_job):
77 """Return a `TranslationTemplatesBuild` from its `BuildFarmJob`."""
78 build = Store.of(build_farm_job).find(
79 TranslationTemplatesBuild,
80 TranslationTemplatesBuild.build_farm_job == build_farm_job).one()
81 return ProxyFactory(build)
7282
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuild.py'
--- lib/lp/translations/tests/test_translationtemplatesbuild.py 2010-09-10 11:51:15 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuild.py 2010-09-10 11:51:17 +0000
@@ -14,6 +14,7 @@
14from lp.buildmaster.interfaces.buildfarmjob import (14from lp.buildmaster.interfaces.buildfarmjob import (
15 IBuildFarmJob,15 IBuildFarmJob,
16 IBuildFarmJobSource,16 IBuildFarmJobSource,
17 ISpecificBuildFarmJob,
17 )18 )
18from lp.testing import TestCaseWithFactory19from lp.testing import TestCaseWithFactory
19from lp.translations.interfaces.translationtemplatesbuild import (20from lp.translations.interfaces.translationtemplatesbuild import (
@@ -52,6 +53,7 @@
5253
53 self.assertTrue(verifyObject(ITranslationTemplatesBuild, build))54 self.assertTrue(verifyObject(ITranslationTemplatesBuild, build))
54 self.assertTrue(verifyObject(IBuildFarmJob, build))55 self.assertTrue(verifyObject(IBuildFarmJob, build))
56 self.assertTrue(verifyObject(ISpecificBuildFarmJob, build))
55 self.assertEqual(build_farm_job, build.build_farm_job)57 self.assertEqual(build_farm_job, build.build_farm_job)
56 self.assertEqual(branch, build.branch)58 self.assertEqual(branch, build.branch)
5759
@@ -64,3 +66,11 @@
6466
65 translationtemplatesbuildjob = jobset.create(branch)67 translationtemplatesbuildjob = jobset.create(branch)
66 self.assertNotEqual(None, self._findBuildForBranch(branch))68 self.assertNotEqual(None, self._findBuildForBranch(branch))
69
70 def test_getSpecificJob(self):
71 source = getUtility(ITranslationTemplatesBuildSource)
72 build_farm_job = self._makeBuildFarmJob()
73 branch = self.factory.makeBranch()
74 build = source.create(build_farm_job, branch)
75
76 self.assertEqual(build, build_farm_job.getSpecificJob())

Subscribers

People subscribed via source and target branches

to status/vote changes: