Launchpad itself

Merge lp://staging/~al-maisan/launchpad/class-provides-508292 into lp://staging/launchpad/db-devel

  1. class-provides-508292
  2. Merge into db-devel
Proposed by Muharem Hrnjadovic
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~al-maisan/launchpad/class-provides-508292
Merge into: lp://staging/launchpad/db-devel
Diff against target: 59 lines (+6/-4)
4 files modified
lib/lp/buildmaster/model/buildfarmjob.py (+1/-2)
lib/lp/buildmaster/tests/test_manager.py (+2/-0)
lib/lp/soyuz/configure.zcml (+2/-0)
lib/lp/soyuz/model/buildqueue.py (+1/-2)
To merge this branch: bzr merge lp://staging/~al-maisan/launchpad/class-provides-508292
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+17527@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Muharem Hrnjadovic (al-maisan) wrote :

Fixes a few errors and missing things in the integration branch submitted earlier.

Revision history for this message
Jonathan Lange (jml) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
2--- lib/lp/buildmaster/model/buildfarmjob.py 2010-01-16 05:54:16 +0000
3+++ lib/lp/buildmaster/model/buildfarmjob.py 2010-01-16 23:48:17 +0000
4@@ -19,8 +19,7 @@
5 class BuildFarmJob:
6 """Mix-in class for `IBuildFarmJob` implementations."""
7 implements(IBuildFarmJob)
8- classProvides(IBuildFarmCandidateJobSelection)
9- classProvides(ISpecificBuildFarmJobClass)
10+ classProvides(IBuildFarmCandidateJobSelection, ISpecificBuildFarmJobClass)
11
12 def score(self):
13 """See `IBuildFarmJob`."""
14
15=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
16--- lib/lp/buildmaster/tests/test_manager.py 2010-01-11 23:43:59 +0000
17+++ lib/lp/buildmaster/tests/test_manager.py 2010-01-16 23:48:17 +0000
18@@ -494,12 +494,14 @@
19
20 def assertBuildingJob(self, job, builder, logtail=None):
21 """Assert the given job is building on the given builder."""
22+ from lp.services.job.interfaces.job import JobStatus
23 if logtail is None:
24 logtail = 'Dummy sampledata entry, not processing'
25
26 self.assertTrue(job is not None)
27 self.assertEqual(job.builder, builder)
28 self.assertTrue(job.date_started is not None)
29+ self.assertEqual(job.job.status, JobStatus.RUNNING)
30 build = getUtility(IBuildSet).getByQueueEntry(job)
31 self.assertEqual(build.buildstate, BuildStatus.BUILDING)
32 self.assertEqual(job.logtail, logtail)
33
34=== modified file 'lib/lp/soyuz/configure.zcml'
35--- lib/lp/soyuz/configure.zcml 2010-01-16 05:54:16 +0000
36+++ lib/lp/soyuz/configure.zcml 2010-01-16 23:48:17 +0000
37@@ -895,6 +895,8 @@
38 <class
39 class="lp.soyuz.model.buildpackagejob.BuildPackageJob">
40 <allow
41+ interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
42+ <allow
43 interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
44 </class>
45 <!--
46
47=== modified file 'lib/lp/soyuz/model/buildqueue.py'
48--- lib/lp/soyuz/model/buildqueue.py 2010-01-16 05:54:16 +0000
49+++ lib/lp/soyuz/model/buildqueue.py 2010-01-16 23:48:17 +0000
50@@ -68,8 +68,7 @@
51 lastscore = IntCol(dbName='lastscore', default=0)
52 manual = BoolCol(dbName='manual', default=False)
53 estimated_duration = IntervalCol()
54- processor = ForeignKey(
55- dbName='processor', foreignKey='Processor', notNull=True)
56+ processor = ForeignKey(dbName='processor', foreignKey='Processor')
57 virtualized = BoolCol(dbName='virtualized')
58
59 @property

Subscribers

People subscribed via source and target branches

to status/vote changes: