Launchpad itself

Merge lp:~stevenk/launchpad/db-clean-up-lint-idsjob into lp:launchpad/db-devel

  1. db-clean-up-lint-idsjob
  2. Merge into db-devel
Proposed by Steve Kowalik
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 9795
Proposed branch: lp:~stevenk/launchpad/db-clean-up-lint-idsjob
Merge into: lp:launchpad/db-devel
Diff against target: 144 lines (+16/-21)
4 files modified
lib/lp/soyuz/interfaces/distributionjob.py (+7/-8)
lib/lp/soyuz/model/distributionjob.py (+5/-6)
lib/lp/soyuz/model/initialisedistroseriesjob.py (+0/-3)
lib/lp/soyuz/tests/test_initialisedistroseriesjob.py (+4/-4)
To merge this branch: bzr merge lp:~stevenk/launchpad/db-clean-up-lint-idsjob
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+35621@code.launchpad.net

Commit message

Lint clean up for DistributionJob/InitialiseDistroSeriesJob.

Description of the change

This branch just cleans up lint for the InitialiseDistroSeriesJob/DistributionJob code I landed earlier.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

doit

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/soyuz/interfaces/distributionjob.py'
--- lib/lp/soyuz/interfaces/distributionjob.py 2010-09-01 07:58:43 +0000
+++ lib/lp/soyuz/interfaces/distributionjob.py 2010-09-16 01:43:12 +0000
@@ -13,7 +13,7 @@
13from lazr.enum import DBEnumeratedType, DBItem13from lazr.enum import DBEnumeratedType, DBItem
14from zope.interface import Attribute, Interface14from zope.interface import Attribute, Interface
15from zope.schema import Int, Object15from zope.schema import Int, Object
16 16
17from canonical.launchpad import _17from canonical.launchpad import _
1818
19from lp.services.job.interfaces.job import IJob, IJobSource, IRunnableJob19from lp.services.job.interfaces.job import IJob, IJobSource, IRunnableJob
@@ -23,10 +23,10 @@
2323
24class IDistributionJob(Interface):24class IDistributionJob(Interface):
25 """A Job that initialises acts on a distribution."""25 """A Job that initialises acts on a distribution."""
26 26
27 id = Int(27 id = Int(
28 title=_('DB ID'), required=True, readonly=True, 28 title=_('DB ID'), required=True, readonly=True,
29 description=_("The tracking number for this job.")) 29 description=_("The tracking number for this job."))
3030
31 distribution = Object(31 distribution = Object(
32 title=_('The Distribution this job is about.'),32 title=_('The Distribution this job is about.'),
@@ -37,9 +37,9 @@
37 schema=IDistroSeries, required=False)37 schema=IDistroSeries, required=False)
3838
39 job = Object(39 job = Object(
40 title=_('The common Job attributes'), schema=IJob, required=True) 40 title=_('The common Job attributes'), schema=IJob, required=True)
41 41
42 metadata = Attribute('A dict of data about the job.') 42 metadata = Attribute('A dict of data about the job.')
4343
44 def destroySelf():44 def destroySelf():
45 """Destroy this object."""45 """Destroy this object."""
@@ -64,4 +64,3 @@
6464
65class IInitialiseDistroSeriesJob(IRunnableJob):65class IInitialiseDistroSeriesJob(IRunnableJob):
66 """A Job that performs actions on a distribution."""66 """A Job that performs actions on a distribution."""
67
6867
=== modified file 'lib/lp/soyuz/model/distributionjob.py'
--- lib/lp/soyuz/model/distributionjob.py 2010-09-03 07:05:50 +0000
+++ lib/lp/soyuz/model/distributionjob.py 2010-09-16 01:43:12 +0000
@@ -13,14 +13,14 @@
13from storm.base import Storm13from storm.base import Storm
14from storm.locals import And, Int, Reference, Unicode14from storm.locals import And, Int, Reference, Unicode
1515
16from zope.component import getUtility16from zope.interface import implements
17from zope.interface import classProvides, implements
1817
19from canonical.database.enumcol import EnumCol18from canonical.database.enumcol import EnumCol
20from canonical.launchpad.interfaces.lpstorm import IStore19from canonical.launchpad.interfaces.lpstorm import IStore
2120
22from lazr.delegates import delegates21from lazr.delegates import delegates
23 22
23from lp.app.errors import NotFoundError
24from lp.registry.model.distribution import Distribution24from lp.registry.model.distribution import Distribution
25from lp.registry.model.distroseries import DistroSeries25from lp.registry.model.distroseries import DistroSeries
26from lp.soyuz.interfaces.distributionjob import (26from lp.soyuz.interfaces.distributionjob import (
@@ -80,12 +80,12 @@
8080
81 :return: the DistributionJob with the specified id, as81 :return: the DistributionJob with the specified id, as
82 the current DistributionJobDerived subclass.82 the current DistributionJobDerived subclass.
83 :raises: SQLObjectNotFound if there is no job with the specified id,83 :raises: NotFoundError if there is no job with the specified id,
84 or its job_type does not match the desired subclass.84 or its job_type does not match the desired subclass.
85 """85 """
86 job = DistributionJob.get(job_id)86 job = DistributionJob.get(job_id)
87 if job.job_type != cls.class_job_type:87 if job.job_type != cls.class_job_type:
88 raise SQLObjectNotFound(88 raise NotFoundError(
89 'No object found with id %d and type %s' % (job_id,89 'No object found with id %d and type %s' % (job_id,
90 cls.class_job_type.title))90 cls.class_job_type.title))
91 return cls(job)91 return cls(job)
@@ -110,4 +110,3 @@
110 ('distribution_job_type', self.context.job_type.title),110 ('distribution_job_type', self.context.job_type.title),
111 ])111 ])
112 return vars112 return vars
113
114113
=== modified file 'lib/lp/soyuz/model/initialisedistroseriesjob.py'
--- lib/lp/soyuz/model/initialisedistroseriesjob.py 2010-09-03 07:05:50 +0000
+++ lib/lp/soyuz/model/initialisedistroseriesjob.py 2010-09-16 01:43:12 +0000
@@ -7,12 +7,10 @@
7 "InitialiseDistroSeriesJob",7 "InitialiseDistroSeriesJob",
8]8]
99
10from zope.component import getUtility
11from zope.interface import classProvides, implements10from zope.interface import classProvides, implements
1211
13from canonical.launchpad.interfaces.lpstorm import IMasterStore12from canonical.launchpad.interfaces.lpstorm import IMasterStore
1413
15from lp.services.job.model.job import Job
16from lp.soyuz.interfaces.distributionjob import (14from lp.soyuz.interfaces.distributionjob import (
17 DistributionJobType,15 DistributionJobType,
18 IInitialiseDistroSeriesJob,16 IInitialiseDistroSeriesJob,
@@ -48,4 +46,3 @@
48 ids = InitialiseDistroSeries(self.distroseries)46 ids = InitialiseDistroSeries(self.distroseries)
49 ids.check()47 ids.check()
50 ids.initialise()48 ids.initialise()
51
5249
=== modified file 'lib/lp/soyuz/tests/test_initialisedistroseriesjob.py'
--- lib/lp/soyuz/tests/test_initialisedistroseriesjob.py 2010-09-03 07:05:50 +0000
+++ lib/lp/soyuz/tests/test_initialisedistroseriesjob.py 2010-09-16 01:43:12 +0000
@@ -18,7 +18,7 @@
1818
19class InitialiseDistroSeriesJobTests(TestCaseWithFactory):19class InitialiseDistroSeriesJobTests(TestCaseWithFactory):
20 """Test case for InitialiseDistroSeriesJob."""20 """Test case for InitialiseDistroSeriesJob."""
21 21
22 layer = LaunchpadZopelessLayer22 layer = LaunchpadZopelessLayer
2323
24 def test_getOopsVars(self):24 def test_getOopsVars(self):
@@ -35,12 +35,12 @@
35 def _getJobs(self):35 def _getJobs(self):
36 """Return the pending InitialiseDistroSeriesJobs as a list."""36 """Return the pending InitialiseDistroSeriesJobs as a list."""
37 return list(InitialiseDistroSeriesJob.iterReady())37 return list(InitialiseDistroSeriesJob.iterReady())
38 38
39 def _getJobCount(self):39 def _getJobCount(self):
40 """Return the number of InitialiseDistroSeriesJobs in the40 """Return the number of InitialiseDistroSeriesJobs in the
41 queue."""41 queue."""
42 return len(self._getJobs())42 return len(self._getJobs())
43 43
44 def test_create_only_creates_one(self):44 def test_create_only_creates_one(self):
45 distroseries = self.factory.makeDistroSeries()45 distroseries = self.factory.makeDistroSeries()
46 # If there's already a InitialiseDistroSeriesJob for a46 # If there's already a InitialiseDistroSeriesJob for a
@@ -49,7 +49,7 @@
49 job = getUtility(IInitialiseDistroSeriesJobSource).create(49 job = getUtility(IInitialiseDistroSeriesJobSource).create(
50 distroseries)50 distroseries)
51 transaction.commit()51 transaction.commit()
52 52
53 # There will now be one job in the queue.53 # There will now be one job in the queue.
54 self.assertEqual(1, self._getJobCount())54 self.assertEqual(1, self._getJobCount())
5555

Subscribers

People subscribed via source and target branches

to status/vote changes: