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

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

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

[Jonathan Lange (jml)]

Looks good, thanks.

review: Approve

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-01-16 05:54:16 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-01-16 23:48:17 +0000
@@ -19,8 +19,7 @@
 class BuildFarmJob:
     """Mix-in class for `IBuildFarmJob` implementations."""
     implements(IBuildFarmJob)
-    classProvides(IBuildFarmCandidateJobSelection)
-    classProvides(ISpecificBuildFarmJobClass)
+    classProvides(IBuildFarmCandidateJobSelection, ISpecificBuildFarmJobClass)
 
     def score(self):
         """See `IBuildFarmJob`."""
 
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-01-11 23:43:59 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-01-16 23:48:17 +0000
@@ -494,12 +494,14 @@
 
     def assertBuildingJob(self, job, builder, logtail=None):
         """Assert the given job is building on the given builder."""
+        from lp.services.job.interfaces.job import JobStatus
         if logtail is None:
             logtail = 'Dummy sampledata entry, not processing'
 
         self.assertTrue(job is not None)
         self.assertEqual(job.builder, builder)
         self.assertTrue(job.date_started is not None)
+        self.assertEqual(job.job.status, JobStatus.RUNNING)
         build = getUtility(IBuildSet).getByQueueEntry(job)
         self.assertEqual(build.buildstate, BuildStatus.BUILDING)
         self.assertEqual(job.logtail, logtail)
 
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-01-16 05:54:16 +0000
+++ lib/lp/soyuz/configure.zcml	2010-01-16 23:48:17 +0000
@@ -895,6 +895,8 @@
     <class
         class="lp.soyuz.model.buildpackagejob.BuildPackageJob">
         <allow
+            interface="lp.buildmaster.interfaces.buildfarmjob.IBuildFarmJob"/>
+        <allow
             interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
     </class>
     <!-- 
 
=== modified file 'lib/lp/soyuz/model/buildqueue.py'
--- lib/lp/soyuz/model/buildqueue.py	2010-01-16 05:54:16 +0000
+++ lib/lp/soyuz/model/buildqueue.py	2010-01-16 23:48:17 +0000
@@ -68,8 +68,7 @@
     lastscore = IntCol(dbName='lastscore', default=0)
     manual = BoolCol(dbName='manual', default=False)
     estimated_duration = IntervalCol()
-    processor = ForeignKey(
-        dbName='processor', foreignKey='Processor', notNull=True)
+    processor = ForeignKey(dbName='processor', foreignKey='Processor')
     virtualized = BoolCol(dbName='virtualized')
 
     @property