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
=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml 2010-10-06 11:46:51 +0000
+++ lib/lp/code/configure.zcml 2010-10-18 02:41:45 +0000
@@ -289,14 +289,14 @@
289 <allow interface="lp.code.interfaces.branchmergeproposal.ICreateMergeProposalJobSource"/>289 <allow interface="lp.code.interfaces.branchmergeproposal.ICreateMergeProposalJobSource"/>
290 </securedutility>290 </securedutility>
291291
292 <class class="lp.code.model.branchmergeproposaljob.MergeProposalCreatedJob">292 <class class="lp.code.model.branchmergeproposaljob.MergeProposalNeedsReviewEmailJob">
293 <allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob"/>293 <allow interface="lp.code.interfaces.branchmergeproposal.IBranchMergeProposalJob"/>
294 <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJob"/>294 <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJob"/>
295 </class>295 </class>
296 <securedutility296 <securedutility
297 component="lp.code.model.branchmergeproposaljob.MergeProposalCreatedJob"297 component="lp.code.model.branchmergeproposaljob.MergeProposalNeedsReviewEmailJob"
298 provides="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJobSource">298 provides="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource">
299 <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalCreatedJobSource"/>299 <allow interface="lp.code.interfaces.branchmergeproposal.IMergeProposalNeedsReviewEmailJobSource"/>
300 </securedutility>300 </securedutility>
301301
302 <securedutility302 <securedutility
303303
=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py 2010-10-07 00:51:29 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py 2010-10-18 02:41:45 +0000
@@ -17,8 +17,8 @@
17 'ICodeReviewCommentEmailJobSource',17 'ICodeReviewCommentEmailJobSource',
18 'ICreateMergeProposalJob',18 'ICreateMergeProposalJob',
19 'ICreateMergeProposalJobSource',19 'ICreateMergeProposalJobSource',
20 'IMergeProposalCreatedJob',20 'IMergeProposalNeedsReviewEmailJob',
21 'IMergeProposalCreatedJobSource',21 'IMergeProposalNeedsReviewEmailJobSource',
22 'IMergeProposalUpdatedEmailJob',22 'IMergeProposalUpdatedEmailJob',
23 'IMergeProposalUpdatedEmailJobSource',23 'IMergeProposalUpdatedEmailJobSource',
24 'IReviewRequestedEmailJob',24 'IReviewRequestedEmailJob',
@@ -633,15 +633,15 @@
633 """Return a CreateMergeProposalJob for this message."""633 """Return a CreateMergeProposalJob for this message."""
634634
635635
636class IMergeProposalCreatedJob(IRunnableJob):636class IMergeProposalNeedsReviewEmailJob(IRunnableJob):
637 """Interface for review diffs."""637 """Email about a merge proposal needing a review.."""
638638
639639
640class IMergeProposalCreatedJobSource(Interface):640class IMergeProposalNeedsReviewEmailJobSource(Interface):
641 """Interface for acquiring MergeProposalCreatedJobs."""641 """Interface for acquiring MergeProposalNeedsReviewEmailJobs."""
642642
643 def create(bmp):643 def create(bmp):
644 """Create a MergeProposalCreatedJob for the specified Job."""644 """Create a needs review email job for the specified proposal."""
645645
646646
647class IUpdatePreviewDiffJob(IRunnableJob):647class IUpdatePreviewDiffJob(IRunnableJob):
648648
=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py 2010-10-18 02:41:45 +0000
@@ -64,7 +64,7 @@
64 BranchMergeProposalJob,64 BranchMergeProposalJob,
65 BranchMergeProposalJobType,65 BranchMergeProposalJobType,
66 CreateMergeProposalJob,66 CreateMergeProposalJob,
67 MergeProposalCreatedJob,67 MergeProposalNeedsReviewEmailJob,
68 )68 )
69from lp.code.model.diff import PreviewDiff69from lp.code.model.diff import PreviewDiff
70from lp.codehosting.vfs import get_lp_server70from lp.codehosting.vfs import get_lp_server
@@ -567,7 +567,7 @@
567 messages = pop_notifications()567 messages = pop_notifications()
568 self.assertEqual(0, len(messages))568 self.assertEqual(0, len(messages))
569 # Only a job created.569 # Only a job created.
570 runner = JobRunner.fromReady(MergeProposalCreatedJob)570 runner = JobRunner.fromReady(MergeProposalNeedsReviewEmailJob)
571 self.assertEqual(1, len(list(runner.jobs)))571 self.assertEqual(1, len(list(runner.jobs)))
572 transaction.commit()572 transaction.commit()
573573
574574
=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py 2010-10-18 02:41:45 +0000
@@ -22,7 +22,7 @@
22 'BranchMergeProposalJobType',22 'BranchMergeProposalJobType',
23 'CodeReviewCommentEmailJob',23 'CodeReviewCommentEmailJob',
24 'CreateMergeProposalJob',24 'CreateMergeProposalJob',
25 'MergeProposalCreatedJob',25 'MergeProposalNeedsReviewEmailJob',
26 'MergeProposalUpdatedEmailJob',26 'MergeProposalUpdatedEmailJob',
27 'ReviewRequestedEmailJob',27 'ReviewRequestedEmailJob',
28 'UpdatePreviewDiffJob',28 'UpdatePreviewDiffJob',
@@ -86,8 +86,8 @@
86 ICodeReviewCommentEmailJobSource,86 ICodeReviewCommentEmailJobSource,
87 ICreateMergeProposalJob,87 ICreateMergeProposalJob,
88 ICreateMergeProposalJobSource,88 ICreateMergeProposalJobSource,
89 IMergeProposalCreatedJob,89 IMergeProposalNeedsReviewEmailJob,
90 IMergeProposalCreatedJobSource,90 IMergeProposalNeedsReviewEmailJobSource,
91 IMergeProposalUpdatedEmailJob,91 IMergeProposalUpdatedEmailJob,
92 IMergeProposalUpdatedEmailJobSource,92 IMergeProposalUpdatedEmailJobSource,
93 IReviewRequestedEmailJob,93 IReviewRequestedEmailJob,
@@ -114,11 +114,10 @@
114class BranchMergeProposalJobType(DBEnumeratedType):114class BranchMergeProposalJobType(DBEnumeratedType):
115 """Values that ICodeImportJob.state can take."""115 """Values that ICodeImportJob.state can take."""
116116
117 MERGE_PROPOSAL_CREATED = DBItem(0, """117 MERGE_PROPOSAL_NEEDS_REVIEW = DBItem(0, """
118 Merge proposal created118 Merge proposal needs review
119119
120 This job generates the review diff for a BranchMergeProposal if120 This job sends mail to all interested parties about the proposal.
121 needed, then sends mail to all interested parties.
122 """)121 """)
123122
124 UPDATE_PREVIEW_DIFF = DBItem(1, """123 UPDATE_PREVIEW_DIFF = DBItem(1, """
@@ -296,17 +295,17 @@
296 return vars295 return vars
297296
298297
299class MergeProposalCreatedJob(BranchMergeProposalJobDerived):298class MergeProposalNeedsReviewEmailJob(BranchMergeProposalJobDerived):
300 """See `IMergeProposalCreatedJob`."""299 """See `IMergeProposalNeedsReviewEmailJob`."""
301300
302 implements(IMergeProposalCreatedJob)301 implements(IMergeProposalNeedsReviewEmailJob)
303302
304 classProvides(IMergeProposalCreatedJobSource)303 classProvides(IMergeProposalNeedsReviewEmailJobSource)
305304
306 class_job_type = BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED305 class_job_type = BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW
307306
308 def run(self):307 def run(self):
309 """See `IMergeProposalCreatedJob`."""308 """See `IMergeProposalNeedsReviewEmailJob`."""
310 mailer = BMPMailer.forCreation(309 mailer = BMPMailer.forCreation(
311 self.branch_merge_proposal, self.branch_merge_proposal.registrant)310 self.branch_merge_proposal, self.branch_merge_proposal.registrant)
312 mailer.sendAll()311 mailer.sendAll()
@@ -646,8 +645,8 @@
646 """Construct a derived merge proposal job for a BranchMergeProposalJob."""645 """Construct a derived merge proposal job for a BranchMergeProposalJob."""
647646
648 job_classes = {647 job_classes = {
649 BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED:648 BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW:
650 MergeProposalCreatedJob,649 MergeProposalNeedsReviewEmailJob,
651 BranchMergeProposalJobType.UPDATE_PREVIEW_DIFF:650 BranchMergeProposalJobType.UPDATE_PREVIEW_DIFF:
652 UpdatePreviewDiffJob,651 UpdatePreviewDiffJob,
653 BranchMergeProposalJobType.CODE_REVIEW_COMMENT_EMAIL:652 BranchMergeProposalJobType.CODE_REVIEW_COMMENT_EMAIL:
654653
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py 2010-10-18 02:41:45 +0000
@@ -69,7 +69,7 @@
69from lp.code.model.branchmergeproposaljob import (69from lp.code.model.branchmergeproposaljob import (
70 BranchMergeProposalJob,70 BranchMergeProposalJob,
71 CreateMergeProposalJob,71 CreateMergeProposalJob,
72 MergeProposalCreatedJob,72 MergeProposalNeedsReviewEmailJob,
73 UpdatePreviewDiffJob,73 UpdatePreviewDiffJob,
74 )74 )
75from lp.code.tests.helpers import add_revision_to_branch75from lp.code.tests.helpers import add_revision_to_branch
@@ -1255,7 +1255,7 @@
1255 def test_deleteProposal_deletes_job(self):1255 def test_deleteProposal_deletes_job(self):
1256 """Deleting a branch merge proposal deletes all related jobs."""1256 """Deleting a branch merge proposal deletes all related jobs."""
1257 proposal = self.factory.makeBranchMergeProposal()1257 proposal = self.factory.makeBranchMergeProposal()
1258 job = MergeProposalCreatedJob.create(proposal)1258 job = MergeProposalNeedsReviewEmailJob.create(proposal)
1259 job.context.sync()1259 job.context.sync()
1260 job_id = job.context.id1260 job_id = job.context.id
1261 login_person(proposal.registrant)1261 login_person(proposal.registrant)
12621262
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-04 19:50:45 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py 2010-10-18 02:41:45 +0000
@@ -33,7 +33,7 @@
33 IBranchMergeProposalJobSource,33 IBranchMergeProposalJobSource,
34 ICodeReviewCommentEmailJob,34 ICodeReviewCommentEmailJob,
35 ICodeReviewCommentEmailJobSource,35 ICodeReviewCommentEmailJobSource,
36 IMergeProposalCreatedJob,36 IMergeProposalNeedsReviewEmailJob,
37 IMergeProposalUpdatedEmailJob,37 IMergeProposalUpdatedEmailJob,
38 IMergeProposalUpdatedEmailJobSource,38 IMergeProposalUpdatedEmailJobSource,
39 IReviewRequestedEmailJob,39 IReviewRequestedEmailJob,
@@ -46,7 +46,7 @@
46 BranchMergeProposalJobDerived,46 BranchMergeProposalJobDerived,
47 BranchMergeProposalJobType,47 BranchMergeProposalJobType,
48 CodeReviewCommentEmailJob,48 CodeReviewCommentEmailJob,
49 MergeProposalCreatedJob,49 MergeProposalNeedsReviewEmailJob,
50 MergeProposalUpdatedEmailJob,50 MergeProposalUpdatedEmailJob,
51 ReviewRequestedEmailJob,51 ReviewRequestedEmailJob,
52 UpdatePreviewDiffJob,52 UpdatePreviewDiffJob,
@@ -68,7 +68,7 @@
68 """BranchMergeProposalJob implements expected interfaces."""68 """BranchMergeProposalJob implements expected interfaces."""
69 bmp = self.factory.makeBranchMergeProposal()69 bmp = self.factory.makeBranchMergeProposal()
70 job = BranchMergeProposalJob(70 job = BranchMergeProposalJob(
71 bmp, BranchMergeProposalJobType.MERGE_PROPOSAL_CREATED, {})71 bmp, BranchMergeProposalJobType.MERGE_PROPOSAL_NEEDS_REVIEW, {})
72 job.sync()72 job.sync()
73 verifyObject(IBranchMergeProposalJob, job)73 verifyObject(IBranchMergeProposalJob, job)
7474
@@ -87,30 +87,30 @@
87 SQLObjectNotFound is raised.87 SQLObjectNotFound is raised.
88 """88 """
89 bmp = self.factory.makeBranchMergeProposal()89 bmp = self.factory.makeBranchMergeProposal()
90 job = MergeProposalCreatedJob.create(bmp)90 job = MergeProposalNeedsReviewEmailJob.create(bmp)
91 transaction.commit()91 transaction.commit()
92 self.assertRaises(92 self.assertRaises(
93 AttributeError, BranchMergeProposalJobDerived.get, job.id)93 AttributeError, BranchMergeProposalJobDerived.get, job.id)
94 self.assertRaises(SQLObjectNotFound, UpdatePreviewDiffJob.get, job.id)94 self.assertRaises(SQLObjectNotFound, UpdatePreviewDiffJob.get, job.id)
95 self.assertRaises(95 self.assertRaises(
96 SQLObjectNotFound, MergeProposalCreatedJob.get, job.id + 1)96 SQLObjectNotFound, MergeProposalNeedsReviewEmailJob.get, job.id + 1)
97 self.assertEqual(job, MergeProposalCreatedJob.get(job.id))97 self.assertEqual(job, MergeProposalNeedsReviewEmailJob.get(job.id))
9898
9999
100class TestMergeProposalCreatedJob(TestCaseWithFactory):100class TestMergeProposalNeedsReviewEmailJob(TestCaseWithFactory):
101101
102 layer = LaunchpadZopelessLayer102 layer = LaunchpadZopelessLayer
103103
104 def test_providesInterface(self):104 def test_providesInterface(self):
105 """MergeProposalCreatedJob provides the expected interfaces."""105 """MergeProposalNeedsReviewEmailJob provides the expected interfaces."""
106 bmp = self.factory.makeBranchMergeProposal()106 bmp = self.factory.makeBranchMergeProposal()
107 job = MergeProposalCreatedJob.create(bmp)107 job = MergeProposalNeedsReviewEmailJob.create(bmp)
108 verifyObject(IMergeProposalCreatedJob, job)108 verifyObject(IMergeProposalNeedsReviewEmailJob, job)
109 verifyObject(IBranchMergeProposalJob, job)109 verifyObject(IBranchMergeProposalJob, job)
110110
111 def test_getOperationDescription(self):111 def test_getOperationDescription(self):
112 bmp = self.factory.makeBranchMergeProposal()112 bmp = self.factory.makeBranchMergeProposal()
113 job = MergeProposalCreatedJob.create(bmp)113 job = MergeProposalNeedsReviewEmailJob.create(bmp)
114 self.assertTrue(114 self.assertTrue(
115 job.getOperationDescription().startswith(115 job.getOperationDescription().startswith(
116 'notifying people about the proposal to merge'))116 'notifying people about the proposal to merge'))
@@ -135,7 +135,7 @@
135 """MergeProposalCreationJob.run sends an email."""135 """MergeProposalCreationJob.run sends an email."""
136 self.useBzrBranches(direct_database=True)136 self.useBzrBranches(direct_database=True)
137 bmp = self.createProposalWithEmptyBranches()137 bmp = self.createProposalWithEmptyBranches()
138 job = MergeProposalCreatedJob.create(bmp)138 job = MergeProposalNeedsReviewEmailJob.create(bmp)
139 self.assertEqual([], pop_notifications())139 self.assertEqual([], pop_notifications())
140 job.run()140 job.run()
141 self.assertEqual(2, len(pop_notifications()))141 self.assertEqual(2, len(pop_notifications()))
@@ -143,7 +143,7 @@
143 def test_getOopsMailController(self):143 def test_getOopsMailController(self):
144 """The registrant is notified about merge proposal creation issues."""144 """The registrant is notified about merge proposal creation issues."""
145 bmp = self.factory.makeBranchMergeProposal()145 bmp = self.factory.makeBranchMergeProposal()
146 job = MergeProposalCreatedJob.create(bmp)146 job = MergeProposalNeedsReviewEmailJob.create(bmp)
147 ctrl = job.getOopsMailController('1234')147 ctrl = job.getOopsMailController('1234')
148 self.assertEqual([bmp.registrant.preferredemail.email], ctrl.to_addrs)148 self.assertEqual([bmp.registrant.preferredemail.email], ctrl.to_addrs)
149 message = (149 message = (
@@ -163,7 +163,7 @@
163 tree.commit('Initial commit')163 tree.commit('Initial commit')
164 self.createBzrBranch(bmp.source_branch, tree.branch)164 self.createBzrBranch(bmp.source_branch, tree.branch)
165 self.factory.makeRevisionsForBranch(bmp.source_branch, count=1)165 self.factory.makeRevisionsForBranch(bmp.source_branch, count=1)
166 job = MergeProposalCreatedJob.create(bmp)166 job = MergeProposalNeedsReviewEmailJob.create(bmp)
167 transaction.commit()167 transaction.commit()
168 self.layer.switchDbUser(config.merge_proposal_jobs.dbuser)168 self.layer.switchDbUser(config.merge_proposal_jobs.dbuser)
169 job.run()169 job.run()
@@ -178,7 +178,7 @@
178 verifyObject(IUpdatePreviewDiffJobSource, UpdatePreviewDiffJob)178 verifyObject(IUpdatePreviewDiffJobSource, UpdatePreviewDiffJob)
179179
180 def test_providesInterface(self):180 def test_providesInterface(self):
181 """MergeProposalCreatedJob provides the expected interfaces."""181 """MergeProposalNeedsReviewEmailJob provides the expected interfaces."""
182 bmp = self.factory.makeBranchMergeProposal()182 bmp = self.factory.makeBranchMergeProposal()
183 job = UpdatePreviewDiffJob.create(bmp)183 job = UpdatePreviewDiffJob.create(bmp)
184 verifyObject(IUpdatePreviewDiffJob, job)184 verifyObject(IUpdatePreviewDiffJob, job)
@@ -343,7 +343,7 @@
343 update_diff.complete()343 update_diff.complete()
344 [job] = self.job_source.iterReady()344 [job] = self.job_source.iterReady()
345 self.assertEqual(job.branch_merge_proposal, bmp)345 self.assertEqual(job.branch_merge_proposal, bmp)
346 self.assertIsInstance(job, MergeProposalCreatedJob)346 self.assertIsInstance(job, MergeProposalNeedsReviewEmailJob)
347347
348 def completePendingJobs(self):348 def completePendingJobs(self):
349 # Mark all current pending jobs as complete349 # Mark all current pending jobs as complete
@@ -425,7 +425,7 @@
425 verifyObject(IReviewRequestedEmailJobSource, ReviewRequestedEmailJob)425 verifyObject(IReviewRequestedEmailJobSource, ReviewRequestedEmailJob)
426426
427 def test_providesInterface(self):427 def test_providesInterface(self):
428 """MergeProposalCreatedJob provides the expected interfaces."""428 """ReviewRequestedEmailJob provides the expected interfaces."""
429 request = self.factory.makeCodeReviewVoteReference()429 request = self.factory.makeCodeReviewVoteReference()
430 job = ReviewRequestedEmailJob.create(request)430 job = ReviewRequestedEmailJob.create(request)
431 verifyObject(IReviewRequestedEmailJob, job)431 verifyObject(IReviewRequestedEmailJob, job)
432432
=== modified file 'lib/lp/code/subscribers/branchmergeproposal.py'
--- lib/lp/code/subscribers/branchmergeproposal.py 2010-08-20 20:31:18 +0000
+++ lib/lp/code/subscribers/branchmergeproposal.py 2010-10-18 02:41:45 +0000
@@ -11,7 +11,7 @@
1111
12from lp.code.adapters.branch import BranchMergeProposalDelta12from lp.code.adapters.branch import BranchMergeProposalDelta
13from lp.code.interfaces.branchmergeproposal import (13from lp.code.interfaces.branchmergeproposal import (
14 IMergeProposalCreatedJobSource,14 IMergeProposalNeedsReviewEmailJobSource,
15 IMergeProposalUpdatedEmailJobSource,15 IMergeProposalUpdatedEmailJobSource,
16 IReviewRequestedEmailJobSource,16 IReviewRequestedEmailJobSource,
17 IUpdatePreviewDiffJobSource,17 IUpdatePreviewDiffJobSource,
@@ -27,7 +27,8 @@
27 Also create a job to email the subscribers about the new proposal.27 Also create a job to email the subscribers about the new proposal.
28 """28 """
29 getUtility(IUpdatePreviewDiffJobSource).create(merge_proposal)29 getUtility(IUpdatePreviewDiffJobSource).create(merge_proposal)
30 getUtility(IMergeProposalCreatedJobSource).create(merge_proposal)30 getUtility(IMergeProposalNeedsReviewEmailJobSource).create(
31 merge_proposal)
3132
3233
33def merge_proposal_modified(merge_proposal, event):34def merge_proposal_modified(merge_proposal, event):