Launchpad itself

Merge lp:~gmb/launchpad/fix-update-bug-watch into lp:launchpad

  1. fix-update-bug-watch
  2. Merge into devel
Proposed by Graham Binns
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 12069
Proposed branch: lp:~gmb/launchpad/fix-update-bug-watch
Merge into: lp:launchpad
Diff against target: 132 lines (+25/-22)
2 files modified
lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py (+4/-9)
lib/lp/bugs/scripts/checkwatches/tests/test_bugwatchupdater.py (+21/-13)
To merge this branch: bzr merge lp:~gmb/launchpad/fix-update-bug-watch
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+43643@code.launchpad.net

Commit message

[r=allenap][ui=none][bug=568505,578714] Extraneous parameters have been removed from BugWatchUpdater.updateBugWatch().

Description of the change

This branch fixes the linked bugs by removing the extraneous parameters
from BugWatchUpdater.updateBugWatch(). I've also altered the tests for
that method.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py'
--- lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py 2010-10-26 15:47:24 +0000
+++ lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py 2010-12-14 13:56:16 +0000
@@ -53,14 +53,9 @@
53 self.can_push_comments = parent.can_push_comments53 self.can_push_comments = parent.can_push_comments
54 self.can_back_link = parent.can_back_link54 self.can_back_link = parent.can_back_link
5555
56 # XXX 2010-05-11 gmb bug=578714:
57 # The last three parameters on this method aren't needed and
58 # should be removed.
59 @commit_before56 @commit_before
60 def updateBugWatch(self, new_remote_status, new_malone_status,57 def updateBugWatch(self, new_remote_status, new_malone_status,
61 new_remote_importance, new_malone_importance,58 new_remote_importance, new_malone_importance):
62 can_import_comments=None, can_push_comments=None,
63 can_back_link=None):
64 """Update the BugWatch."""59 """Update the BugWatch."""
65 with self.transaction:60 with self.transaction:
66 if new_malone_status is not None:61 if new_malone_status is not None:
@@ -88,14 +83,14 @@
88 oops_id = None83 oops_id = None
89 if do_sync:84 if do_sync:
90 try:85 try:
91 if can_import_comments or self.can_import_comments:86 if self.can_import_comments:
92 error_status = (87 error_status = (
93 BugWatchActivityStatus.COMMENT_IMPORT_FAILED)88 BugWatchActivityStatus.COMMENT_IMPORT_FAILED)
94 self.importBugComments()89 self.importBugComments()
95 if can_push_comments or self.can_push_comments:90 if self.can_push_comments:
96 error_status = BugWatchActivityStatus.COMMENT_PUSH_FAILED91 error_status = BugWatchActivityStatus.COMMENT_PUSH_FAILED
97 self.pushBugComments()92 self.pushBugComments()
98 if can_back_link or self.can_back_link:93 if self.can_back_link:
99 error_status = BugWatchActivityStatus.BACKLINK_FAILED94 error_status = BugWatchActivityStatus.BACKLINK_FAILED
100 self.linkLaunchpadBug()95 self.linkLaunchpadBug()
101 except Exception, ex:96 except Exception, ex:
10297
=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_bugwatchupdater.py'
--- lib/lp/bugs/scripts/checkwatches/tests/test_bugwatchupdater.py 2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/scripts/checkwatches/tests/test_bugwatchupdater.py 2010-12-14 13:56:16 +0000
@@ -25,7 +25,9 @@
2525
2626
27def make_bug_watch_updater(checkwatches_master, bug_watch,27def make_bug_watch_updater(checkwatches_master, bug_watch,
28 external_bugtracker, server_time=None):28 external_bugtracker, server_time=None,
29 can_import_comments=False,
30 can_push_comments=False, can_back_link=False):
29 """Helper function to create a BugWatchUpdater instance."""31 """Helper function to create a BugWatchUpdater instance."""
30 if server_time is None:32 if server_time is None:
31 server_time = datetime.now()33 server_time = datetime.now()
@@ -33,10 +35,17 @@
33 remote_bug_updater = checkwatches_master.remote_bug_updater_factory(35 remote_bug_updater = checkwatches_master.remote_bug_updater_factory(
34 checkwatches_master, external_bugtracker, bug_watch.remotebug,36 checkwatches_master, external_bugtracker, bug_watch.remotebug,
35 [bug_watch.id], [], server_time)37 [bug_watch.id], [], server_time)
36 return BugWatchUpdater(38
39 bug_watch_updater = BugWatchUpdater(
37 remote_bug_updater, bug_watch,40 remote_bug_updater, bug_watch,
38 remote_bug_updater.external_bugtracker)41 remote_bug_updater.external_bugtracker)
3942
43 bug_watch_updater.can_import_comments = can_import_comments
44 bug_watch_updater.can_push_comments = can_push_comments
45 bug_watch_updater.can_back_link = can_back_link
46
47 return bug_watch_updater
48
4049
41class BrokenCommentSyncingExternalBugTracker(TestExternalBugTracker):50class BrokenCommentSyncingExternalBugTracker(TestExternalBugTracker):
42 """An ExternalBugTracker that can't sync comments."""51 """An ExternalBugTracker that can't sync comments."""
@@ -100,8 +109,7 @@
100109
101 bug_watch_updater.updateBugWatch(110 bug_watch_updater.updateBugWatch(
102 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',111 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',
103 BugTaskImportance.LOW, can_import_comments=False,112 BugTaskImportance.LOW)
104 can_push_comments=False, can_back_link=False)
105113
106 self.assertEqual('FIXED', self.bug_watch.remotestatus)114 self.assertEqual('FIXED', self.bug_watch.remotestatus)
107 self.assertEqual(BugTaskStatus.FIXRELEASED, self.bug_task.status)115 self.assertEqual(BugTaskStatus.FIXRELEASED, self.bug_task.status)
@@ -119,12 +127,12 @@
119 external_bugtracker = BrokenCommentSyncingExternalBugTracker(127 external_bugtracker = BrokenCommentSyncingExternalBugTracker(
120 'http://example.com')128 'http://example.com')
121 bug_watch_updater = make_bug_watch_updater(129 bug_watch_updater = make_bug_watch_updater(
122 self.checkwatches_master, self.bug_watch, external_bugtracker)130 self.checkwatches_master, self.bug_watch, external_bugtracker,
131 can_import_comments=True)
123132
124 bug_watch_updater.updateBugWatch(133 bug_watch_updater.updateBugWatch(
125 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',134 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',
126 BugTaskImportance.LOW, can_import_comments=True,135 BugTaskImportance.LOW)
127 can_push_comments=False, can_back_link=False)
128136
129 self._checkLastErrorAndMessage(137 self._checkLastErrorAndMessage(
130 BugWatchActivityStatus.COMMENT_IMPORT_FAILED,138 BugWatchActivityStatus.COMMENT_IMPORT_FAILED,
@@ -136,15 +144,15 @@
136 external_bugtracker = BrokenCommentSyncingExternalBugTracker(144 external_bugtracker = BrokenCommentSyncingExternalBugTracker(
137 'http://example.com')145 'http://example.com')
138 bug_watch_updater = make_bug_watch_updater(146 bug_watch_updater = make_bug_watch_updater(
139 self.checkwatches_master, self.bug_watch, external_bugtracker)147 self.checkwatches_master, self.bug_watch, external_bugtracker,
148 can_push_comments=True)
140149
141 self.factory.makeBugComment(150 self.factory.makeBugComment(
142 bug=self.bug_task.bug, bug_watch=self.bug_watch)151 bug=self.bug_task.bug, bug_watch=self.bug_watch)
143152
144 bug_watch_updater.updateBugWatch(153 bug_watch_updater.updateBugWatch(
145 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',154 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',
146 BugTaskImportance.LOW, can_import_comments=False,155 BugTaskImportance.LOW)
147 can_push_comments=True, can_back_link=False)
148156
149 self._checkLastErrorAndMessage(157 self._checkLastErrorAndMessage(
150 BugWatchActivityStatus.COMMENT_PUSH_FAILED,158 BugWatchActivityStatus.COMMENT_PUSH_FAILED,
@@ -156,12 +164,12 @@
156 external_bugtracker = BrokenCommentSyncingExternalBugTracker(164 external_bugtracker = BrokenCommentSyncingExternalBugTracker(
157 'http://example.com')165 'http://example.com')
158 bug_watch_updater = make_bug_watch_updater(166 bug_watch_updater = make_bug_watch_updater(
159 self.checkwatches_master, self.bug_watch, external_bugtracker)167 self.checkwatches_master, self.bug_watch, external_bugtracker,
168 can_back_link=True)
160169
161 bug_watch_updater.updateBugWatch(170 bug_watch_updater.updateBugWatch(
162 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',171 'FIXED', BugTaskStatus.FIXRELEASED, 'LOW',
163 BugTaskImportance.LOW, can_import_comments=False,172 BugTaskImportance.LOW)
164 can_push_comments=False, can_back_link=True)
165173
166 self._checkLastErrorAndMessage(174 self._checkLastErrorAndMessage(
167 BugWatchActivityStatus.BACKLINK_FAILED,175 BugWatchActivityStatus.BACKLINK_FAILED,