Merge lp:~mwhudson/launchpad/no-hosted-area-scanner-tests into lp:launchpad/db-devel

[Michael Hudson-Doyle]

Hi Tim,

This branch fixes the tests of the scanner, mostly by deleting obsolete code.

Cheers,
mwh

[Tim Penhey (thumper)]

lib/lp/codehosting/scanner/tests/test_bzrsync.py

def makeFixtures(self):
 - assigns self.db_branch to self.makeDatabaseBranch(), just before
   calling self.create_branch_and_tree. I'm pretty sure you can delete
   the first one.

That's all for this one.

review: Approve (conditional)

=== modified file 'lib/lp/code/stories/branches/xx-branch-mirror-failures.txt'
--- lib/lp/code/stories/branches/xx-branch-mirror-failures.txt	2010-04-27 02:23:41 +0000
+++ lib/lp/code/stories/branches/xx-branch-mirror-failures.txt	2010-04-27 02:23:46 +0000
@@ -163,7 +163,9 @@
     >>> login(ANONYMOUS)
     >>> mirror_branch = getUtility(IBranchLookup).getByUniqueName(mirror_name)
     >>> mirror_branch.startMirroring()
-    >>> mirror_branch.branchChanged('', 'some-revision-id', None, None, None)
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> removeSecurityProxy(mirror_branch).branchChanged(
+    ...     '', 'some-revision-id', None, None, None)
     >>> logout()
 
     >>> browser.open(branch_location)
 
=== modified file 'lib/lp/codehosting/scanner/bzrsync.py'
--- lib/lp/codehosting/scanner/bzrsync.py	2010-04-27 02:23:41 +0000
+++ lib/lp/codehosting/scanner/bzrsync.py	2010-04-27 02:23:46 +0000
@@ -21,14 +21,8 @@
 from zope.component import getUtility
 from zope.event import notify
 
-from bzrlib import urlutils
-
-from lazr.uri import URI
-
 from lp.codehosting import iter_list_chunks
-from lp.codehosting.puller.worker import BranchMirrorer
 from lp.codehosting.scanner import events
-from lp.codehosting.vfs.branchfs import BranchPolicy
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
 from lp.code.interfaces.branchrevision import IBranchRevisionSet
 from lp.code.interfaces.revision import IRevisionSet
@@ -38,33 +32,6 @@
 UTC = pytz.timezone('UTC')
 
 
-class InvalidStackedBranchURL(Exception):
-    """Raised when we try to scan a branch stacked on an invalid URL."""
-
-
-class WarehouseBranchPolicy(BranchPolicy):
-
-    def checkOneURL(self, url):
-        """See `BranchOpener.checkOneURL`.
-
-        If the URLs we are mirroring from are anything but a
-        lp-mirrored:///~user/project/branch URLs, we don't want to scan them.
-        Opening branches on remote systems takes too long, and we want all of
-        our local access to be channelled through this transport.
-        """
-        uri = URI(url)
-        if uri.scheme != 'lp-mirrored':
-            raise InvalidStackedBranchURL(url)
-
-    def transformFallbackLocation(self, branch, url):
-        """See `BranchPolicy.transformFallbackLocation`.
-
-        We're happy to open stacked branches in the usual manner, but want to
-        go on checking the URLs of any branches we then open.
-        """
-        return urlutils.join(branch.base, url), True
-
-
 class BzrSync:
     """Import version control metadata from a Bazaar branch into the database.
     """
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-03-02 18:56:25 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-04-27 02:23:46 +0000
@@ -246,7 +246,7 @@
 
     def test_got_new_revision_subscribed(self):
         """got_new_revision is subscribed to NewRevision."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         db_branch, tree = self.create_branch_and_tree()
         bug = self.factory.makeBug()
         self.layer.txn.commit()
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-04-27 02:23:41 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-04-27 02:23:46 +0000
@@ -13,9 +13,6 @@
 import unittest
 
 from bzrlib.revision import NULL_REVISION, Revision as BzrRevision
-from bzrlib.transport import (
-    get_transport, register_transport, unregister_transport)
-from bzrlib.transport.chroot import ChrootServer
 from bzrlib.uncommit import uncommit
 from bzrlib.tests import TestCaseWithTransport
 import pytz
@@ -32,9 +29,8 @@
 from lp.code.model.branchrevision import BranchRevision
 from lp.code.model.branchmergeproposaljob import IUpdatePreviewDiffJobSource
 from lp.code.model.revision import Revision, RevisionAuthor, RevisionParent
-from lp.codehosting.scanner.bzrsync import (
-    BzrSync, InvalidStackedBranchURL)
-from lp.testing.factory import LaunchpadObjectFactory
+from lp.codehosting.scanner.bzrsync import BzrSync
+from lp.testing import TestCaseWithFactory
 from canonical.testing import LaunchpadZopelessLayer
 
 
@@ -55,44 +51,7 @@
     return _run_with_different_user
 
 
-class FakeTransportServer:
-    """Set up a fake transport at a given URL prefix.
-
-    For testing purposes.
-    """
-
-    def __init__(self, transport, url_prefix='lp-mirrored:///'):
-        """Constructor.
-
-        :param transport: The backing transport to store the data with.
-        :param url_prefix: The URL prefix to access this transport.
-        """
-        self._transport = transport
-        self._url_prefix = url_prefix
-        self._chroot_server = None
-
-    def start_server(self):
-        """Activate the transport URL."""
-        # The scanner tests assume that branches live on a Launchpad virtual
-        # filesystem rooted at 'lp-mirrored:///'. Rather than provide the
-        # entire virtual filesystem here, we fake it by having a chrooted
-        # transport do the work.
-        register_transport(self._url_prefix, self._transportFactory)
-        self._chroot_server = ChrootServer(self._transport)
-        self._chroot_server.start_server()
-
-    def stop_server(self):
-        """Deactivate the transport URL."""
-        self._chroot_server.stop_server()
-        unregister_transport(self._url_prefix, self._transportFactory)
-
-    def _transportFactory(self, url):
-        assert url.startswith(self._url_prefix)
-        url = self._chroot_server.get_url() + url[len(self._url_prefix):]
-        return get_transport(url)
-
-
-class BzrSyncTestCase(TestCaseWithTransport):
+class BzrSyncTestCase(TestCaseWithTransport, TestCaseWithFactory):
     """Common base for BzrSync test cases."""
 
     layer = LaunchpadZopelessLayer
@@ -101,21 +60,17 @@
 
     def setUp(self):
         TestCaseWithTransport.setUp(self)
-        self.factory = LaunchpadObjectFactory()
+        TestCaseWithFactory.setUp(self)
+        self.disable_directory_isolation()
+        self.useBzrBranches(direct_database=True)
+        self.lp_db_user = config.launchpad.dbuser
         self.makeFixtures()
-        self.lp_db_user = config.launchpad.dbuser
         LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
-        # The lp-mirrored transport is set up by the branch_scanner module.
-        # Here we set up a fake so that we can test without worrying about
-        # authservers and the like.
-        server = FakeTransportServer(self.get_transport())
-        server.start_server()
-        self.addCleanup(server.stop_server)
 
     def makeFixtures(self):
         """Makes test fixtures before we switch to the scanner db user."""
-        self.db_branch = self.makeDatabaseBranch()
-        self.bzr_tree = self.makeBzrBranchAndTree(self.db_branch)
+        self.db_branch, self.bzr_tree = self.create_branch_and_tree(
+            db_branch=self.makeDatabaseBranch())
         self.bzr_branch = self.bzr_tree.branch
 
     def syncBazaarBranchToDatabase(self, bzr_branch, db_branch):
@@ -123,11 +78,6 @@
         syncer = self.makeBzrSync(db_branch)
         syncer.syncBranchAndClose(bzr_branch)
 
-    def makeBzrBranchAndTree(self, db_branch, format=None):
-        """Make a Bazaar branch at the warehouse location of `db_branch`."""
-        self.get_transport(db_branch.unique_name).create_prefix()
-        return self.make_branch_and_tree(db_branch.unique_name, format=format)
-
     def makeDatabaseBranch(self, *args, **kwargs):
         """Make an arbitrary branch in the database."""
         LaunchpadZopelessLayer.txn.begin()
@@ -248,12 +198,14 @@
 
         # Make the base revision.
         db_branch = self.makeDatabaseBranch()
-        trunk_tree = self.makeBzrBranchAndTree(db_branch)
+        db_branch, trunk_tree = self.create_branch_and_tree(
+            db_branch=db_branch)
         trunk_tree.commit(u'base revision', rev_id=base_rev_id)
 
         # Branch from the base revision.
         new_db_branch = self.makeDatabaseBranch(product=db_branch.product)
-        branch_tree = self.makeBzrBranchAndTree(new_db_branch)
+        new_db_branch, branch_tree = self.create_branch_and_tree(
+            db_branch=new_db_branch)
         branch_tree.pull(trunk_tree.branch)
 
         # Commit to both branches.
@@ -517,7 +469,7 @@
             (branch_revision.revision.revision_id, branch_revision.id)
             for branch_revision in sampledata)
 
-        self.makeBzrBranchAndTree(branch)
+        self.create_branch_and_tree(db_branch=branch)
 
         bzrsync = self.makeBzrSync(branch)
         db_ancestry, db_history, db_branch_revision_map = (
@@ -527,37 +479,6 @@
         self.assertEqual(expected_mapping, db_branch_revision_map)
 
 
-class TestScanStackedBranches(BzrSyncTestCase):
-    """Tests for scanning stacked branches."""
-
-    @run_as_db_user(config.launchpad.dbuser)
-    def testStackedBranchBadURL(self):
-        # The scanner will raise an InvalidStackedBranchURL when it tries to
-        # open a branch stacked on a non- lp-mirrored:// schema.
-        db_branch = self.makeDatabaseBranch()
-        stacked_on_branch = self.make_branch('stacked-on', format='1.6')
-        self.assertFalse(stacked_on_branch.base.startswith('lp-mirrored://'))
-        bzr_tree = self.makeBzrBranchAndTree(db_branch, format='1.6')
-        bzr_tree.branch.set_stacked_on_url(stacked_on_branch.base)
-        scanner = self.makeBzrSync(db_branch)
-        self.assertRaises(InvalidStackedBranchURL, scanner.syncBranchAndClose)
-
-    @run_as_db_user(config.launchpad.dbuser)
-    def testStackedBranch(self):
-        # We can scan a stacked branch that's stacked on a branch that has an
-        # lp-mirrored:// URL.
-        db_stacked_on_branch = self.factory.makeAnyBranch()
-        self.makeBzrBranchAndTree(db_stacked_on_branch, format='1.6')
-        db_stacked_branch = self.factory.makeAnyBranch()
-        stacked_tree = self.makeBzrBranchAndTree(
-            db_stacked_branch, format='1.6')
-        stacked_tree.branch.set_stacked_on_url(
-            'lp-mirrored:///%s' % db_stacked_on_branch.unique_name)
-        scanner = self.makeBzrSync(db_stacked_branch)
-        # This does not raise an exception.
-        scanner.syncBranchAndClose()
-
-
 class TestBzrSyncOneRevision(BzrSyncTestCase):
     """Tests for `BzrSync.syncOneRevision`."""
 
@@ -594,9 +515,6 @@
 class TestBzrTranslationsUploadJob(BzrSyncTestCase):
     """Tests BzrSync support for generating TranslationsUploadJobs."""
 
-    def setUp(self):
-        BzrSyncTestCase.setUp(self)
-
     def _makeProductSeries(self, mode = None):
         """Switch to the Launchpad db user to create and configure a
         product series that is linked to the the branch.
@@ -647,10 +565,6 @@
 class TestUpdatePreviewDiffJob(BzrSyncTestCase):
     """Test the scheduling of jobs to update preview diffs."""
 
-    def setUp(self):
-        """Set up `schedule_diff_updates` to handle tip changes."""
-        BzrSyncTestCase.setUp(self)
-
     @run_as_db_user(config.launchpad.dbuser)
     def test_create_on_new_revision(self):
         """When branch tip changes, a job is created."""
 
=== modified file 'lib/lp/codehosting/scanner/tests/test_email.py'
--- lib/lp/codehosting/scanner/tests/test_email.py	2010-02-26 21:40:42 +0000
+++ lib/lp/codehosting/scanner/tests/test_email.py	2010-04-27 02:23:46 +0000
@@ -142,7 +142,7 @@
 
     def test_queue_tip_changed_email_jobs_subscribed(self):
         """A queue_tip_changed_email_jobs is run when TipChanged emitted."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         db_branch, tree = self.create_branch_and_tree()
         db_branch.subscribe(
             db_branch.registrant,
@@ -155,7 +155,7 @@
 
     def test_send_removed_revision_emails_subscribed(self):
         """send_removed_revision_emails run when RevisionsRemoved emitted."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         db_branch, tree = self.create_branch_and_tree()
         db_branch.subscribe(
             db_branch.registrant,