Launchpad itself

Merge lp:~thumper/launchpad/rename-created-job into lp:launchpad

  1. rename-created-job
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: 11758
Proposed branch: lp:~thumper/launchpad/rename-created-job
Merge into: lp:launchpad
Diff against target: 331 lines (+57/-57)
7 files modified
lib/lp/code/configure.zcml (+5/-5)
lib/lp/code/interfaces/branchmergeproposal.py (+9/-9)
lib/lp/code/mail/tests/test_codehandler.py (+2/-2)
lib/lp/code/model/branchmergeproposaljob.py (+17/-18)
lib/lp/code/model/tests/test_branchmergeproposal.py (+2/-2)
lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+19/-19)
lib/lp/code/subscribers/branchmergeproposal.py (+3/-2)
To merge this branch: bzr merge lp:~thumper/launchpad/rename-created-job
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+38681@code.launchpad.net

Description of the change

Incremental change to rename the jobs to reflect what they are really doing.

Nothing exciting here.

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

Looks fine to me; will it affect scriptactivity?

-Rob

Revision history for this message
Tim Penhey (thumper) wrote :

On Mon, 18 Oct 2010 16:31:06 you wrote:
> Looks fine to me; will it affect scriptactivity?

No, because this is a class only rename, not renaming any scripts in any way.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

boooring!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/configure.zcml'
2--- lib/lp/code/configure.zcml 2010-10-06 11:46:51 +0000
3+++ lib/lp/code/configure.zcml 2010-10-18 02:41:45 +0000
4@@ -289,14 +289,14 @@
5 <allow interface="lp.code.interfaces.branchmergeproposal.ICreateMergeProposalJobSource"/>
6 </securedutility>
7
8- <class class="lp.code.model.branchmergeproposaljob.MergeProposalCreatedJob">
9+ <class class="lp.code.model.branchmergeproposaljob.MergeProposalNeedsReviewEmailJob">
10 <allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob"/>
11- <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJob"/>
12+ <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJob"/>
13 </class>
14 <securedutility
15- component="lp.code.model.branchmergeproposaljob.MergeProposalCreatedJob"
16- provides="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJobSource">
17- <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJobSource"/>
18+ component="lp.code.model.branchmergeproposaljob.MergeProposalNeedsReviewEmailJob"
19+ provides="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource">
20+ <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource"/>
21 </securedutility>
22
23 <securedutility
24
25=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
26--- lib/lp/code/interfaces/branchmergeproposal.py 2010-10-07 00:51:29 +0000
27+++ lib/lp/code/interfaces/branchmergeproposal.py 2010-10-18 02:41:45 +0000
28@@ -17,8 +17,8 @@
29 'ICodeReviewCommentEmailJobSource',
30 'ICreateMergeProposalJob',
31 'ICreateMergeProposalJobSource',
32- 'IMergeProposalCreatedJob',
33- 'IMergeProposalCreatedJobSource',
34+ 'IMergeProposalNeedsReviewEmailJob',
35+ 'IMergeProposalNeedsReviewEmailJobSource',
36 'IMergeProposalUpdatedEmailJob',
37 'IMergeProposalUpdatedEmailJobSource',
38 'IReviewRequestedEmailJob',
39@@ -633,15 +633,15 @@
40 """Return a CreateMergeProposalJob for this message."""
41
42
43-class IMergeProposalCreatedJob(IRunnableJob):
44- """Interface for review diffs."""
45-
46-
47-class IMergeProposalCreatedJobSource(Interface):
48- """Interface for acquiring MergeProposalCreatedJobs."""
49+class IMergeProposalNeedsReviewEmailJob(IRunnableJob):
50+ """Email about a merge proposal needing a review.."""
51+
52+
53+class IMergeProposalNeedsReviewEmailJobSource(Interface):
54+ """Interface for acquiring MergeProposalNeedsReviewEmailJobs."""
55
56 def create(bmp):
57- """Create a MergeProposalCreatedJob for the specified Job."""
58+ """Create a needs review email job for the specified proposal."""
59
60
61 class IUpdatePreviewDiffJob(IRunnableJob):
62
63=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
64--- lib/lp/code/mail/tests/test_codehandler.py 2010-10-04 19:50:45 +0000
65+++ lib/lp/code/mail/tests/test_codehandler.py 2010-10-18 02:41:45 +0000
66@@ -64,7 +64,7 @@
67 BranchMergeProposalJob,
68 BranchMergeProposalJobType,
69 CreateMergeProposalJob,
70- MergeProposalCreatedJob,
71+ MergeProposalNeedsReviewEmailJob,
72 )
73 from lp.code.model.diff import PreviewDiff
74 from lp.codehosting.vfs import get_lp_server
75@@ -567,7 +567,7 @@
76 messages = pop_notifications()
77 self.assertEqual(0, len(messages))
78 # Only a job created.
79- runner = JobRunner.fromReady(MergeProposalCreatedJob)
80+ runner = JobRunner.fromReady(MergeProposalNeedsReviewEmailJob)
81 self.assertEqual(1, len(list(runner.jobs)))
82 transaction.commit()
83
84
85=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
86--- lib/lp/code/model/branchmergeproposaljob.py 2010-08-20 20:31:18 +0000
87+++ lib/lp/code/model/branchmergeproposaljob.py 2010-10-18 02:41:45 +0000
88@@ -22,7 +22,7 @@
89 'BranchMergeProposalJobType',
90 'CodeReviewCommentEmailJob',
91 'CreateMergeProposalJob',
92- 'MergeProposalCreatedJob',
93+ 'MergeProposalNeedsReviewEmailJob',
94 'MergeProposalUpdatedEmailJob',
95 'ReviewRequestedEmailJob',
96 'UpdatePreviewDiffJob',
97@@ -86,8 +86,8 @@
98 ICodeReviewCommentEmailJobSource,
99 ICreateMergeProposalJob,
100 ICreateMergeProposalJobSource,
101- IMergeProposalCreatedJob,
102- IMergeProposalCreatedJobSource,
103+ IMergeProposalNeedsReviewEmailJob,
104+ IMergeProposalNeedsReviewEmailJobSource,
105 IMergeProposalUpdatedEmailJob,
106 IMergeProposalUpdatedEmailJobSource,
107 IReviewRequestedEmailJob,
108@@ -114,11 +114,10 @@
109 class BranchMergeProposalJobType(DBEnumeratedType):
110 """Values that ICodeImportJob.state can take."""
111
112- MERGE_PROPOSAL_CREATED = DBItem(0, """
113- Merge proposal created
114+ MERGE_PROPOSAL_NEEDS_REVIEW = DBItem(0, """
115+ Merge proposal needs review
116
117- This job generates the review diff for a BranchMergeProposal if
118- needed, then sends mail to all interested parties.
119+ This job sends mail to all interested parties about the proposal.
120 """)
121
122 UPDATE_PREVIEW_DIFF = DBItem(1, """
123@@ -296,17 +295,17 @@
124 return vars
125
126
127-class MergeProposalCreatedJob(BranchMergeProposalJobDerived):
128- """See `IMergeProposalCreatedJob`."""
129-
130- implements(IMergeProposalCreatedJob)
131-
132- classProvides(IMergeProposalCreatedJobSource)
133-
134- class_job_type = BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED
135+class MergeProposalNeedsReviewEmailJob(BranchMergeProposalJobDerived):
136+ """See `IMergeProposalNeedsReviewEmailJob`."""
137+
138+ implements(IMergeProposalNeedsReviewEmailJob)
139+
140+ classProvides(IMergeProposalNeedsReviewEmailJobSource)
141+
142+ class_job_type = BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW
143
144 def run(self):
145- """See `IMergeProposalCreatedJob`."""
146+ """See `IMergeProposalNeedsReviewEmailJob`."""
147 mailer = BMPMailer.forCreation(
148 self.branch_merge_proposal, self.branch_merge_proposal.registrant)
149 mailer.sendAll()
150@@ -646,8 +645,8 @@
151 """Construct a derived merge proposal job for a BranchMergeProposalJob."""
152
153 job_classes = {
154- BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED:
155- MergeProposalCreatedJob,
156+ BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW:
157+ MergeProposalNeedsReviewEmailJob,
158 BranchMergeProposalJobType.UPDATE_PREVIEW_DIFF:
159 UpdatePreviewDiffJob,
160 BranchMergeProposalJobType.CODE_REVIEW_COMMENT_EMAIL:
161
162=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
163--- lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-04 19:50:45 +0000
164+++ lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-18 02:41:45 +0000
165@@ -69,7 +69,7 @@
166 from lp.code.model.branchmergeproposaljob import (
167 BranchMergeProposalJob,
168 CreateMergeProposalJob,
169- MergeProposalCreatedJob,
170+ MergeProposalNeedsReviewEmailJob,
171 UpdatePreviewDiffJob,
172 )
173 from lp.code.tests.helpers import add_revision_to_branch
174@@ -1255,7 +1255,7 @@
175 def test_deleteProposal_deletes_job(self):
176 """Deleting a branch merge proposal deletes all related jobs."""
177 proposal = self.factory.makeBranchMergeProposal()
178- job = MergeProposalCreatedJob.create(proposal)
179+ job = MergeProposalNeedsReviewEmailJob.create(proposal)
180 job.context.sync()
181 job_id = job.context.id
182 login_person(proposal.registrant)
183
184=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
185--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-04 19:50:45 +0000
186+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-18 02:41:45 +0000
187@@ -33,7 +33,7 @@
188 IBranchMergeProposalJobSource,
189 ICodeReviewCommentEmailJob,
190 ICodeReviewCommentEmailJobSource,
191- IMergeProposalCreatedJob,
192+ IMergeProposalNeedsReviewEmailJob,
193 IMergeProposalUpdatedEmailJob,
194 IMergeProposalUpdatedEmailJobSource,
195 IReviewRequestedEmailJob,
196@@ -46,7 +46,7 @@
197 BranchMergeProposalJobDerived,
198 BranchMergeProposalJobType,
199 CodeReviewCommentEmailJob,
200- MergeProposalCreatedJob,
201+ MergeProposalNeedsReviewEmailJob,
202 MergeProposalUpdatedEmailJob,
203 ReviewRequestedEmailJob,
204 UpdatePreviewDiffJob,
205@@ -68,7 +68,7 @@
206 """BranchMergeProposalJob implements expected interfaces."""
207 bmp = self.factory.makeBranchMergeProposal()
208 job = BranchMergeProposalJob(
209- bmp, BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED, {})
210+ bmp, BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW, {})
211 job.sync()
212 verifyObject(IBranchMergeProposalJob, job)
213
214@@ -87,30 +87,30 @@
215 SQLObjectNotFound is raised.
216 """
217 bmp = self.factory.makeBranchMergeProposal()
218- job = MergeProposalCreatedJob.create(bmp)
219+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
220 transaction.commit()
221 self.assertRaises(
222 AttributeError, BranchMergeProposalJobDerived.get, job.id)
223 self.assertRaises(SQLObjectNotFound, UpdatePreviewDiffJob.get, job.id)
224 self.assertRaises(
225- SQLObjectNotFound, MergeProposalCreatedJob.get, job.id + 1)
226- self.assertEqual(job, MergeProposalCreatedJob.get(job.id))
227-
228-
229-class TestMergeProposalCreatedJob(TestCaseWithFactory):
230+ SQLObjectNotFound, MergeProposalNeedsReviewEmailJob.get, job.id + 1)
231+ self.assertEqual(job, MergeProposalNeedsReviewEmailJob.get(job.id))
232+
233+
234+class TestMergeProposalNeedsReviewEmailJob(TestCaseWithFactory):
235
236 layer = LaunchpadZopelessLayer
237
238 def test_providesInterface(self):
239- """MergeProposalCreatedJob provides the expected interfaces."""
240+ """MergeProposalNeedsReviewEmailJob provides the expected interfaces."""
241 bmp = self.factory.makeBranchMergeProposal()
242- job = MergeProposalCreatedJob.create(bmp)
243- verifyObject(IMergeProposalCreatedJob, job)
244+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
245+ verifyObject(IMergeProposalNeedsReviewEmailJob, job)
246 verifyObject(IBranchMergeProposalJob, job)
247
248 def test_getOperationDescription(self):
249 bmp = self.factory.makeBranchMergeProposal()
250- job = MergeProposalCreatedJob.create(bmp)
251+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
252 self.assertTrue(
253 job.getOperationDescription().startswith(
254 'notifying people about the proposal to merge'))
255@@ -135,7 +135,7 @@
256 """MergeProposalCreationJob.run sends an email."""
257 self.useBzrBranches(direct_database=True)
258 bmp = self.createProposalWithEmptyBranches()
259- job = MergeProposalCreatedJob.create(bmp)
260+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
261 self.assertEqual([], pop_notifications())
262 job.run()
263 self.assertEqual(2, len(pop_notifications()))
264@@ -143,7 +143,7 @@
265 def test_getOopsMailController(self):
266 """The registrant is notified about merge proposal creation issues."""
267 bmp = self.factory.makeBranchMergeProposal()
268- job = MergeProposalCreatedJob.create(bmp)
269+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
270 ctrl = job.getOopsMailController('1234')
271 self.assertEqual([bmp.registrant.preferredemail.email], ctrl.to_addrs)
272 message = (
273@@ -163,7 +163,7 @@
274 tree.commit('Initial commit')
275 self.createBzrBranch(bmp.source_branch, tree.branch)
276 self.factory.makeRevisionsForBranch(bmp.source_branch, count=1)
277- job = MergeProposalCreatedJob.create(bmp)
278+ job = MergeProposalNeedsReviewEmailJob.create(bmp)
279 transaction.commit()
280 self.layer.switchDbUser(config.merge_proposal_jobs.dbuser)
281 job.run()
282@@ -178,7 +178,7 @@
283 verifyObject(IUpdatePreviewDiffJobSource, UpdatePreviewDiffJob)
284
285 def test_providesInterface(self):
286- """MergeProposalCreatedJob provides the expected interfaces."""
287+ """MergeProposalNeedsReviewEmailJob provides the expected interfaces."""
288 bmp = self.factory.makeBranchMergeProposal()
289 job = UpdatePreviewDiffJob.create(bmp)
290 verifyObject(IUpdatePreviewDiffJob, job)
291@@ -343,7 +343,7 @@
292 update_diff.complete()
293 [job] = self.job_source.iterReady()
294 self.assertEqual(job.branch_merge_proposal, bmp)
295- self.assertIsInstance(job, MergeProposalCreatedJob)
296+ self.assertIsInstance(job, MergeProposalNeedsReviewEmailJob)
297
298 def completePendingJobs(self):
299 # Mark all current pending jobs as complete
300@@ -425,7 +425,7 @@
301 verifyObject(IReviewRequestedEmailJobSource, ReviewRequestedEmailJob)
302
303 def test_providesInterface(self):
304- """MergeProposalCreatedJob provides the expected interfaces."""
305+ """ReviewRequestedEmailJob provides the expected interfaces."""
306 request = self.factory.makeCodeReviewVoteReference()
307 job = ReviewRequestedEmailJob.create(request)
308 verifyObject(IReviewRequestedEmailJob, job)
309
310=== modified file 'lib/lp/code/subscribers/branchmergeproposal.py'
311--- lib/lp/code/subscribers/branchmergeproposal.py 2010-08-20 20:31:18 +0000
312+++ lib/lp/code/subscribers/branchmergeproposal.py 2010-10-18 02:41:45 +0000
313@@ -11,7 +11,7 @@
314
315 from lp.code.adapters.branch import BranchMergeProposalDelta
316 from lp.code.interfaces.branchmergeproposal import (
317- IMergeProposalCreatedJobSource,
318+ IMergeProposalNeedsReviewEmailJobSource,
319 IMergeProposalUpdatedEmailJobSource,
320 IReviewRequestedEmailJobSource,
321 IUpdatePreviewDiffJobSource,
322@@ -27,7 +27,8 @@
323 Also create a job to email the subscribers about the new proposal.
324 """
325 getUtility(IUpdatePreviewDiffJobSource).create(merge_proposal)
326- getUtility(IMergeProposalCreatedJobSource).create(merge_proposal)
327+ getUtility(IMergeProposalNeedsReviewEmailJobSource).create(
328+ merge_proposal)
329
330
331 def merge_proposal_modified(merge_proposal, event):