Merge lp:~abentley/launchpad/branch-scanner-zcml into lp:launchpad

[Aaron Bentley]

[Aaron Bentley (abentley)]

= Summary =
Make branch scanner event handling less fragile and surprising.

== Proposed fix ==
Use the standard zcml subscription mechanism.

== Pre-implementation notes ==
Pre-implementation was with thumper. jml and gary were also consulted.

== Implementation details ==
The bulk of this change is tests to verify that the handlers are subscribed
to the appropriate events.

The meat of it is configure.zcml, branchmailjob.py and branch_scanner.py, where
the homegrown subscription mechanism was replaced with configure.zcml.

Marking the event handlers as adapters is no longer necessary, so this was
changed. ZCML subscription requires that the events being subscribed to are
interfaces, so new interfaces were added for each event type.

ScannerEvent is (or became?) a classic class, so it and its subclasses were
switched from super...__init__ to Class.__init__self.

make_zope_event_fixture

== Tests ==
bin/test -vt test_buglinks -t test_bzrsync -t test_email -t test_mergedetection -t test_translationtemplatesbuildjob

== Demo and Q/A ==
N/A

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/codehosting/scanner/tests/test_bzrsync.py
  lib/lp/code/configure.zcml
  lib/lp/translations/model/translationtemplatesbuildjob.py
  lib/lp/codehosting/scanner/tests/test_mergedetection.py
  lib/lp/codehosting/scanner/events.py
  lib/lp/codehosting/scanner/branch_scanner.py
  lib/lp/codehosting/scanner/buglinks.py
  lib/lp/translations/tests/test_translationtemplatesbuildjob.py
  lib/lp/codehosting/scanner/tests/test_email.py
  lib/lp/codehosting/scanner/fixture.py
  lib/lp/codehosting/scanner/tests/test_buglinks.py
  lib/lp/codehosting/scanner/bzrsync.py
  lib/lp/codehosting/scanner/mergedetection.py
  lib/lp/codehosting/scanner/email.py
  lib/lp/code/model/branchjob.py

== Pylint notices ==

lib/lp/codehosting/scanner/tests/test_mergedetection.py
    102: [C0301] Line too long (79/78)

lib/lp/codehosting/scanner/bzrsync.py
    29: [F0401] Unable to import 'lazr.uri' (No module named uri)

lib/lp/code/model/branchjob.py
    30: [F0401] Unable to import 'lazr.enum' (No module named enum)
    31: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

[Brad Crittenden (bac)]

Hi Aaron,

The branch looks good with one silly comment:

> === modified file 'lib/lp/codehosting/scanner/branch_scanner.py'
> --- lib/lp/codehosting/scanner/branch_scanner.py 2010-02-15 16:46:42 +0000
> +++ lib/lp/codehosting/scanner/branch_scanner.py 2010-03-02 19:43:21 +0000
> @@ -14,17 +14,13 @@
>
> from bzrlib.errors import NotBranchError, ConnectionError
> # This non-standard import is necessary to hook up the event system.

Can you delete the comment now?

review: Approve (code)

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-02-20 04:51:43 +0000
+++ lib/lp/code/configure.zcml	2010-03-04 02:17:22 +0000
@@ -529,6 +529,30 @@
       for="lp.code.interfaces.branch.IBranch
            lazr.lifecycle.interfaces.IObjectCreatedEvent"
       handler="canonical.launchpad.subscribers.karma.branch_created"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.ITipChanged"
+      handler="lp.codehosting.scanner.email.queue_tip_changed_email_jobs"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.ITipChanged"
+      handler="lp.codehosting.scanner.bzrsync.schedule_diff_updates"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.ITipChanged"
+      handler="lp.codehosting.scanner.bzrsync.schedule_translation_templates_build"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.ITipChanged"
+      handler="lp.codehosting.scanner.bzrsync.schedule_translation_upload"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.IRevisionsRemoved"
+      handler="lp.codehosting.scanner.email.send_removed_revision_emails"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.INewRevision"
+      handler="lp.codehosting.scanner.buglinks.got_new_revision"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.IScanCompleted"
+      handler="lp.codehosting.scanner.mergedetection.auto_merge_proposals"/>
+  <subscriber
+      for="lp.codehosting.scanner.events.IScanCompleted"
+      handler="lp.codehosting.scanner.mergedetection.auto_merge_branches"/>
 
   <!-- Temporarily disabling queues
        <browser:page

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-02-22 12:28:46 +0000
+++ lib/lp/code/model/branchjob.py	2010-03-04 02:17:22 +0000
@@ -49,12 +49,7 @@
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.diff import StaticDiff
 from lp.code.model.revision import RevisionSet
-from lp.codehosting.scanner import buglinks, email, mergedetection
-from lp.codehosting.scanner.fixture import (
-    Fixtures, ServerFixture, make_zope_event_fixture)
-from lp.codehosting.scanner.bzrsync import (
-    BzrSync, schedule_diff_updates, schedule_translation_templates_build,
-    schedule_translation_upload)
+from lp.codehosting.scanner.bzrsync import BzrSync
 from lp.codehosting.vfs import (branch_id_to_path, get_multi_server,
     get_scanner_server)
 from lp.services.job.model.job import Job
@@ -290,21 +285,9 @@
         """See `IBranchScanJobSource`."""
         errorlog.globalErrorUtility.configure('branchscanner')
         cls.server = get_scanner_server()
-        event_handlers = [
-            email.queue_tip_changed_email_jobs,
-            buglinks.got_new_revision,
-            mergedetection.auto_merge_branches,
-            mergedetection.auto_merge_proposals,
-            schedule_diff_updates,
-            schedule_translation_templates_build,
-            schedule_translation_upload,
-            ]
-        fixture = Fixtures([
-            ServerFixture(cls.server),
-            make_zope_event_fixture(*event_handlers)])
-        fixture.setUp()
+        cls.server.start_server()
         yield
-        fixture.tearDown()
+        cls.server.stop_server()
 
 
 class BranchUpgradeJob(BranchJobDerived):

=== modified file 'lib/lp/codehosting/scanner/branch_scanner.py'
--- lib/lp/codehosting/scanner/branch_scanner.py	2010-02-15 16:46:42 +0000
+++ lib/lp/codehosting/scanner/branch_scanner.py	2010-03-04 02:17:22 +0000
@@ -14,17 +14,13 @@
 
 from bzrlib.errors import NotBranchError, ConnectionError
 # This non-standard import is necessary to hook up the event system.
-import zope.component.event
 from zope.component import getUtility
 
 from lp.code.interfaces.branchscanner import IBranchScanner
 from lp.codehosting.vfs import get_scanner_server
-from lp.codehosting.scanner import buglinks, email, mergedetection
-from lp.codehosting.scanner.bzrsync import (
-    BzrSync, schedule_diff_updates, schedule_translation_templates_build,
-    schedule_translation_upload)
+from lp.codehosting.scanner.bzrsync import BzrSync
 from lp.codehosting.scanner.fixture import (
-    Fixtures, make_zope_event_fixture, run_with_fixture, ServerFixture)
+    run_with_fixture, ServerFixture)
 from canonical.launchpad.webapp import canonical_url, errorlog
 
 
@@ -92,18 +88,8 @@
 
     def scanAllBranches(self):
         """Run Bzrsync on all branches, and intercept most exceptions."""
-        event_handlers = [
-            email.queue_tip_changed_email_jobs,
-            buglinks.got_new_revision,
-            mergedetection.auto_merge_branches,
-            mergedetection.auto_merge_proposals,
-            schedule_diff_updates,
-            schedule_translation_templates_build,
-            schedule_translation_upload,
-            ]
         server = get_scanner_server()
-        fixture = Fixtures(
-            [ServerFixture(server), make_zope_event_fixture(*event_handlers)])
+        fixture = ServerFixture(server)
         self.log.info('Starting branch scanning')
         branches = getUtility(IBranchScanner).getBranchesToScan()
         run_with_fixture(fixture, self.scanBranches, branches)

=== modified file 'lib/lp/codehosting/scanner/buglinks.py'
--- lib/lp/codehosting/scanner/buglinks.py	2009-07-17 00:26:05 +0000
+++ lib/lp/codehosting/scanner/buglinks.py	2010-03-04 02:17:22 +0000
@@ -11,11 +11,10 @@
 import urlparse
 
 from bzrlib.errors import InvalidBugStatus
-from zope.component import adapter, getUtility
+from zope.component import getUtility
 
-from lp.codehosting.scanner import events
 from canonical.launchpad.interfaces import (
-    IBugBranchSet, IBugSet, ILaunchpadCelebrities, NotFoundError)
+    IBugSet, ILaunchpadCelebrities, NotFoundError)
 
 
 class BugBranchLinker:
@@ -89,7 +88,6 @@
                     registrant=getUtility(ILaunchpadCelebrities).janitor)
 
 
-@adapter(events.NewRevision)
 def got_new_revision(new_revision):
     if new_revision.isMainline():
         linker = BugBranchLinker(new_revision.db_branch)

=== modified file 'lib/lp/codehosting/scanner/bzrsync.py'
--- lib/lp/codehosting/scanner/bzrsync.py	2010-02-17 17:49:36 +0000
+++ lib/lp/codehosting/scanner/bzrsync.py	2010-03-04 02:17:22 +0000
@@ -18,7 +18,7 @@
 import pytz
 import transaction
 
-from zope.component import adapter, getUtility
+from zope.component import getUtility
 from zope.event import notify
 
 from bzrlib.branch import BzrBranchFormat4
@@ -352,18 +352,15 @@
         self.db_branch.updateScannedDetails(revision, revision_count)
 
 
-@adapter(events.TipChanged)
 def schedule_translation_upload(tip_changed):
     getUtility(IRosettaUploadJobSource).create(
         tip_changed.db_branch, tip_changed.old_tip_revision_id)
 
 
-@adapter(events.TipChanged)
 def schedule_translation_templates_build(tip_changed):
     utility = getUtility(ITranslationTemplatesBuildJobSource)
     utility.scheduleTranslationTemplatesBuild(tip_changed.db_branch)
 
 
-@adapter(events.TipChanged)
 def schedule_diff_updates(tip_changed):
     tip_changed.db_branch.scheduleDiffUpdates()

=== modified file 'lib/lp/codehosting/scanner/email.py'
--- lib/lp/codehosting/scanner/email.py	2010-02-22 08:40:20 +0000
+++ lib/lp/codehosting/scanner/email.py	2010-03-04 02:17:22 +0000
@@ -9,13 +9,12 @@
     'queue_tip_changed_email_jobs',
     ]
 
-from zope.component import adapter, getUtility
+from zope.component import getUtility
 
 from canonical.config import config
 from lp.code.enums import BranchSubscriptionNotificationLevel
 from lp.code.interfaces.branchjob import (
     IRevisionsAddedJobSource, IRevisionMailJobSource)
-from lp.codehosting.scanner import events
 
 
 def subscribers_want_notification(db_branch):
@@ -26,7 +25,6 @@
     return subscriptions.count() > 0
 
 
-@adapter(events.RevisionsRemoved)
 def send_removed_revision_emails(revisions_removed):
     """Notify subscribers of removed revisions.
 
@@ -52,7 +50,6 @@
         body=contents, perform_diff=False, subject=subject)
 
 
-@adapter(events.TipChanged)
 def queue_tip_changed_email_jobs(tip_changed):
     if not subscribers_want_notification(tip_changed.db_branch):
         return

=== modified file 'lib/lp/codehosting/scanner/events.py'
--- lib/lp/codehosting/scanner/events.py	2009-06-30 16:56:07 +0000
+++ lib/lp/codehosting/scanner/events.py	2010-03-04 02:17:22 +0000
@@ -11,7 +11,10 @@
     ]
 
 
-class ScannerEvent:
+from zope.component.interfaces import IObjectEvent, implements, ObjectEvent
+
+
+class ScannerEvent(ObjectEvent):
     """Base scanner event."""
 
     def __init__(self, db_branch, bzr_branch):
@@ -20,13 +23,20 @@
         :param db_branch: The database IBranch.
         :param bzr_branch: The Bazaar branch being scanned.
         """
+        ObjectEvent.__init__(self, db_branch)
         self.db_branch = db_branch
         self.bzr_branch = bzr_branch
 
 
+class INewRevision(IObjectEvent):
+    """A new revision has been found in the branch."""
+
+
 class NewRevision(ScannerEvent):
     """A new revision has been found in the branch."""
 
+    implements(INewRevision)
+
     def __init__(self, db_branch, bzr_branch, db_revision, bzr_revision,
                  revno):
         """Construct a `NewRevision` event.
@@ -38,7 +48,7 @@
         :param revno: The revision number of the new revision, None if not
             mainline.
         """
-        super(NewRevision, self).__init__(db_branch, bzr_branch)
+        ScannerEvent.__init__(self, db_branch, bzr_branch)
         self.db_revision = db_revision
         self.bzr_revision = bzr_revision
         self.revno = revno
@@ -48,8 +58,13 @@
         return self.revno is not None
 
 
+class ITipChanged(IObjectEvent):
+    """The tip of the branch has changed."""
+
+
 class TipChanged(ScannerEvent):
     """The tip of the branch has changed."""
+    implements(ITipChanged)
 
     def __init__(self, db_branch, bzr_branch, initial_scan):
         """Construct a `TipChanged` event.
@@ -58,7 +73,7 @@
         :param bzr_branch: The Bazaar branch.
         :param initial_scan: Is this the first scan of the branch?
         """
-        super(TipChanged, self).__init__(db_branch, bzr_branch)
+        ScannerEvent.__init__(self, db_branch, bzr_branch)
         self.initial_scan = initial_scan
 
     @property
@@ -72,9 +87,15 @@
         return self.bzr_branch.last_revision()
 
 
+class IRevisionsRemoved(IObjectEvent):
+    """Revisions have been removed from the branch."""
+
+
 class RevisionsRemoved(ScannerEvent):
     """Revisions have been removed from the branch."""
 
+    implements(IRevisionsRemoved)
+
     def __init__(self, db_branch, bzr_branch, removed_history):
         """Construct a `RevisionsRemoved` event.
 
@@ -83,13 +104,18 @@
         :param removed_history: The mainline database `IRevision` objects that
             are no longer present in the mainline of the Bazaar branch.
         """
-        super(RevisionsRemoved, self).__init__(db_branch, bzr_branch)
+        ScannerEvent.__init__(self, db_branch, bzr_branch)
         self.removed_history = removed_history
 
+class IScanCompleted(IObjectEvent):
+    """The scan has been completed and the database is up-to-date."""
+
 
 class ScanCompleted(ScannerEvent):
     """The scan has been completed and the database is up-to-date."""
 
+    implements(IScanCompleted)
+
     def __init__(self, db_branch, bzr_branch, bzr_ancestry, logger):
         """Construct a `ScanCompleted` event.
 
@@ -100,7 +126,7 @@
         :param logger: A Python logger object that's used to report incidental
             information, such as merges that we find.
         """
-        super(ScanCompleted, self).__init__(db_branch, bzr_branch)
+        ScannerEvent.__init__(self, db_branch, bzr_branch)
         self.bzr_ancestry = bzr_ancestry
         # This is kind of ick. In a strict Zope sense, the logger should
         # probably be a registered utility.

=== modified file 'lib/lp/codehosting/scanner/fixture.py'
--- lib/lp/codehosting/scanner/fixture.py	2010-02-01 04:37:39 +0000
+++ lib/lp/codehosting/scanner/fixture.py	2010-03-04 02:17:22 +0000
@@ -14,7 +14,6 @@
     'Fixtures',
     'FixtureWithCleanup',
     'IFixture',
-    'make_zope_event_fixture',
     'run_with_fixture',
     'ServerFixture',
     'with_fixture',
@@ -120,10 +119,6 @@
         self.addCleanup(gsm.unregisterHandler, self._handler)
 
 
-def make_zope_event_fixture(*handlers):
-    return Fixtures(map(ZopeEventHandlerFixture, handlers))
-
-
 class ServerFixture:
     """Adapt a bzrlib `Server` into an `IFixture`."""
 

=== modified file 'lib/lp/codehosting/scanner/mergedetection.py'
--- lib/lp/codehosting/scanner/mergedetection.py	2009-08-06 19:07:32 +0000
+++ lib/lp/codehosting/scanner/mergedetection.py	2010-03-04 02:17:22 +0000
@@ -11,9 +11,7 @@
 
 from bzrlib.revision import NULL_REVISION
 
-from zope.component import adapter, getUtility
-
-from lp.codehosting.scanner import events
+from zope.component import getUtility
 
 from lp.code.enums import BranchLifecycleStatus
 from lp.code.interfaces.branchcollection import IAllBranches
@@ -70,7 +68,6 @@
             mark_branch_merged(logger, proposal.source_branch)
 
 
-@adapter(events.ScanCompleted)
 def auto_merge_branches(scan_completed):
     """Detect branches that have been merged.
 
@@ -117,7 +114,6 @@
             merge_detected(logger, branch, db_branch)
 
 
-@adapter(events.ScanCompleted)
 def auto_merge_proposals(scan_completed):
     """Detect merged proposals."""
     db_branch = scan_completed.db_branch

=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2009-08-28 06:39:38 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-03-04 02:17:22 +0000
@@ -8,8 +8,7 @@
 import unittest
 
 from bzrlib.revision import Revision
-# This non-standard import is necessary to hook up the event system.
-import zope.component.event
+from zope.event import notify
 from zope.component import getUtility
 
 from canonical.config import config
@@ -17,11 +16,12 @@
     IBugBranchSet, IBugSet, NotFoundError)
 from canonical.testing.layers import LaunchpadZopelessLayer
 
-from lp.codehosting.scanner.buglinks import got_new_revision, BugBranchLinker
-from lp.codehosting.scanner.fixture import make_zope_event_fixture
+from lp.code.interfaces.revision import IRevisionSet
+from lp.codehosting.scanner import events
+from lp.codehosting.scanner.buglinks import BugBranchLinker
 from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.testing import TestCase
+from lp.testing import TestCase, TestCaseWithFactory
 
 
 class RevisionPropertyParsing(TestCase):
@@ -108,9 +108,6 @@
 
     def setUp(self):
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(got_new_revision)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
 
     def makeFixtures(self):
         super(TestBugLinking, self).makeFixtures()
@@ -243,5 +240,28 @@
         self.assertBugBranchLinked(self.bug2, self.db_branch)
 
 
+class TestSubscription(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def test_got_new_revision_subscribed(self):
+        """got_new_revision is subscribed to NewRevision."""
+        self.useBzrBranches()
+        db_branch, tree = self.create_branch_and_tree()
+        bug = self.factory.makeBug()
+        self.layer.txn.commit()
+        LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
+        revision_id = tree.commit('fix revision',
+            revprops={'bugs': 'https://launchpad.net/bugs/%d fixed' % bug.id})
+        bzr_revision = tree.branch.repository.get_revision(revision_id)
+        revno = 1
+        revision_set = getUtility(IRevisionSet)
+        db_revision = revision_set.newFromBazaarRevision(bzr_revision)
+        notify(events.NewRevision(
+            db_branch, tree.branch, db_revision, bzr_revision, revno))
+        bug_branch = getUtility(IBugBranchSet).getBugBranch(bug, db_branch)
+        self.assertIsNot(None, bug_branch)
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-01-20 23:10:44 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-03-04 02:17:22 +0000
@@ -33,9 +33,7 @@
 from lp.code.model.branchmergeproposaljob import IUpdatePreviewDiffJobSource
 from lp.code.model.revision import Revision, RevisionAuthor, RevisionParent
 from lp.codehosting.scanner.bzrsync import (
-    BzrSync, InvalidStackedBranchURL, schedule_diff_updates,
-    schedule_translation_upload)
-from lp.codehosting.scanner.fixture import make_zope_event_fixture
+    BzrSync, InvalidStackedBranchURL)
 from lp.testing.factory import LaunchpadObjectFactory
 from canonical.testing import LaunchpadZopelessLayer
 
@@ -599,9 +597,6 @@
 
     def setUp(self):
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(schedule_translation_upload)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
 
     def _makeProductSeries(self, mode = None):
         """Switch to the Launchpad db user to create and configure a
@@ -656,9 +651,6 @@
     def setUp(self):
         """Set up `schedule_diff_updates` to handle tip changes."""
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(schedule_diff_updates)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
 
     @run_as_db_user(config.launchpad.dbuser)
     def test_create_on_new_revision(self):

=== modified file 'lib/lp/codehosting/scanner/tests/test_email.py'
--- lib/lp/codehosting/scanner/tests/test_email.py	2010-02-22 08:40:20 +0000
+++ lib/lp/codehosting/scanner/tests/test_email.py	2010-03-04 02:17:22 +0000
@@ -8,23 +8,22 @@
 import email
 import unittest
 
-# This non-standard import is necessary to hook up the event system.
-import zope.component.event
+from zope.event import notify
 from zope.component import getUtility
 
+from canonical.testing import LaunchpadZopelessLayer
 from lp.code.enums import (
     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
     CodeReviewNotificationLevel)
-from lp.codehosting.scanner.email import (
-    send_removed_revision_emails, queue_tip_changed_email_jobs)
-from lp.codehosting.scanner.fixture import make_zope_event_fixture
-from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
 from lp.code.interfaces.branchjob import (
     IRevisionMailJobSource, IRevisionsAddedJobSource)
+from lp.code.model.branchjob import (RevisionMailJob)
+from lp.codehosting.scanner import events
+from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.job.runner import JobRunner
 from lp.services.mail import stub
-from canonical.testing import LaunchpadZopelessLayer
+from lp.testing import TestCaseWithFactory
 
 
 class TestBzrSyncEmail(BzrSyncTestCase):
@@ -32,10 +31,6 @@
 
     def setUp(self):
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(
-            queue_tip_changed_email_jobs, send_removed_revision_emails)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
         stub.test_emails = []
 
     def makeDatabaseBranch(self):
@@ -141,6 +136,37 @@
             self.assertTextIn(bit, recommit_email_body)
 
 
+class TestScanBranches(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def test_queue_tip_changed_email_jobs_subscribed(self):
+        """A queue_tip_changed_email_jobs is run when TipChanged emitted."""
+        self.useBzrBranches()
+        db_branch, tree = self.create_branch_and_tree()
+        db_branch.subscribe(
+            db_branch.registrant,
+            BranchSubscriptionNotificationLevel.FULL,
+            BranchSubscriptionDiffSize.WHOLEDIFF,
+            CodeReviewNotificationLevel.FULL)
+        self.assertEqual(0, len(list(RevisionMailJob.iterReady())))
+        notify(events.TipChanged(db_branch, tree.branch, True))
+        self.assertEqual(1, len(list(RevisionMailJob.iterReady())))
+
+    def test_send_removed_revision_emails_subscribed(self):
+        """send_removed_revision_emails run when RevisionsRemoved emitted."""
+        self.useBzrBranches()
+        db_branch, tree = self.create_branch_and_tree()
+        db_branch.subscribe(
+            db_branch.registrant,
+            BranchSubscriptionNotificationLevel.FULL,
+            BranchSubscriptionDiffSize.WHOLEDIFF,
+            CodeReviewNotificationLevel.FULL)
+        self.assertEqual(0, len(list(RevisionMailJob.iterReady())))
+        notify(events.RevisionsRemoved(db_branch, tree.branch, ['x']))
+        self.assertEqual(1, len(list(RevisionMailJob.iterReady())))
+
+
 class TestBzrSyncNoEmail(BzrSyncTestCase):
     """Tests BzrSync support for not generating branch email notifications
     when no one is interested.
@@ -148,10 +174,6 @@
 
     def setUp(self):
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(
-            queue_tip_changed_email_jobs, send_removed_revision_emails)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
         stub.test_emails = []
 
     def assertNoPendingEmails(self):

=== modified file 'lib/lp/codehosting/scanner/tests/test_mergedetection.py'
--- lib/lp/codehosting/scanner/tests/test_mergedetection.py	2009-08-06 19:07:32 +0000
+++ lib/lp/codehosting/scanner/tests/test_mergedetection.py	2010-03-04 02:17:22 +0000
@@ -12,9 +12,9 @@
 import transaction
 
 from zope.component import getUtility
+from zope.event import notify
 
 from lp.codehosting.scanner import events
-from lp.codehosting.scanner.fixture import make_zope_event_fixture
 from lp.codehosting.scanner import mergedetection
 from lp.codehosting.scanner.tests.test_bzrsync import (
     BzrSyncTestCase, run_as_db_user)
@@ -31,11 +31,6 @@
 
     def setUp(self):
         BzrSyncTestCase.setUp(self)
-        fixture = make_zope_event_fixture(
-            mergedetection.auto_merge_branches,
-            mergedetection.auto_merge_proposals)
-        fixture.setUp()
-        self.addCleanup(fixture.tearDown)
 
     @run_as_db_user(config.launchpad.dbuser)
     def createProposal(self, source, target):
@@ -326,6 +321,17 @@
         self.assertNotEqual(
             BranchLifecycleStatus.MERGED, source.lifecycle_status)
 
+    def test_auto_merge_branches_subscribed(self):
+        """Auto merging is triggered by ScanCompleted."""
+        source = self.factory.makeBranch()
+        source.last_scanned_id = '23foo'
+        target = self.factory.makeBranchTargetBranch(source.target)
+        target.product.development_focus.branch = target
+        logger = logging.getLogger('test')
+        notify(events.ScanCompleted(target, None, ['23foo'], logger))
+        self.assertEqual(
+            BranchLifecycleStatus.MERGED, source.lifecycle_status)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-02-17 23:31:40 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-03-04 02:17:22 +0000
@@ -35,6 +35,9 @@
     Implementation-wise, this is actually a `BranchJob`.
     """
     implements(IBranchJob, IBuildFarmJob)
+
+    class_job_type = BranchJobType.TRANSLATION_TEMPLATES_BUILD
+
     classProvides(
         ISpecificBuildFarmJobClass, ITranslationTemplatesBuildJobSource)
 

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-02-17 23:31:40 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-03-04 02:17:22 +0000
@@ -6,6 +6,7 @@
 from unittest import TestLoader
 
 from zope.component import getUtility
+from zope.event import notify
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -23,6 +24,8 @@
     IBuildFarmJobBehavior)
 from lp.code.interfaces.branchjob import IBranchJob
 from lp.code.model.branchjob import BranchJob
+from lp.code.model.directbranchcommit import DirectBranchCommit
+from lp.codehosting.scanner import events
 from lp.services.job.model.job import Job
 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
 from lp.soyuz.model.buildqueue import BuildQueue
@@ -214,6 +217,18 @@
         removeSecurityProxy(branch).private = True
         self.assertFalse(self.jobsource.generatesTemplates(branch))
 
+    def test_scheduleTranslationTemplatesBuild_subscribed(self):
+        # If the feature is enabled, a TipChanged event for a branch that
+        # generates templates will schedule a templates build.
+        branch = self._makeTranslationBranch()
+        commit = DirectBranchCommit(branch, to_mirror=True)
+        commit.writeFile('POTFILES.in', 'foo')
+        commit.commit('message')
+        notify(events.TipChanged(branch, None, False))
+        branchjobs = list(TranslationTemplatesBuildJob.iterReady())
+        self.assertEqual(1, len(branchjobs))
+        self.assertEqual(branch, branchjobs[0].branch)
+
     def test_scheduleTranslationTemplatesBuild(self):
         # If the feature is enabled, scheduleTranslationTemplatesBuild
         # will schedule a templates build whenever a change is pushed to