Merge lp:~gmb/launchpad/cw-refactor-add-bwu-bug-567793 into lp:launchpad

[Graham Binns]

The BugWatch-specific functionality of CheckwatchesMaster has been refactored into a BugWatchUpdater class.

This branch is the first in a multi-branch series for refactoring the existing CheckwatchesMaster class into a series of smaller, better defined classes, and for untangling the code that lies within them.

As a first step, this branch moves the BugWatch-specific functionality out of CheckwatchesMaster and into BugWatchUpdater. The core of the functionality now resides in BugWatchUpdater.updateBugWatch(). Rather hatefully, this method takes 10 parameters. This is daft, and I've filed bug 568505 about it, but it's not in-scope to fix it here.

I've possibly done something perverse by having BugWatchUpdater extend WorkingBase, then take the transaction manager of CheckwatchesMaster upon instantiation. I don't know if it's the Wrong Thing to do (though the tests pass). However, I'm willing to either fix this here or, possibly more sensibly, refactor this relationship further in another branch (note that it's likely that BugWatchUpdater will in future be called by a RemoteBugUpdater, which in turn will be called by a BugTrackerUpdater and so on, so refactoring this sensibly may have to wait).

There's no lint and, as far as I can tell, everything passes.

[Gavin Panella (allenap)]

You're my hero for taking this on.

This is all good. I've made a few comments, and a bigger suggestion
(including patch) to make the instantiation of BugWatchUpdater less of
a pain (and to preserve the encapsulation that WorkingBase gives).

Gavin.

> === modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
> --- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt 2010-04-21 10:30:24 +0000
> +++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt 2010-04-23 09:29:42 +0000
> @@ -85,10 +85,13 @@
> comment-importing ExternalBugTracker instance will result in the three
> comments in the comment_dict being imported into Launchpad.
>
> - >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
> - >>> bugwatch_updater = CheckwatchesMaster(LaunchpadZopelessLayer.txn)
> - >>> transaction.commit()
> - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> + >>> from canonical.launchpad.scripts.logger import log
> + >>> from lp.bugs.scripts.checkwatches.bugwatchupdater import (
> + ... BugWatchUpdater)
> + >>> bugwatch_updater = BugWatchUpdater(
> + ... '<email address hidden>', LaunchpadZopelessLayer.txn,

I think it's confusing to use LaunchpadZopelessLayer.txn in some
places and transaction in others. ZopelessTransactionManager actually
just calls through to transaction, so it's easier to just use
transaction everywhere (or transaction.manager; the statement_logging
context manager needs the real manager). Also, I irrationally loathe
the "txn" spelling, but that should have no bearing on this review :)

'<email address hidden>' could be obtained from
lp.bugs.scripts.checkwatches.core.LOGIN, but it's not necessary.

> + ... log, bug_watch, external_bugtracker)
> + >>> bugwatch_updater.importBugComments()
> INFO:...:Imported 3 comments for remote bug 123456 on ...
>
> These three comments will be linked to the bug watch from which they
> @@ -118,7 +121,7 @@
>
> >>> transaction.commit()
>
> - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> + >>> bugwatch_updater.importBugComments()
> INFO:...:Imported 1 comments for remote bug 123456 on ...
>
> Once again, the newly-imported comment will be linked to the bug watch
> @@ -169,7 +172,7 @@
>
> >>> transaction.commit()
>
> - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> + >>> bugwatch_updater.importBugComments()
> INFO:...:Imported 1 comments for remote bug 123456 on ...
>
> >>> bug.messages[-1].owner.name
> @@ -187,7 +190,7 @@
>
> >>> transaction.commit()
>
> - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> + >>> bugwatch_updater.importBugComments()
> INFO:...:Imported 1 comments for remote bug 123456 on ...
>
> >>> bug.messages[-1].owner.name
> @@ -212,7 +215,7 @@
>
> >>> transaction.commit()
>
> - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> + >>> bugwatch_updater.importBugComments()
> WARNING:...:Unable to import remote comment author. No email address
> or display name found. (OOPS-...)
> INFO:...:Impor...

review: Approve

[Graham Binns (gmb)]

On Fri, Apr 23, 2010 at 01:56:40PM -0000, Gavin Panella wrote:
> Review: Approve
> You're my hero for taking this on.

Ta :)

> This is all good. I've made a few comments, and a bigger suggestion
> (including patch) to make the instantiation of BugWatchUpdater less of
> a pain (and to preserve the encapsulation that WorkingBase gives).
>

Cool. Replies in-line, etc...

>
> > === modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
> > --- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt 2010-04-21 10:30:24 +0000
> > +++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt 2010-04-23 09:29:42 +0000
> > @@ -85,10 +85,13 @@
> > comment-importing ExternalBugTracker instance will result in the three
> > comments in the comment_dict being imported into Launchpad.
> >
> > - >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
> > - >>> bugwatch_updater = CheckwatchesMaster(LaunchpadZopelessLayer.txn)
> > - >>> transaction.commit()
> > - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> > + >>> from canonical.launchpad.scripts.logger import log
> > + >>> from lp.bugs.scripts.checkwatches.bugwatchupdater import (
> > + ... BugWatchUpdater)
> > + >>> bugwatch_updater = BugWatchUpdater(
> > + ... '<email address hidden>', LaunchpadZopelessLayer.txn,
>
> I think it's confusing to use LaunchpadZopelessLayer.txn in some
> places and transaction in others. ZopelessTransactionManager actually
> just calls through to transaction, so it's easier to just use
> transaction everywhere (or transaction.manager; the statement_logging
> context manager needs the real manager). Also, I irrationally loathe
> the "txn" spelling, but that should have no bearing on this review :)
>

I'll switch everything to use transaction, then.

> '<email address hidden>' could be obtained from
> lp.bugs.scripts.checkwatches.core.LOGIN, but it's not necessary.
>

I'll leave it as-is for now, then.

> > + ... log, bug_watch, external_bugtracker)
> > + >>> bugwatch_updater.importBugComments()
> > INFO:...:Imported 3 comments for remote bug 123456 on ...
> >
> > These three comments will be linked to the bug watch from which they
> > @@ -118,7 +121,7 @@
> >
> > >>> transaction.commit()
> >
> > - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> > + >>> bugwatch_updater.importBugComments()
> > INFO:...:Imported 1 comments for remote bug 123456 on ...
> >
> > Once again, the newly-imported comment will be linked to the bug watch
> > @@ -169,7 +172,7 @@
> >
> > >>> transaction.commit()
> >
> > - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> > + >>> bugwatch_updater.importBugComments()
> > INFO:...:Imported 1 comments for remote bug 123456 on ...
> >
> > >>> bug.messages[-1].owner.name
> > @@ -187,7 +190,7 @@
> >
> > >>> transaction.commit()
> >
> > - >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
> > + >>> bugwatch_updater.importBugComments()
> > INFO:...:Imported 1 comments for remote bug 123456 on ...
> >
> > >>> bug.messages[-1].own...

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-04-21 10:30:24 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-imports.txt	2010-04-27 07:12:35 +0000
@@ -85,10 +85,18 @@
 comment-importing ExternalBugTracker instance will result in the three
 comments in the comment_dict being imported into Launchpad.
 
-    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> bugwatch_updater = CheckwatchesMaster(LaunchpadZopelessLayer.txn)
-    >>> transaction.commit()
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> from canonical.launchpad.scripts.logger import log
+    >>> from lp.bugs.scripts.checkwatches.base import (
+    ...     WorkingBase)
+    >>> from lp.bugs.scripts.checkwatches.bugwatchupdater import (
+    ...     BugWatchUpdater)
+
+    >>> working_base = WorkingBase()
+    >>> working_base.init(
+    ...     '[e-mail]', transaction, log)
+    >>> bugwatch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 3 comments for remote bug 123456 on ...
 
 These three comments will be linked to the bug watch from which they
@@ -118,7 +126,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 1 comments for remote bug 123456 on ...
 
 Once again, the newly-imported comment will be linked to the bug watch
@@ -169,7 +177,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 1 comments for remote bug 123456 on ...
 
     >>> bug.messages[-1].owner.name
@@ -187,7 +195,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 1 comments for remote bug 123456 on ...
 
     >>> bug.messages[-1].owner.name
@@ -212,7 +220,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     WARNING:...:Unable to import remote comment author. No email address
     or display name found. (OOPS-...)
     INFO:...:Imported 0 comments for remote bug 123456 on ...
@@ -388,7 +396,9 @@
     >>> LaunchpadZopelessLayer.switchDbUser(config.checkwatches.dbuser)
     >>> external_bugtracker.remote_comments = {
     ...     '5':"A comment containing a CVE entry: CVE-1991-9911."}
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 1 comments for remote bug 123456...
 
     >>> for cve in bug_watch.bug.cves:
@@ -410,7 +420,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 1 comments for remote bug 123456...
 
     >>> for cve in sorted([cve.displayname for cve in bug_watch.bug.cves]):
@@ -460,7 +470,9 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 2 comments for remote bug 42 ...
 
     >>> notifications = get_new_notifications(bug=bug_watch.bug)
@@ -516,7 +528,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 2 comments for remote bug 42 ...
 
     >>> notifications = get_new_notifications(bug_watch.bug)

=== modified file 'lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt'
--- lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-04-21 10:30:24 +0000
+++ lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt	2010-04-27 07:12:35 +0000
@@ -95,12 +95,19 @@
 each Launchpad comment that needs to be pushed to the remote bug
 tracker.
 
-    >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> bugwatch_updater = CheckwatchesMaster(LaunchpadZopelessLayer.txn)
-
-    >>> transaction.commit()
-
-    >>> bugwatch_updater.pushBugComments(external_bugtracker, bug_watch)
+    >>> from canonical.launchpad.scripts.logger import log
+    >>> from lp.bugs.scripts.checkwatches.base import (
+    ...     WorkingBase)
+    >>> from lp.bugs.scripts.checkwatches.bugwatchupdater import (
+    ...     BugWatchUpdater)
+
+    >>> working_base = WorkingBase()
+    >>> working_base.init(
+    ...     '[e-mail]', transaction, log)
+    >>> bugwatch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+
+    >>> bugwatch_updater.pushBugComments()
     Comment added as remote comment 1
     INFO:...:Pushed 1 comments to remote bug 1234 on ...
 
@@ -122,7 +129,7 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.pushBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.pushBugComments()
     >>> transaction.commit()
 
 If we now check the bug watch's unpushed_comments property, we will
@@ -148,7 +155,7 @@
     >>> bugmessage_three = bug.linkMessage(message_three, bug_watch)
     >>> transaction.commit()
 
-    >>> bugwatch_updater.pushBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.pushBugComments()
     Comment added as remote comment 2
     Comment added as remote comment 3
     INFO:...:Pushed 2 comments to remote bug 1234 on ...
@@ -171,7 +178,7 @@
     >>> bugmessage_four = bug.linkMessage(message_four)
     >>> transaction.commit()
 
-    >>> bugwatch_updater.pushBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.pushBugComments()
 
     >>> print_bug_messages(bug, bug_watch)
     1: Pushing, for the purpose of.
@@ -222,7 +229,8 @@
 
     >>> transaction.commit()
 
-    >>> bugwatch_updater.importBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.external_bugtracker = external_bugtracker
+    >>> bugwatch_updater.importBugComments()
     INFO:...:Imported 3 comments for remote bug 1234 on ...
 
 Each of the imported comments has its remote_comment_id field set.
@@ -239,9 +247,7 @@
 Running pushBugComments() on the external bugtracker won't result in the
 comments being pushed because they have already been imported.
 
-    >>> transaction.commit()
-
-    >>> bugwatch_updater.pushBugComments(external_bugtracker, bug_watch)
+    >>> bugwatch_updater.pushBugComments()
 
 If the external bugtracker's addRemoteComment() method returns an
 invalid remote comment ID, an error will be raised:
@@ -264,8 +270,10 @@
     >>> broken_external_bugtracker = ErroringExternalBugTracker(
     ...     'http://example.com')
 
-    >>> bugwatch_updater.pushBugComments(
-    ...     broken_external_bugtracker, bug_watch)
+    >>> bugwatch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+    >>> bugwatch_updater.external_bugtracker = broken_external_bugtracker
+    >>> bugwatch_updater.pushBugComments()
     Traceback (most recent call last):
       ...
     AssertionError: A remote_comment_id must be specified.
@@ -310,8 +318,7 @@
 remote server. This allows us to include salient information, such as
 the comment author, with the pushed comment.
 
-    >>> formatted_message = bugwatch_updater._formatRemoteComment(
-    ...     external_bugtracker, bug_watch, message)
+    >>> formatted_message = bugwatch_updater._formatRemoteComment(message)
     >>> print formatted_message
     Sample Person added the following comment to Launchpad bug #...:
     <BLANKLINE>
@@ -331,8 +338,8 @@
     ...     dirname(__file__), '../tests/testfiles/test_comment_template.txt')
     >>> external_bugtracker.comment_template = comment_template
 
-    >>> formatted_message = bugwatch_updater._formatRemoteComment(
-    ...     external_bugtracker, bug_watch, message)
+    >>> bugwatch_updater.external_bugtracker = external_bugtracker
+    >>> formatted_message = bugwatch_updater._formatRemoteComment(message)
     >>> print formatted_message
     Egg and bacon
     Egg, sausage and bacon

=== modified file 'lib/lp/bugs/doc/externalbugtracker-linking-back.txt'
--- lib/lp/bugs/doc/externalbugtracker-linking-back.txt	2010-04-21 10:30:24 +0000
+++ lib/lp/bugs/doc/externalbugtracker-linking-back.txt	2010-04-27 07:12:35 +0000
@@ -30,7 +30,7 @@
 The methods are called by the CheckwatchesMaster class:
 
     >>> from canonical.testing import LaunchpadZopelessLayer
-    >>> txn = LaunchpadZopelessLayer.txn
+    >>> txn = transaction
 
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
 
@@ -47,13 +47,13 @@
     >>> LaunchpadZopelessLayer.switchDbUser('checkwatches')
 
     >>> from lp.bugs.scripts.checkwatches import CheckwatchesMaster
-    >>> bug_watch_updater = CheckwatchesMaster(txn)
+    >>> checkwatches_master = CheckwatchesMaster(txn)
     >>> txn.commit()
 
     >>> external_bugtracker = BackLinkingExternalBugTracker(
     ...     'http://example.com/')
 
-    >>> bug_watch_updater.updateBugWatches(external_bugtracker, [bug_watch])
+    >>> checkwatches_master.updateBugWatches(external_bugtracker, [bug_watch])
     Getting Launchpad id for bug 42
     Setting Launchpad id for bug 42
 
@@ -63,17 +63,17 @@
 For comment syncing and back-linking to be attempted, bug watches must
 be related to a bug task, not just a bug.
 
-    >>> bug_watch_updater.updateBugWatches(
+    >>> checkwatches_master.updateBugWatches(
     ...     external_bugtracker, [bug_watch_without_bugtask])
 
 
-== CheckwatchesMaster.linkLaunchpadBug() ==
+== BugWatchUpdater.linkLaunchpadBug() ==
 
-The CheckwatchesMaster method that does the work of setting the Launchpad
+The BugWatchUpdater method that does the work of setting the Launchpad
 bug link is linkLaunchpadBug(). This method first retrieves the
 current Launchpad bug ID for the remote bug. If the remote bug is
 already linked to a Launchpad bug other than the one that we're trying
-to link it to, the CheckwatchesMaster will check that the bug that is
+to link it to, the BugWatchUpdater will check that the bug that is
 already linked has a valid watch on the remote bug in question. If it
 does, the link will remain unchanged. Otherwise it will be updated.
 
@@ -91,13 +91,23 @@
 
     >>> transaction.commit()
 
-    >>> bug_watch_updater.linkLaunchpadBug(
-    ...     external_bugtracker, bug_watch_2)
+    >>> from canonical.launchpad.scripts.logger import log
+    >>> from lp.bugs.scripts.checkwatches.base import (
+    ...     WorkingBase)
+    >>> from lp.bugs.scripts.checkwatches.bugwatchupdater import (
+    ...     BugWatchUpdater)
+
+    >>> working_base = WorkingBase()
+    >>> working_base.init(
+    ...     '[e-mail]', transaction, log)
+    >>> bug_watch_updater = BugWatchUpdater(
+    ...     working_base, bug_watch, external_bugtracker)
+    >>> bug_watch_updater.linkLaunchpadBug()
     Getting Launchpad id for bug 42
 
 However, if we set the current Launchpad bug ID on our
 BackLinkingExternalBugTracker to a Launchpad bug that doesn't link to
-the remote bug, CheckwatchesMaster.linkLaunchpadBug() will call
+the remote bug, BugWatchUpdater.linkLaunchpadBug() will call
 getLaunchpadBugId() and then, when it discovers that the current
 Launchpad bug ID isn't valid, setLaunchpadBugId() to correct the error.
 
@@ -117,7 +127,7 @@
 
     >>> transaction.commit()
 
-    >>> bug_watch_updater.linkLaunchpadBug(external_bugtracker, bug_watch)
+    >>> bug_watch_updater.linkLaunchpadBug()
     Getting Launchpad id for bug 42
     Setting Launchpad id for bug 42
 
@@ -127,6 +137,6 @@
 error.
 
     >>> external_bugtracker.last_launchpad_bug_id = 0
-    >>> bug_watch_updater.linkLaunchpadBug(external_bugtracker, bug_watch)
+    >>> bug_watch_updater.linkLaunchpadBug()
     Getting Launchpad id for bug 42
     Setting Launchpad id for bug 42

=== modified file 'lib/lp/bugs/scripts/checkwatches/base.py'
--- lib/lp/bugs/scripts/checkwatches/base.py	2010-04-21 08:58:25 +0000
+++ lib/lp/bugs/scripts/checkwatches/base.py	2010-04-27 07:12:35 +0000
@@ -119,7 +119,7 @@
 class WorkingBase:
     """A base class for writing a long-running process."""
 
-    def __init__(self, login, transaction_manager, logger):
+    def init(self, login, transaction_manager, logger):
         self._login = login
         self._principal = (
             getUtility(IPlacelessAuthUtility).getPrincipalByLogin(
@@ -127,6 +127,12 @@
         self._transaction_manager = transaction_manager
         self.logger = logger
 
+    def initFromParent(self, parent):
+        self._login = parent._login
+        self._principal = parent._principal
+        self._transaction_manager = parent._transaction_manager
+        self.logger = parent.logger
+
     @property
     @contextmanager
     def interaction(self):

=== added file 'lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py'
--- lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/scripts/checkwatches/bugwatchupdater.py	2010-04-27 07:12:35 +0000
@@ -0,0 +1,284 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Classes and logic for the checkwatches BugWatchUpdater."""
+
+from __future__ import with_statement
+
+__metaclass__ = type
+__all__ = [
+    'BugWatchUpdater',
+    ]
+
+import sys
+
+from zope.component import getUtility
+from zope.event import notify
+
+from canonical.launchpad.helpers import get_email_template
+from canonical.launchpad.interfaces.launchpad import (
+    ILaunchpadCelebrities, NotFoundError)
+from canonical.launchpad.interfaces.message import IMessageSet
+from canonical.launchpad.webapp.publisher import canonical_url
+
+from lazr.lifecycle.event import ObjectCreatedEvent
+
+from lp.bugs.interfaces.bug import IBugSet
+from lp.bugs.scripts.checkwatches.base import (
+    WorkingBase, commit_before)
+from lp.registry.interfaces.person import PersonCreationRationale
+
+
+class BugWatchUpdater(WorkingBase):
+    """Handles the updating of a single BugWatch for checkwatches."""
+
+    def __init__(self, parent, bug_watch, external_bugtracker):
+        self.initFromParent(parent)
+        self.bug_watch = bug_watch
+        self.external_bugtracker = external_bugtracker
+
+    @commit_before
+    def updateBugWatch(self, new_remote_status, new_malone_status,
+                       new_remote_importance, new_malone_importance,
+                       can_import_comments, can_push_comments, can_back_link,
+                       error, oops_id):
+        """Update the BugWatch."""
+        with self.transaction:
+            self.bug_watch.last_error_type = error
+            if new_malone_status is not None:
+                self.bug_watch.updateStatus(
+                    new_remote_status, new_malone_status)
+            if new_malone_importance is not None:
+                self.bug_watch.updateImportance(
+                    new_remote_importance, new_malone_importance)
+            # Only sync comments and backlink if there was no
+            # earlier error, the local bug isn't a duplicate,
+            # *and* if the bug watch is associated with a bug
+            # task. This helps us to avoid spamming upstream.
+            do_sync = (
+                error is None and
+                self.bug_watch.bug.duplicateof is None and
+                len(self.bug_watch.bugtasks) > 0
+                )
+
+        # XXX: Gavin Panella 2010-04-19 bug=509223:
+        # Exception handling is all wrong! If any of these
+        # throw an exception, *all* the watches in
+        # self.bug_watches, even those that have not errored,
+        # will have negative activity added.
+        if do_sync:
+            if can_import_comments:
+                self.importBugComments()
+            if can_push_comments:
+                self.pushBugComments()
+            if can_back_link:
+                self.linkLaunchpadBug()
+
+        with self.transaction:
+            self.bug_watch.addActivity(
+                result=error, oops_id=oops_id)
+
+    @commit_before
+    def importBugComments(self):
+        """Import all the comments from the remote bug."""
+        # Avoid circularity.
+        from lp.bugs.scripts.checkwatches.core import (
+            get_remote_system_oops_properties)
+
+        with self.transaction:
+            local_bug_id = self.bug_watch.bug.id
+            remote_bug_id = self.bug_watch.remotebug
+
+        # Construct a list of the comment IDs we want to import; i.e.
+        # those which we haven't already imported.
+        all_comment_ids = self.external_bugtracker.getCommentIds(
+            remote_bug_id)
+
+        with self.transaction:
+            comment_ids_to_import = [
+                comment_id for comment_id in all_comment_ids
+                if not self.bug_watch.hasComment(comment_id)]
+
+        self.external_bugtracker.fetchComments(
+            remote_bug_id, comment_ids_to_import)
+
+        with self.transaction:
+            previous_imported_comments = (
+                self.bug_watch.getImportedBugMessages())
+            is_initial_import = previous_imported_comments.count() == 0
+            imported_comments = []
+
+            for comment_id in comment_ids_to_import:
+                displayname, email = (
+                    self.external_bugtracker.getPosterForComment(
+                        remote_bug_id, comment_id))
+
+                if displayname is None and email is None:
+                    # If we don't have a displayname or an email address
+                    # then we can't create a Launchpad Person as the author
+                    # of this comment. We raise an OOPS and continue.
+                    self.warning(
+                        "Unable to import remote comment author. No email "
+                        "address or display name found.",
+                        get_remote_system_oops_properties(
+                            self.external_bugtracker),
+                        sys.exc_info())
+                    continue
+
+                poster = self.bug_watch.bugtracker.ensurePersonForSelf(
+                    displayname, email, PersonCreationRationale.BUGIMPORT,
+                    "when importing comments for %s." % self.bug_watch.title)
+
+                comment_message = (
+                    self.external_bugtracker.getMessageForComment(
+                        remote_bug_id, comment_id, poster))
+
+                bug_message = self.bug_watch.addComment(
+                    comment_id, comment_message)
+                imported_comments.append(bug_message)
+
+            if len(imported_comments) > 0:
+                self.bug_watch_updater = (
+                    getUtility(ILaunchpadCelebrities).bug_watch_updater)
+                if is_initial_import:
+                    notification_text = get_email_template(
+                        'bugwatch-initial-comment-import.txt') % dict(
+                            num_of_comments=len(imported_comments),
+                            bug_watch_url=self.bug_watch.url)
+                    comment_text_template = get_email_template(
+                        'bugwatch-comment.txt')
+
+                    for bug_message in imported_comments:
+                        comment = bug_message.message
+                        notification_text += comment_text_template % dict(
+                            comment_date=comment.datecreated.isoformat(),
+                            commenter=comment.owner.displayname,
+                            comment_text=comment.text_contents,
+                            comment_reply_url=canonical_url(comment))
+                    notification_message = getUtility(IMessageSet).fromText(
+                        subject=self.bug_watch.bug.followup_subject(),
+                        content=notification_text,
+                        owner=self.bug_watch_updater)
+                    self.bug_watch.bug.addCommentNotification(
+                        notification_message)
+                else:
+                    for bug_message in imported_comments:
+                        notify(ObjectCreatedEvent(
+                            bug_message,
+                            user=self.bug_watch_updater))
+
+            self.logger.info("Imported %(count)i comments for remote bug "
+                "%(remotebug)s on %(bugtracker_url)s into Launchpad bug "
+                "%(bug_id)s." %
+                {'count': len(imported_comments),
+                 'remotebug': remote_bug_id,
+                 'bugtracker_url': self.external_bugtracker.baseurl,
+                 'bug_id': local_bug_id})
+
+    def _formatRemoteComment(self, message):
+        """Format a comment for a remote bugtracker and return it."""
+        comment_template = get_email_template(
+            self.external_bugtracker.comment_template)
+
+        return comment_template % {
+            'launchpad_bug': self.bug_watch.bug.id,
+            'comment_author': message.owner.displayname,
+            'comment_body': message.text_contents,
+            }
+
+    @commit_before
+    def pushBugComments(self):
+        """Push Launchpad comments to the remote bug.
+
+        :param self.external_bugtracker: An external bugtracker which
+            implements `ISupportsCommentPushing`.
+        :param self.bug_watch: The bug watch to which the comments should be
+            pushed.
+        """
+        pushed_comments = 0
+
+        with self.transaction:
+            local_bug_id = self.bug_watch.bug.id
+            remote_bug_id = self.bug_watch.remotebug
+            unpushed_comments = list(self.bug_watch.unpushed_comments)
+
+        # Loop over the unpushed comments for the bug watch.
+        # We only push those comments that haven't been pushed
+        # already. We don't push any comments not associated with
+        # the bug watch.
+        for unpushed_comment in unpushed_comments:
+            with self.transaction:
+                message = unpushed_comment.message
+                message_rfc822msgid = message.rfc822msgid
+                # Format the comment so that it includes information
+                # about the Launchpad bug.
+                formatted_comment = self._formatRemoteComment(message)
+
+            remote_comment_id = (
+                self.external_bugtracker.addRemoteComment(
+                    remote_bug_id, formatted_comment,
+                    message_rfc822msgid))
+
+            assert remote_comment_id is not None, (
+                "A remote_comment_id must be specified.")
+            with self.transaction:
+                unpushed_comment.remote_comment_id = remote_comment_id
+
+            pushed_comments += 1
+
+        if pushed_comments > 0:
+            self.logger.info("Pushed %(count)i comments to remote bug "
+                "%(remotebug)s on %(bugtracker_url)s from Launchpad bug "
+                "%(bug_id)s" %
+                {'count': pushed_comments,
+                 'remotebug': remote_bug_id,
+                 'bugtracker_url': self.external_bugtracker.baseurl,
+                 'bug_id': local_bug_id})
+
+    @commit_before
+    def linkLaunchpadBug(self):
+        """Link a Launchpad bug to a given remote bug."""
+        with self.transaction:
+            local_bug_id = self.bug_watch.bug.id
+            local_bug_url = canonical_url(self.bug_watch.bug)
+            remote_bug_id = self.bug_watch.remotebug
+
+        current_launchpad_id = self.external_bugtracker.getLaunchpadBugId(
+            remote_bug_id)
+
+        if current_launchpad_id is None:
+            # If no bug is linked to the remote bug, link this one and
+            # then stop.
+            self.external_bugtracker.setLaunchpadBugId(
+                remote_bug_id, local_bug_id, local_bug_url)
+            return
+
+        elif current_launchpad_id == local_bug_id:
+            # If the current_launchpad_id is the same as the ID of the bug
+            # we're trying to link, we can stop.
+            return
+
+        else:
+            # If the current_launchpad_id isn't the same as the one
+            # we're trying to link, check that the other bug actually
+            # links to the remote bug. If it does, we do nothing, since
+            # the first valid link wins. Otherwise we link the bug that
+            # we've been passed, overwriting the previous value of the
+            # Launchpad bug ID for this remote bug.
+            try:
+                with self.transaction:
+                    other_launchpad_bug = getUtility(IBugSet).get(
+                        current_launchpad_id)
+                    other_bug_watch = other_launchpad_bug.getBugWatch(
+                        self.bug_watch.bugtracker, remote_bug_id)
+            except NotFoundError:
+                # If we can't find the bug that's referenced by
+                # current_launchpad_id we simply set other_self.bug_watch to
+                # None so that the Launchpad ID of the remote bug can be
+                # set correctly.
+                other_bug_watch = None
+
+            if other_bug_watch is None:
+                self.external_bugtracker.setLaunchpadBugId(
+                    remote_bug_id, local_bug_id, local_bug_url)
+

=== modified file 'lib/lp/bugs/scripts/checkwatches/core.py'
--- lib/lp/bugs/scripts/checkwatches/core.py	2010-04-21 10:33:55 +0000
+++ lib/lp/bugs/scripts/checkwatches/core.py	2010-04-27 07:12:35 +0000
@@ -33,21 +33,15 @@
 from twisted.python.threadpool import ThreadPool
 
 from zope.component import getUtility
-from zope.event import notify
 
 from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import flush_database_updates
-from lazr.lifecycle.event import ObjectCreatedEvent
-from canonical.launchpad.helpers import get_email_template
 from canonical.launchpad.interfaces import (
     BugTaskStatus, BugWatchActivityStatus, CreateBugParams,
     IBugTrackerSet, IBugWatchSet, IDistribution, ILaunchpadCelebrities,
     IPersonSet, ISupportsCommentImport, ISupportsCommentPushing,
     PersonCreationRationale, UNKNOWN_REMOTE_STATUS)
-from canonical.launchpad.interfaces.launchpad import NotFoundError
-from canonical.launchpad.interfaces.message import IMessageSet
 from canonical.launchpad.scripts.logger import log as default_log
-from canonical.launchpad.webapp.publisher import canonical_url
 
 from lp.bugs import externalbugtracker
 from lp.bugs.externalbugtracker import (
@@ -55,10 +49,10 @@
     BugWatchUpdateError, InvalidBugId, PrivateRemoteBug,
     UnknownBugTrackerTypeError, UnknownRemoteStatusError, UnparseableBugData,
     UnparseableBugTrackerVersion, UnsupportedBugTrackerVersion)
-from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.interfaces.externalbugtracker import ISupportsBackLinking
 from lp.bugs.scripts.checkwatches.base import (
     WorkingBase, commit_before, with_interaction)
+from lp.bugs.scripts.checkwatches.bugwatchupdater import BugWatchUpdater
 from lp.services.scripts.base import LaunchpadCronScript
 
 
@@ -166,8 +160,7 @@
             provides a similar interface.
 
         """
-        super(CheckwatchesMaster, self).__init__(
-            LOGIN, transaction_manager, logger)
+        self.init(LOGIN, transaction_manager, logger)
 
         # Override SYNCABLE_GNOME_PRODUCTS if necessary.
         if syncable_gnome_products is not None:
@@ -792,44 +785,19 @@
                             ('URL', remote_bug_url),
                             ('bug_id', remote_bug_id),
                             ('local_ids', local_ids),
-                            ] + get_remote_system_oops_properties(remotesystem),
+                            ] + get_remote_system_oops_properties(
+                                remotesystem),
                         info=sys.exc_info())
 
                 for bug_watch in bug_watches:
-                    with self.transaction:
-                        bug_watch.last_error_type = error
-                        if new_malone_status is not None:
-                            bug_watch.updateStatus(
-                                new_remote_status, new_malone_status)
-                        if new_malone_importance is not None:
-                            bug_watch.updateImportance(
-                                new_remote_importance, new_malone_importance)
-                        # Only sync comments and backlink if there was no
-                        # earlier error, the local bug isn't a duplicate,
-                        # *and* if the bug watch is associated with a bug
-                        # task. This helps us to avoid spamming upstream.
-                        do_sync = (
-                            error is None and
-                            bug_watch.bug.duplicateof is None and
-                            len(bug_watch.bugtasks) > 0
-                            )
-
-                    # XXX: Gavin Panella 2010-04-19 bug=509223:
-                    # Exception handling is all wrong! If any of these
-                    # throw an exception, *all* the watches in
-                    # bug_watches, even those that have not errored,
-                    # will have negative activity added.
-                    if do_sync:
-                        if can_import_comments:
-                            self.importBugComments(remotesystem, bug_watch)
-                        if can_push_comments:
-                            self.pushBugComments(remotesystem, bug_watch)
-                        if can_back_link:
-                            self.linkLaunchpadBug(remotesystem, bug_watch)
-
-                    with self.transaction:
-                        bug_watch.addActivity(
-                            result=error, oops_id=oops_id)
+                    bug_watch_updater = BugWatchUpdater(
+                        self, bug_watch, remotesystem)
+
+                    bug_watch_updater.updateBugWatch(
+                        new_remote_status, new_malone_status,
+                        new_remote_importance, new_malone_importance,
+                        can_import_comments, can_push_comments,
+                        can_back_link, error, oops_id)
 
             except (KeyboardInterrupt, SystemExit):
                 # We should never catch KeyboardInterrupt or SystemExit.
@@ -873,8 +841,8 @@
         """
         assert IDistribution.providedBy(bug_target), (
             'Only imports of bugs for a distribution is implemented.')
-        reporter_name, reporter_email = external_bugtracker.getBugReporter(
-            remote_bug)
+        reporter_name, reporter_email = (
+            external_bugtracker.getBugReporter(remote_bug))
         reporter = getUtility(IPersonSet).ensurePerson(
             reporter_email, reporter_name, PersonCreationRationale.BUGIMPORT,
             comment='when importing bug #%s from %s' % (
@@ -907,203 +875,6 @@
 
         return bug
 
-    def importBugComments(self, external_bugtracker, bug_watch):
-        """Import all the comments from a remote bug.
-
-        :param external_bugtracker: An external bugtracker which
-            implements `ISupportsCommentImport`.
-        :param bug_watch: The bug watch for which the comments should be
-            imported.
-        """
-        with self.transaction:
-            local_bug_id = bug_watch.bug.id
-            remote_bug_id = bug_watch.remotebug
-
-        # Construct a list of the comment IDs we want to import; i.e.
-        # those which we haven't already imported.
-        all_comment_ids = external_bugtracker.getCommentIds(remote_bug_id)
-
-        with self.transaction:
-            comment_ids_to_import = [
-                comment_id for comment_id in all_comment_ids
-                if not bug_watch.hasComment(comment_id)]
-
-        external_bugtracker.fetchComments(
-            remote_bug_id, comment_ids_to_import)
-
-        with self.transaction:
-            previous_imported_comments = bug_watch.getImportedBugMessages()
-            is_initial_import = previous_imported_comments.count() == 0
-            imported_comments = []
-
-            for comment_id in comment_ids_to_import:
-                displayname, email = external_bugtracker.getPosterForComment(
-                    remote_bug_id, comment_id)
-
-                if displayname is None and email is None:
-                    # If we don't have a displayname or an email address
-                    # then we can't create a Launchpad Person as the author
-                    # of this comment. We raise an OOPS and continue.
-                    self.warning(
-                        "Unable to import remote comment author. No email "
-                        "address or display name found.",
-                        get_remote_system_oops_properties(external_bugtracker),
-                        sys.exc_info())
-                    continue
-
-                poster = bug_watch.bugtracker.ensurePersonForSelf(
-                    displayname, email, PersonCreationRationale.BUGIMPORT,
-                    "when importing comments for %s." % bug_watch.title)
-
-                comment_message = external_bugtracker.getMessageForComment(
-                    remote_bug_id, comment_id, poster)
-
-                bug_message = bug_watch.addComment(
-                    comment_id, comment_message)
-                imported_comments.append(bug_message)
-
-            if len(imported_comments) > 0:
-                bug_watch_updater = (
-                    getUtility(ILaunchpadCelebrities).bug_watch_updater)
-                if is_initial_import:
-                    notification_text = get_email_template(
-                        'bugwatch-initial-comment-import.txt') % dict(
-                            num_of_comments=len(imported_comments),
-                            bug_watch_url=bug_watch.url)
-                    comment_text_template = get_email_template(
-                        'bugwatch-comment.txt')
-
-                    for bug_message in imported_comments:
-                        comment = bug_message.message
-                        notification_text += comment_text_template % dict(
-                            comment_date=comment.datecreated.isoformat(),
-                            commenter=comment.owner.displayname,
-                            comment_text=comment.text_contents,
-                            comment_reply_url=canonical_url(comment))
-                    notification_message = getUtility(IMessageSet).fromText(
-                        subject=bug_watch.bug.followup_subject(),
-                        content=notification_text,
-                        owner=bug_watch_updater)
-                    bug_watch.bug.addCommentNotification(notification_message)
-                else:
-                    for bug_message in imported_comments:
-                        notify(ObjectCreatedEvent(
-                            bug_message,
-                            user=bug_watch_updater))
-
-            self.logger.info("Imported %(count)i comments for remote bug "
-                "%(remotebug)s on %(bugtracker_url)s into Launchpad bug "
-                "%(bug_id)s." %
-                {'count': len(imported_comments),
-                 'remotebug': remote_bug_id,
-                 'bugtracker_url': external_bugtracker.baseurl,
-                 'bug_id': local_bug_id})
-
-    def _formatRemoteComment(self, external_bugtracker, bug_watch, message):
-        """Format a comment for a remote bugtracker and return it."""
-        comment_template = get_email_template(
-            external_bugtracker.comment_template)
-
-        return comment_template % {
-            'launchpad_bug': bug_watch.bug.id,
-            'comment_author': message.owner.displayname,
-            'comment_body': message.text_contents,
-            }
-
-    def pushBugComments(self, external_bugtracker, bug_watch):
-        """Push Launchpad comments to the remote bug.
-
-        :param external_bugtracker: An external bugtracker which
-            implements `ISupportsCommentPushing`.
-        :param bug_watch: The bug watch to which the comments should be
-            pushed.
-        """
-        pushed_comments = 0
-
-        with self.transaction:
-            local_bug_id = bug_watch.bug.id
-            remote_bug_id = bug_watch.remotebug
-            unpushed_comments = list(bug_watch.unpushed_comments)
-
-        # Loop over the unpushed comments for the bug watch.
-        # We only push those comments that haven't been pushed
-        # already. We don't push any comments not associated with
-        # the bug watch.
-        for unpushed_comment in unpushed_comments:
-            with self.transaction:
-                message = unpushed_comment.message
-                message_rfc822msgid = message.rfc822msgid
-                # Format the comment so that it includes information
-                # about the Launchpad bug.
-                formatted_comment = self._formatRemoteComment(
-                    external_bugtracker, bug_watch, message)
-
-            remote_comment_id = (
-                external_bugtracker.addRemoteComment(
-                    remote_bug_id, formatted_comment,
-                    message_rfc822msgid))
-
-            assert remote_comment_id is not None, (
-                "A remote_comment_id must be specified.")
-            with self.transaction:
-                unpushed_comment.remote_comment_id = remote_comment_id
-
-            pushed_comments += 1
-
-        if pushed_comments > 0:
-            self.logger.info("Pushed %(count)i comments to remote bug "
-                "%(remotebug)s on %(bugtracker_url)s from Launchpad bug "
-                "%(bug_id)s" %
-                {'count': pushed_comments,
-                 'remotebug': remote_bug_id,
-                 'bugtracker_url': external_bugtracker.baseurl,
-                 'bug_id': local_bug_id})
-
-    def linkLaunchpadBug(self, remotesystem, bug_watch):
-        """Link a Launchpad bug to a given remote bug."""
-        with self.transaction:
-            local_bug_id = bug_watch.bug.id
-            local_bug_url = canonical_url(bug_watch.bug)
-            remote_bug_id = bug_watch.remotebug
-
-        current_launchpad_id = remotesystem.getLaunchpadBugId(remote_bug_id)
-
-        if current_launchpad_id is None:
-            # If no bug is linked to the remote bug, link this one and
-            # then stop.
-            remotesystem.setLaunchpadBugId(
-                remote_bug_id, local_bug_id, local_bug_url)
-            return
-
-        elif current_launchpad_id == local_bug_id:
-            # If the current_launchpad_id is the same as the ID of the bug
-            # we're trying to link, we can stop.
-            return
-
-        else:
-            # If the current_launchpad_id isn't the same as the one
-            # we're trying to link, check that the other bug actually
-            # links to the remote bug. If it does, we do nothing, since
-            # the first valid link wins. Otherwise we link the bug that
-            # we've been passed, overwriting the previous value of the
-            # Launchpad bug ID for this remote bug.
-            try:
-                with self.transaction:
-                    other_launchpad_bug = getUtility(IBugSet).get(
-                        current_launchpad_id)
-                    other_bug_watch = other_launchpad_bug.getBugWatch(
-                        bug_watch.bugtracker, remote_bug_id)
-            except NotFoundError:
-                # If we can't find the bug that's referenced by
-                # current_launchpad_id we simply set other_bug_watch to
-                # None so that the Launchpad ID of the remote bug can be
-                # set correctly.
-                other_bug_watch = None
-
-            if other_bug_watch is None:
-                remotesystem.setLaunchpadBugId(
-                    remote_bug_id, local_bug_id, local_bug_url)
-
 
 class BaseScheduler:
     """Run jobs according to a policy."""

=== modified file 'lib/lp/bugs/scripts/checkwatches/tests/test_base.py'
--- lib/lp/bugs/scripts/checkwatches/tests/test_base.py	2010-04-21 08:42:13 +0000
+++ lib/lp/bugs/scripts/checkwatches/tests/test_base.py	2010-04-27 07:12:35 +0000
@@ -48,7 +48,8 @@
     def test_interaction(self):
         # The WorkingBase.interaction context manager will begin an
         # interaction on entry and end it on exit.
-        base = WorkingBase(self.email, transaction.manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction.manager, self.logger)
         endInteraction()
         self.assertIs(None, queryInteraction())
         with base.interaction:
@@ -59,7 +60,8 @@
         # If an interaction is already in progress, the interaction
         # context manager will not begin a new interaction on entry,
         # nor will it end the interaction on exit.
-        base = WorkingBase(self.email, transaction.manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction.manager, self.logger)
         endInteraction()
         self.assertIs(None, queryInteraction())
         with base.interaction:
@@ -74,7 +76,8 @@
         # transaction is in progress on entry, commits on a successful
         # exit, or aborts the transaction on failure.
         transaction_manager = StubTransactionManager()
-        base = WorkingBase(self.email, transaction_manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction_manager, self.logger)
         transaction.commit()
         with base.transaction:
             self.assertFalse(is_transaction_in_progress())
@@ -88,7 +91,8 @@
         # On entry, WorkingBase.transaction will raise an exception if
         # a transaction is in progress.
         transaction_manager = StubTransactionManager()
-        base = WorkingBase(self.email, transaction_manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction_manager, self.logger)
         self.assertTrue(is_transaction_in_progress())
         self.assertRaises(TransactionInProgress, base.transaction.__enter__)
 
@@ -97,7 +101,8 @@
         # manager is active, the transaction will be aborted and the
         # exception re-raised.
         transaction_manager = StubTransactionManager()
-        base = WorkingBase(self.email, transaction_manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction_manager, self.logger)
         transaction.commit()
         try:
             with base.transaction:
@@ -111,7 +116,8 @@
     def test_statement_logging(self):
         # The WorkingBase.statement_logging context manager starts
         # statement logging on entry and stops it on exit.
-        base = WorkingBase(self.email, transaction.manager, self.logger)
+        base = WorkingBase()
+        base.init(self.email, transaction.manager, self.logger)
         self.factory.makeEmail('[e-mail]', self.person)
         self.assertEqual(
             0, len(get_request_statements()),
@@ -130,6 +136,13 @@
             "SQL statement log not cleared on exit "
             "from base.statement_logging.")
 
+    def test_initFromParent(self):
+        base1 = WorkingBase()
+        base1.init(self.email, transaction.manager, self.logger)
+        base2 = WorkingBase()
+        base2.initFromParent(base1)
+        self.failUnlessEqual(base1.__dict__, base2.__dict__)
+
 
 class TestWorkingBaseErrorReporting(TestCaseWithFactory):
 
@@ -140,7 +153,8 @@
         person = self.factory.makePerson()
         email = person.preferredemail.email
         logger = QuietFakeLogger()
-        base = WorkingBase(email, transaction.manager, logger)
+        base = WorkingBase()
+        base.init(email, transaction.manager, logger)
         with base.statement_logging:
             self.factory.makeEmail('[e-mail]', person)
             self.assertTrue(

=== added file 'utilities/less-oops.sh'
--- utilities/less-oops.sh	1970-01-01 00:00:00 +0000
+++ utilities/less-oops.sh	2010-04-27 07:12:35 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+#
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+#
+# Outputs the contents of the OOPS report for a given OOPS ID.
+
+OOPS_ID=$1
+grep -rl "$OOPS_ID" /var/tmp/lperr* | xargs less