Merge lp:~mwhudson/launchpad/no-hosted-area-fix-useBzrBranch-users into lp:launchpad/db-devel

[Michael Hudson-Doyle]

Hi Tim,

This branch is a bit of a mess of assorted test fixes. I hope it's not too deathly dull to read!

Cheers,
mwh

[Tim Penhey (thumper)]

I know that it is not worth it now, but in
lib/lp/code/model/tests/test_branchjob.py you could
have just overridden the inherited useBzrBranches method
to make it always specify direct_database=True.

It may be an interesting count, but which is used more?
direct_database=True or False?

lib/lp/testing/__init__.py
 - you still have: raise AssertionError("XXX")

removeSecurityProxy(branch).last_scanned_id = 'null:'
 - is there a bzrlib constant we can use here?

And yes, it was a pretty boring branch to review. Great
to see a consistent use of getInternalBzrUrl and getBzrBranch.

review: Approve (conditional)

[Michael Hudson-Doyle (mwhudson)]

On 26/04/10 20:58, Tim Penhey wrote:
> Review: Approve conditional
> I know that it is not worth it now, but in
> lib/lp/code/model/tests/test_branchjob.py you could
> have just overridden the inherited useBzrBranches method
> to make it always specify direct_database=True.

Yeah, this aspect of things does smell a bit doesn't it?

> It may be an interesting count, but which is used more?
> direct_database=True or False?

It seems 43 of 64 calls use direct_database=True -- quite a lot!

Part of my unease around this comes from the fact that what determines
whether to use direct_database or not basically depends on the layer --
if it's a appserver layer, don't use direct_database, otherwise do. I
don't know if tying it to the layer makes sense though.

What do you think?

> lib/lp/testing/__init__.py
> - you still have: raise AssertionError("XXX")
>
> removeSecurityProxy(branch).last_scanned_id = 'null:'
> - is there a bzrlib constant we can use here?

Yes, but that line disappears in a later pipe anyway I think...

> And yes, it was a pretty boring branch to review. Great
> to see a consistent use of getInternalBzrUrl and getBzrBranch.

Yeah!

Cheers,
mwh

=== modified file 'lib/canonical/buildd/tests/test_generate_translation_templates.py'
--- lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-03-18 13:27:47 +0000
+++ lib/canonical/buildd/tests/test_generate_translation_templates.py	2010-04-27 02:24:35 +0000
@@ -57,7 +57,7 @@
 
         :return: a fresh lp.code.model.Branch backed by a real bzr branch.
         """
-        db_branch, tree = self.create_branch_and_tree(hosted=True)
+        db_branch, tree = self.create_branch_and_tree()
         populist = DirectBranchCommit(db_branch)
         last_revision = populist.bzrbranch.last_revision()
         db_branch.last_scanned_id = populist.last_scanned_id = last_revision
@@ -71,13 +71,13 @@
 
     def test_getBranch_bzr(self):
         # _getBranch can retrieve branch contents from a branch URL.
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         marker_text = "Ceci n'est pas cet branch."
         branch = self._createBranch({'marker.txt': marker_text})
-        branch_url = branch.getPullURL()
 
         generator = GenerateTranslationTemplates(
-            branch_url, self.result_name, self.makeTemporaryDirectory())
+            branch.getInternalBzrUrl(), self.result_name,
+            self.makeTemporaryDirectory())
         generator.branch_dir = self.makeTemporaryDirectory()
         generator._getBranch()
 
 
=== added directory 'lib/canonical/launchpad/apidoc'
=== modified file 'lib/canonical/launchpad/scripts/tests/test_garbo.py'
--- lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-04-14 13:14:00 +0000
+++ lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-04-27 02:24:35 +0000
@@ -448,7 +448,6 @@
 
     def test_BranchJobPruner(self):
         # Garbo should remove jobs completed over 30 days ago.
-        self.useBzrBranches()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
         store = IMasterStore(Job)
 
@@ -478,7 +477,6 @@
     def test_BranchJobPruner_doesnt_prune_recent_jobs(self):
         # Check to make sure the garbo doesn't remove jobs that aren't more
         # than thirty days old.
-        self.useBzrBranches()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
         store = IMasterStore(Job)
 
 
=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-27 02:24:30 +0000
+++ lib/lp/code/configure.zcml	2010-04-27 02:24:35 +0000
@@ -471,7 +471,6 @@
                     last_scanned
                     last_scanned_id
                     revision_count
-                    warehouse_url
                     bug_branches
                     linked_bugs
                     linkBug
@@ -519,6 +518,7 @@
                     getNotificationRecipients
                     getScannerData
                     getPullURL
+                    getInternalBzrUrl
                     getBzrBranch
                     requestMirror
                     startMirroring
 
=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/interfaces/branch.py	2010-04-27 02:24:35 +0000
@@ -596,12 +596,6 @@
 
     stacked_on = Attribute('Stacked-on branch')
 
-    warehouse_url = Attribute(
-        "URL for accessing the branch by ID. "
-        "This is for in-datacentre services only and allows such services to "
-        "be unaffected during branch renames. "
-        "See doc/bazaar for more information about the branch warehouse.")
-
     # Bug attributes
     bug_branches = CollectionField(
             title=_("The bug-branch link objects that link this branch "
@@ -1076,7 +1070,15 @@
                the corresponding BranchRevision rows for this branch.
         """
 
-    def getBzrBranch(self):
+    def getInternalBzrUrl():
+        """Get the internal URL for this branch.
+
+        It's generally better to use `getBzrBranch` to open the branch
+        directly, as that method is safe against the branch unexpectedly being
+        a branch reference or stacked on something mischievous.
+        """
+
+    def getBzrBranch():
         """Return the BzrBranch for this database Branch.
 
         You can only call this if a server returned by `get_ro_server` or
 
=== modified file 'lib/lp/code/interfaces/branchtarget.py'
--- lib/lp/code/interfaces/branchtarget.py	2010-04-13 11:05:58 +0000
+++ lib/lp/code/interfaces/branchtarget.py	2010-04-27 02:24:35 +0000
@@ -34,7 +34,9 @@
     Branches that are *not* suitable include:
       - remote branches
       - branches the user cannot see
-      - branches that have not yet been successfully processed by the puller.
+      - branches that have no last revision information set (hosted branches
+        where a push hasn't completed or a mirrored branch that hasn't been
+        mirrored, etc).
 
     If the given branch is not suitable, return None. For convenience, also
     returns None if passed None. Otherwise, return the branch.
@@ -47,7 +49,7 @@
         return None
     if branch_type == BranchType.REMOTE:
         return None
-    if branch.last_mirrored is None:
+    if branch.last_mirrored_id is None:
         return None
     return branch
 
 
=== modified file 'lib/lp/code/mail/codehandler.py'
--- lib/lp/code/mail/codehandler.py	2010-03-18 20:53:36 +0000
+++ lib/lp/code/mail/codehandler.py	2010-04-27 02:24:35 +0000
@@ -21,7 +21,6 @@
 
 from zope.component import getUtility
 from zope.interface import implements
-from zope.security.proxy import removeSecurityProxy
 
 from lp.codehosting.bzrutils import is_branch_stackable
 from lp.codehosting.vfs import get_lp_server
@@ -495,7 +494,7 @@
         # source branch - one that has *no* Bazaar data.  Together these
         # prevent users from using Launchpad disk space at a rate that is
         # disproportionately greater than data uploaded.
-        mirrored_bzr_target = removeSecurityProxy(db_target).getBzrBranch()
+        mirrored_bzr_target = db_target.getBzrBranch()
         if not is_branch_stackable(mirrored_bzr_target):
             return db_source
         assert db_source.branch_type == BranchType.HOSTED, (
 
=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2010-04-27 02:24:35 +0000
@@ -848,13 +848,6 @@
         transaction.commit()
         LaunchpadZopelessLayer.switchDbUser(user)
 
-    def _mirror(self, db_branch, bzr_branch):
-        # Ensure the directories containing the mirror branch exist.
-        transport = get_transport(db_branch.warehouse_url)
-        lp_mirror = BzrDir.create_branch_convenience(db_branch.warehouse_url)
-        self.addCleanup(transport.delete_tree, '.')
-        lp_mirror.pull(bzr_branch)
-
     def _createTargetSourceAndBundle(self, format=None):
         """Create a merge directive with a bundle and associated branches.
 
@@ -909,7 +902,7 @@
         # branch that is created is an empty hosted branch.  The new branch
         # will not have a mirror requested as there are no revisions, and
         # there is no branch created in the hosted area.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="pack-0.92")
         bmp = self._processMergeDirective(message)
@@ -921,7 +914,7 @@
         # mirrored, the source branch that is created is an empty hosted
         # branch.  The new branch will not have a mirror requested as there
         # are no revisions, and there is no branch created in the hosted area.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="1.9")
         # Mark the target branch as "unmirrored", at least as far as the db is
@@ -936,7 +929,7 @@
         # branch that is created is a hosted branch stacked on the target
         # branch. The source branch will have the revisions from the bundle,
         # and a mirror will have been triggered.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="1.9")
         bmp = self._processMergeDirective(message)
@@ -946,24 +939,10 @@
         self.assertEqual(
             source.last_revision(), source_bzr_branch.last_revision())
 
-    def test_correct_area(self):
-        # When a branch is created for a merge directive, it is created in the
-        # hosted area (getPullURL) not the mirrored area (warehouse_url).
-        self.useBzrBranches(real_server=True)
-        branch, source, message = self._createTargetSourceAndBundle(
-            format="1.9")
-        bmp = self._processMergeDirective(message)
-        # The hosted location should be populated (open succeeds).
-        self._openBazaarBranchAsClient(bmp.source_branch)
-        # Not the mirror (open raises).
-        self.assertRaises(
-            bzr_errors.NotBranchError, Branch.open,
-            bmp.source_branch.warehouse_url)
-
     def test_branch_stacked(self):
         # When a branch is created for a merge directive, it is created
         # stacked on the target branch.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="1.9")
         bmp = self._processMergeDirective(message)
@@ -983,7 +962,7 @@
     def test_source_not_newer(self):
         # The source branch is created correctly when the source is not newer
         # than the target, instead of raising DivergedBranches.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="1.9")
         target_tree = WorkingTree.open('.')
@@ -998,20 +977,16 @@
         db_target_branch, target_tree = self.create_branch_and_tree(
             'target', format=target_format)
         target_tree.branch.set_public_branch(db_target_branch.bzr_identity)
-        target_tree.commit('rev1')
-        # Make sure that the created branch has been mirrored.
-        db_target_branch.startMirroring()
+        revid = target_tree.commit('rev1')
         removeSecurityProxy(db_target_branch).branchChanged(
-            '', 'rev1', None, None, None)
+            '', revid, None, None, None)
 
         db_source_branch, source_tree = self.create_branch_and_tree(
-            'lpsource', db_target_branch.product, hosted=True,
-            format=source_format)
+            'lpsource', db_target_branch.product, format=source_format)
         # The branch is not scheduled to be mirrorred.
         self.assertIs(db_source_branch.next_mirror_time, None)
         source_tree.pull(target_tree.branch)
         source_tree.commit('rev2', rev_id='rev2')
-        self._mirror(db_source_branch, source_tree.branch)
         # bundle_tree is effectively behaving like a local copy of
         # db_source_branch, and is used to create the merge directive.
         bundle_tree = source_tree.bzrdir.sprout('source').open_workingtree()
@@ -1030,41 +1005,34 @@
     def test_existing_stacked_branch(self):
         # A bundle can update an existing branch if they are both stackable,
         # and the source branch is stacked.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         lp_source, message = self._createPreexistingSourceAndMessage(
             target_format="1.9", source_format="1.9", set_stacked=True)
         bmp = self._processMergeDirective(message)
         # The branch merge proposal should use the existing db branch.
         self.assertEqual(lp_source, bmp.source_branch)
-        # Now the branch is now scheduled to be mirrorred.
-        self.assertIsNot(None, lp_source.next_mirror_time)
-        mirror = removeSecurityProxy(bmp.source_branch).getBzrBranch()
-        # The mirrored copy of the branch has not been updated.
-        self.assertEqual('rev2', mirror.last_revision())
-        hosted = self._openBazaarBranchAsClient(bmp.source_branch)
-        # The hosted copy of the branch has been updated.
-        self.assertEqual('rev3', hosted.last_revision())
+        bzr_branch = self._openBazaarBranchAsClient(bmp.source_branch)
+        # The branch has been updated.
+        self.assertEqual('rev3', bzr_branch.last_revision())
 
     def test_existing_unstacked_branch(self):
         # Even if the source and target are stackable, if the source is not
         # stacked, we don't support stacking something that wasn't stacked
         # before (yet).
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         lp_source, message = self._createPreexistingSourceAndMessage(
             target_format="1.9", source_format="1.9")
         bmp = self._processMergeDirective(message)
         # The branch merge proposal should use the existing db branch.
         self.assertEqual(lp_source, bmp.source_branch)
-        # Now the branch is not scheduled to be mirrorred.
-        self.assertIs(None, lp_source.next_mirror_time)
-        hosted = self._openBazaarBranchAsClient(bmp.source_branch)
+        bzr_branch = self._openBazaarBranchAsClient(bmp.source_branch)
         # The hosted copy of the branch has not been updated.
-        self.assertEqual('rev2', hosted.last_revision())
+        self.assertEqual('rev2', bzr_branch.last_revision())
 
     def test_existing_branch_nonstackable_target(self):
         # If the target branch is not stackable, then we don't pull any
         # revisions.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         lp_source, message = self._createPreexistingSourceAndMessage(
             target_format="pack-0.92", source_format="1.9")
         bmp = self._processMergeDirective(message)
@@ -1079,7 +1047,7 @@
     def test_existing_branch_nonstackable_source(self):
         # If the source branch is not stackable, then we don't pull any
         # revisions.
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         lp_source, message = self._createPreexistingSourceAndMessage(
             target_format="1.9", source_format="pack-0.92")
         bmp = self._processMergeDirective(message)
@@ -1093,7 +1061,7 @@
 
     def test_forbidden_target(self):
         """Specifying a branch in a forbidden target generates email."""
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, source, message = self._createTargetSourceAndBundle(
             format="pack-0.92")
         branch.product.setBranchVisibilityTeamPolicy(
 
=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/branch.py	2010-04-27 02:24:35 +0000
@@ -460,14 +460,13 @@
             "Private branch %s has no public URL." % self.unique_name)
         return compose_public_url(scheme, self.unique_name)
 
-    @property
-    def warehouse_url(self):
+    def getInternalBzrUrl(self):
         """See `IBranch`."""
-        return 'lp-mirrored:///%s' % self.unique_name
+        return 'lp-internal:///' + self.unique_name
 
     def getBzrBranch(self):
         """See `IBranch`."""
-        return safe_open('lp-internal', 'lp-internal:///' + self.unique_name)
+        return safe_open('lp-internal', self.getInternalBzrUrl())
 
     @property
     def displayname(self):
 
=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/branchjob.py	2010-04-27 02:24:35 +0000
@@ -51,8 +51,8 @@
 from lp.code.model.diff import StaticDiff
 from lp.code.model.revision import RevisionSet
 from lp.codehosting.scanner.bzrsync import BzrSync
-from lp.codehosting.vfs import (branch_id_to_path, get_multi_server,
-    get_scanner_server)
+from lp.codehosting.vfs import (
+    branch_id_to_path, get_rw_server, get_ro_server)
 from lp.services.job.model.job import Job
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.runner import BaseRunnableJob
@@ -284,7 +284,7 @@
     def contextManager(cls):
         """See `IBranchScanJobSource`."""
         errorlog.globalErrorUtility.configure('branchscanner')
-        cls.server = get_scanner_server()
+        cls.server = get_ro_server()
         cls.server.start_server()
         yield
         cls.server.stop_server()
@@ -313,7 +313,7 @@
     def contextManager():
         """See `IBranchUpgradeJobSource`."""
         errorlog.globalErrorUtility.configure('upgrade_branches')
-        server = get_multi_server(write_hosted=True)
+        server = get_rw_server()
         server.start_server()
         yield
         server.stop_server()
@@ -325,7 +325,8 @@
         try:
             upgrade_transport = get_transport(upgrade_branch_path)
             upgrade_transport.mkdir('.bzr')
-            source_branch_transport = get_transport(self.branch.getPullURL())
+            source_branch_transport = get_transport(
+                self.branch.getInternalBzrUrl())
             source_branch_transport.clone('.bzr').copy_tree_to_transport(
                 upgrade_transport.clone('.bzr'))
             upgrade_branch = BzrBranch.open_from_transport(upgrade_transport)
 
=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2010-04-06 03:37:16 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2010-04-27 02:24:35 +0000
@@ -69,7 +69,7 @@
 from lp.code.mail.codereviewcomment import CodeReviewCommentMailer
 from lp.code.model.branchmergeproposal import BranchMergeProposal
 from lp.code.model.diff import PreviewDiff
-from lp.codehosting.vfs import get_multi_server, get_scanner_server
+from lp.codehosting.vfs import get_ro_server, get_rw_server
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.job.model.job import Job
 from lp.services.job.interfaces.job import JobStatus
@@ -322,7 +322,7 @@
     def contextManager():
         """See `IUpdatePreviewDiffJobSource`."""
         errorlog.globalErrorUtility.configure('update_preview_diffs')
-        server = get_scanner_server()
+        server = get_ro_server()
         server.start_server()
         yield
         server.stop_server()
@@ -403,7 +403,7 @@
                 raise AssertionError('No principal found for %s' % email_addr)
             setupInteraction(principal, email_addr)
 
-            server = get_multi_server(write_hosted=True)
+            server = get_rw_server()
             server.start_server()
             try:
                 return CodeHandler().processMergeProposal(message)
@@ -635,7 +635,7 @@
     def contextManager():
         """See `IJobSource`."""
         errorlog.globalErrorUtility.configure('merge_proposal_jobs')
-        server = get_scanner_server()
+        server = get_ro_server()
         server.start_server()
         yield
         server.stop_server()
 
=== modified file 'lib/lp/code/model/diff.py'
--- lib/lp/code/model/diff.py	2010-02-17 19:10:51 +0000
+++ lib/lp/code/model/diff.py	2010-04-27 02:24:35 +0000
@@ -322,16 +322,15 @@
         :param bmp: The `BranchMergeProposal` to generate a `PreviewDiff` for.
         :return: A `PreviewDiff`.
         """
-        source_branch = Branch.open(bmp.source_branch.warehouse_url)
+        source_branch = bmp.source_branch.getBzrBranch()
         source_revision = source_branch.last_revision()
-        target_branch = Branch.open(bmp.target_branch.warehouse_url)
+        target_branch = bmp.target_branch.getBzrBranch()
         target_revision = target_branch.last_revision()
         preview = cls()
         preview.source_revision_id = source_revision.decode('utf-8')
         preview.target_revision_id = target_revision.decode('utf-8')
         if bmp.prerequisite_branch is not None:
-            prerequisite_branch = Branch.open(
-                bmp.prerequisite_branch.warehouse_url)
+            prerequisite_branch = bmp.prerequisite_branch.getBzrBranch()
         else:
             prerequisite_branch = None
         preview.diff, conflicts = Diff.mergePreviewFromBranches(
 
=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/directbranchcommit.py	2010-04-27 02:24:35 +0000
@@ -47,7 +47,7 @@
     is_locked = False
     commit_builder = None
 
-    def __init__(self, db_branch, committer=None):
+    def __init__(self, db_branch, committer=None, no_race_check=False):
         """Create context for direct commit to branch.
 
         Before constructing a `DirectBranchCommit`, set up a server that
@@ -66,6 +66,8 @@
 
         :param db_branch: a Launchpad `Branch` object.
         :param committer: the `Person` writing to the branch.
+        :param no_race_check: don't check for other commits before committing
+            our changes, for use in tests.
         """
         self.db_branch = db_branch
 
@@ -75,6 +77,8 @@
             committer = db_branch.owner
         self.committer = committer
 
+        self.no_race_check = no_race_check
+
         # Directories we create on the branch, and their ids.
         self.path_ids = {}
 
@@ -155,6 +159,8 @@
         If it does, raise `ConcurrentUpdateError`.
         """
         assert self.is_locked, "Getting revision on un-locked branch."
+        if self.no_race_check:
+            return
         last_revision = self.bzrbranch.last_revision()
         if last_revision != self.last_scanned_id:
             raise ConcurrentUpdateError(
 
=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-04-27 02:24:35 +0000
@@ -2370,7 +2370,7 @@
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
-        self.useBzrBranches(real_server=True, direct_database=True)
+        self.useBzrBranches(direct_database=True)
 
     def test_simple(self):
         # safe_open returns the underlying bzr branch of a database branch in
 
=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2010-04-27 02:24:35 +0000
@@ -100,7 +100,7 @@
 
     def test_run_revision_ids(self):
         """Ensure that run calculates revision ids."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.commit('First commit', rev_id='rev1')
         job = BranchDiffJob.create(branch, '0', '1')
@@ -110,7 +110,7 @@
 
     def test_run_diff_content(self):
         """Ensure that run generates expected diff."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
 
         tree_location = tempfile.mkdtemp()
         self.addCleanup(lambda: shutil.rmtree(tree_location)) 
@@ -134,7 +134,7 @@
 
     def test_run_is_idempotent(self):
         """Ensure running an equivalent job emits the same diff."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.commit('First commit')
         job1 = BranchDiffJob.create(branch, '0', '1')
@@ -149,7 +149,7 @@
         This diff contains an add of a file called hello.txt, with contents
         "Hello World\n".
         """
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         first_revision = 'rev-1'
         tree_transport = tree.bzrdir.root_transport
@@ -197,7 +197,7 @@
 
     def test_run(self):
         """Ensure the job scans the branch."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
 
         db_branch, bzr_tree = self.create_branch_and_tree()
         bzr_tree.commit('First commit', rev_id='rev1')
@@ -249,9 +249,8 @@
 
     def test_upgrades_branch(self):
         """Ensure that a branch with an outdated format is upgraded."""
-        self.useBzrBranches()
-        db_branch, tree = self.create_branch_and_tree(
-            hosted=True, format='knit')
+        self.useBzrBranches(direct_database=True)
+        db_branch, tree = self.create_branch_and_tree(format='knit')
         db_branch.branch_format = BranchFormat.BZR_BRANCH_5
         db_branch.repository_format = RepositoryFormat.BZR_KNIT_1
         self.assertEqual(
@@ -278,14 +277,13 @@
     def test_existing_bzr_backup(self):
         # If the target branch already has a backup.bzr dir, the upgrade copy
         # should remove it.
-        self.useBzrBranches()
-        db_branch, tree = self.create_branch_and_tree(
-            hosted=True, format='knit')
+        self.useBzrBranches(direct_database=True)
+        db_branch, tree = self.create_branch_and_tree(format='knit')
         db_branch.branch_format = BranchFormat.BZR_BRANCH_5
         db_branch.repository_format = RepositoryFormat.BZR_KNIT_1
 
         # Add a fake backup.bzr dir
-        source_branch_transport = get_transport(db_branch.getPullURL())
+        source_branch_transport = get_transport(db_branch.getInternalBzrUrl())
         source_branch_transport.mkdir('backup.bzr')
         source_branch_transport.clone('.bzr').copy_tree_to_transport(
             source_branch_transport.clone('backup.bzr'))
@@ -354,7 +352,7 @@
 
     def test_perform_diff_performs_diff(self):
         """Ensure that a diff is generated when perform_diff is True."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.bzrdir.root_transport.put_bytes('foo', 'bar\n')
         tree.add('foo')
@@ -366,7 +364,7 @@
 
     def test_perform_diff_ignored_for_revno_0(self):
         """For the null revision, no diff is generated."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         job = RevisionMailJob.create(
             branch, 0, '[e-mail]', 'hello', True, 'subject')
@@ -465,7 +463,7 @@
 
     def test_iterAddedMainline(self):
         """iterAddedMainline iterates through mainline revisions."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create3CommitsBranch()
         job = RevisionsAddedJob.create(branch, 'rev1', 'rev2', '')
         job.bzr_branch.lock_read()
@@ -475,7 +473,7 @@
 
     def test_iterAddedNonMainline(self):
         """iterAddedMainline drops non-mainline revisions."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create3CommitsBranch()
         tree.pull(tree.branch, overwrite=True, stop_revision='rev2')
         tree.add_parent_tree_id('rev3')
@@ -489,7 +487,7 @@
 
     def test_iterAddedMainline_order(self):
         """iterAddedMainline iterates in commit order."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create3CommitsBranch()
         job = RevisionsAddedJob.create(branch, 'rev1', 'rev3', '')
         job.bzr_branch.lock_read()
@@ -528,7 +526,7 @@
             that merges the others.
         :param include_ghost:If true, add revision 2c as a ghost revision.
         """
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.branch.nick = 'nicholas'
         tree.commit('rev1')
@@ -558,7 +556,7 @@
 
     def test_findRelatedBMP(self):
         """The related branch merge proposals can be identified."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         target_branch, tree = self.create_branch_and_tree('tree')
         desired_proposal = self.factory.makeBranchMergeProposal(
             target_branch=target_branch)
@@ -577,7 +575,7 @@
         """findRelatedBMP only returns the most recent proposal for any
         particular source branch.
         """
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         target_branch, tree = self.create_branch_and_tree('tree')
         the_past = datetime.datetime(2009, 1, 1, tzinfo=pytz.UTC)
         old_proposal = self.factory.makeBranchMergeProposal(
@@ -614,7 +612,7 @@
 
     def test_getRevisionMessage(self):
         """getRevisionMessage provides a correctly-formatted message."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.makeBranchWithCommit()
         job = RevisionsAddedJob.create(branch, 'rev1', 'rev1', '')
         message = job.getRevisionMessage('rev1', 1)
@@ -785,7 +783,7 @@
 
     def test_email_format(self):
         """Contents of the email are as expected."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         db_branch, tree = self.create_branch_and_tree()
         first_revision = 'rev-1'
         tree.bzrdir.root_transport.put_bytes('hello.txt', 'Hello World\n')
@@ -844,7 +842,7 @@
 
     def test_message_encoding(self):
         """Test handling of non-ASCII commit messages."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         db_branch, tree = self.create_branch_and_tree()
         rev_id = 'rev-1'
         tree.commit(
@@ -868,7 +866,7 @@
 
     def test_getMailerForRevision(self):
         """The mailer for the revision is as expected."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.makeBranchWithCommit()
         revision = tree.branch.repository.get_revision('rev1')
         job = RevisionsAddedJob.create(branch, 'rev1', 'rev1', '')
@@ -881,7 +879,7 @@
     def test_only_nodiff_subscribers_means_no_diff_generated(self):
         """No diff is generated when no subscribers need it."""
         self.layer.switchDbUser('launchpad')
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         subscriptions = branch.getSubscriptionsByLevel(
             [BranchSubscriptionNotificationLevel.FULL])
@@ -911,7 +909,7 @@
             in which case an arbitrary unique string is used.
         :returns: The revision of the first commit.
         """
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         self.branch, self.tree = self.create_branch_and_tree()
         return self._commitFilesToTree(files, 'First commit')
 
 
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposaljobs.py'
--- lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2010-04-06 03:37:16 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposaljobs.py	2010-04-27 02:24:35 +0000
@@ -102,7 +102,7 @@
 
     def test_run_sends_email(self):
         """MergeProposalCreationJob.run sends an email."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.createProposalWithEmptyBranches()
         job = MergeProposalCreatedJob.create(bmp)
         self.assertEqual([], pop_notifications())
@@ -123,7 +123,7 @@
 
     def test_MergeProposalCreateJob_with_sourcepackage_branch(self):
         """Jobs for merge proposals with sourcepackage branches work."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.factory.makeBranchMergeProposal(
             target_branch=self.factory.makePackageBranch())
         tree = self.create_branch_and_tree(db_branch=bmp.target_branch)[1]
@@ -145,7 +145,7 @@
         verifyObject(IUpdatePreviewDiffJobSource, UpdatePreviewDiffJob)
 
     def test_run(self):
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.createExampleMerge()[0]
         job = UpdatePreviewDiffJob.create(bmp)
         self.factory.makeRevisionsForBranch(bmp.source_branch, count=1)
@@ -179,7 +179,7 @@
             email.get_payload(decode=True))
 
     def test_10_minute_lease(self):
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.createExampleMerge()[0]
         job = UpdatePreviewDiffJob.create(bmp)
         job.acquireLease()
 
=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py	2010-04-27 02:24:30 +0000
+++ lib/lp/code/model/tests/test_diff.py	2010-04-27 02:24:35 +0000
@@ -11,10 +11,12 @@
 import logging
 from unittest import TestLoader
 
-from bzrlib.branch import Branch
 from bzrlib import trace
+
 import transaction
 
+from zope.security.proxy import removeSecurityProxy
+
 from canonical.launchpad.interfaces.launchpad import NotFoundError
 from canonical.launchpad.webapp import canonical_url, errorlog
 from canonical.launchpad.webapp.testing import verifyObject
@@ -44,7 +46,7 @@
 
         This will create or modify the file, as needed.
         """
-        committer = DirectBranchCommit(branch)
+        committer = DirectBranchCommit(branch, no_race_check=True)
         committer.writeFile(path, contents)
         try:
             return committer.commit('committing')
@@ -53,7 +55,7 @@
 
     def createExampleMerge(self):
         """Create a merge proposal with conflicts and updates."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.factory.makeBranchMergeProposal()
         # Make the branches of the merge proposal look good as far as the
         # model is concerned.
@@ -81,7 +83,7 @@
 
     def preparePrerequisiteMerge(self, bmp=None):
         """Prepare a merge scenario with a prerequisite branch."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         if bmp is None:
             target = self.factory.makeBranch()
             prerequisite = self.factory.makeBranch()
@@ -159,8 +161,8 @@
     def test_mergePreviewFromBranches(self):
         # mergePreviewFromBranches generates the correct diff.
         bmp, source_rev_id, target_rev_id = self.createExampleMerge()
-        source_branch = Branch.open(bmp.source_branch.warehouse_url)
-        target_branch = Branch.open(bmp.target_branch.warehouse_url)
+        source_branch = bmp.source_branch.getBzrBranch()
+        target_branch = bmp.target_branch.getBzrBranch()
         diff, conflicts = Diff.mergePreviewFromBranches(
             source_branch, source_rev_id, target_branch)
         transaction.commit()
@@ -280,7 +282,7 @@
 
     def test_acquire_existing(self):
         """Ensure that acquire returns the existing StaticDiff."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.commit('First commit', rev_id='rev1')
         diff1 = StaticDiff.acquire('null:', 'rev1', tree.branch.repository)
@@ -289,7 +291,7 @@
 
     def test_acquire_existing_different_repo(self):
         """The existing object is used even if the repository is different."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch1, tree1 = self.create_branch_and_tree('tree1')
         tree1.commit('First commit', rev_id='rev1')
         branch2, tree2 = self.create_branch_and_tree('tree2')
@@ -300,7 +302,7 @@
 
     def test_acquire_nonexisting(self):
         """A new object is created if there is no existant matching object."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         tree.commit('First commit', rev_id='rev1')
         tree.commit('Next commit', rev_id='rev2')
@@ -428,7 +430,7 @@
 
     def test_fromPreviewDiff_with_no_conflicts(self):
         """Test fromPreviewDiff when no conflicts are present."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         bmp = self.factory.makeBranchMergeProposal()
         bzr_target = self.createBzrBranch(bmp.target_branch)
         self.commitFile(bmp.target_branch, 'foo', 'a\n')
 
=== modified file 'lib/lp/code/scripts/tests/test_create_merge_proposals.py'
--- lib/lp/code/scripts/tests/test_create_merge_proposals.py	2010-04-01 05:08:47 +0000
+++ lib/lp/code/scripts/tests/test_create_merge_proposals.py	2010-04-27 02:24:35 +0000
@@ -70,22 +70,16 @@
             'INFO    Creating lockfile: /var/lock/launchpad-create_merge_proposals.lock\n'
             'INFO    Ran 1 CreateMergeProposalJobs.\n', stderr)
         self.assertEqual('', stdout)
-        # The hosted location should be populated, not the mirror.
         bmp = branch.landing_candidates[0]
-        self.assertRaises(
-            bzr_errors.NotBranchError, Branch.open,
-            bmp.source_branch.warehouse_url)
-        local_source = Branch.open(bmp.source_branch.getPullURL())
-        # The hosted branch has the correct last revision.
+        local_source = bmp.source_branch.getBzrBranch()
+        # The branch has the correct last revision.
         self.assertEqual(
             source.branch.last_revision(), local_source.last_revision())
-        # A mirror should be scheduled.
-        self.assertIsNot(None, bmp.source_branch.next_mirror_time)
 
     def disabled_test_merge_directive_with_bundle(self):
         """Merge directives with bundles generate branches."""
         # XXX TimPenhey 2009-04-01 bug 352800
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         branch, tree = self.create_branch_and_tree()
         source = self.createJob(branch, tree)
         self.jobOutputCheck(branch, source)
@@ -93,7 +87,7 @@
     def disabled_test_merge_directive_with_project(self):
         """Bundles are handled when the target branch has a project."""
         # XXX TimPenhey 2009-04-01 bug 352800
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         product = self.factory.makeProduct(project=self.factory.makeProject())
         branch, tree = self.create_branch_and_tree(product=product)
         source = self.createJob(branch, tree)
 
=== modified file 'lib/lp/code/scripts/tests/test_scan_branches.py'
--- lib/lp/code/scripts/tests/test_scan_branches.py	2010-04-01 04:29:46 +0000
+++ lib/lp/code/scripts/tests/test_scan_branches.py	2010-04-27 02:24:35 +0000
@@ -26,8 +26,7 @@
 
     def make_branch_with_commits_and_scan_job(self, db_branch):
         """Create a branch from a db_branch, make commits and a scan job."""
-        target, target_tree = self.create_branch_and_tree(
-            db_branch=db_branch)
+        target, target_tree = self.create_branch_and_tree(db_branch=db_branch)
         target_tree.commit('First commit', rev_id='rev1')
         target_tree.commit('Second commit', rev_id='rev2')
         target_tree.commit('Third commit', rev_id='rev3')
@@ -45,7 +44,7 @@
 
     def test_scan_branch(self):
         """Test that scan branches adds revisions to the database."""
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
 
         db_branch = self.factory.makeAnyBranch()
         self.make_branch_with_commits_and_scan_job(db_branch)
@@ -70,7 +69,7 @@
 
     def test_scan_packagebranch(self):
         """Test that scan_branches can scan package branches."""
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
 
         db_branch = self.factory.makePackageBranch()
         self.make_branch_with_commits_and_scan_job(db_branch)
 
=== modified file 'lib/lp/code/scripts/tests/test_upgrade_branches.py'
--- lib/lp/code/scripts/tests/test_upgrade_branches.py	2010-04-01 04:37:30 +0000
+++ lib/lp/code/scripts/tests/test_upgrade_branches.py	2010-04-27 02:24:35 +0000
@@ -22,9 +22,8 @@
 
     def test_upgrade_branches(self):
         """Test that upgrade_branches upgrades branches."""
-        self.useBzrBranches(real_server=True)
-        target, target_tree = self.create_branch_and_tree(
-            hosted=True, format='knit')
+        self.useBzrBranches()
+        target, target_tree = self.create_branch_and_tree(format='knit')
         target.branch_format = BranchFormat.BZR_BRANCH_5
         target.repository_format = RepositoryFormat.BZR_KNIT_1
 
@@ -49,10 +48,10 @@
 
     def test_upgrade_branches_packagebranch(self):
         """Test that upgrade_branches can upgrade package branches."""
-        self.useBzrBranches(real_server=True)
+        self.useBzrBranches()
         package_branch = self.factory.makePackageBranch()
         target, target_tree = self.create_branch_and_tree(
-            db_branch=package_branch, hosted=True, format='knit')
+            db_branch=package_branch, format='knit')
         target.branch_format = BranchFormat.BZR_BRANCH_5
         target.repository_format = RepositoryFormat.BZR_KNIT_1
 
 
=== modified file 'lib/lp/codehosting/inmemory.py'
--- lib/lp/codehosting/inmemory.py	2010-04-27 02:24:30 +0000
+++ lib/lp/codehosting/inmemory.py	2010-04-27 02:24:35 +0000
@@ -433,7 +433,7 @@
         if branch is None:
             branch = self.makeBranch(product=product)
         product.development_focus.branch = branch
-        branch.last_mirrored = 'rev1'
+        branch.last_mirrored_id = 'rev1'
         return branch
 
     def enableDefaultStackingForPackage(self, package, branch):
@@ -445,7 +445,7 @@
         """
         package.development_version.setBranch(
             PackagePublishingPocket.RELEASE, branch, branch.owner)
-        branch.last_mirrored = 'rev1'
+        branch.last_mirrored_id = 'rev1'
         return branch
 
 
 
=== modified file 'lib/lp/codehosting/scanner/bzrsync.py'
--- lib/lp/codehosting/scanner/bzrsync.py	2010-04-27 02:24:30 +0000
+++ lib/lp/codehosting/scanner/bzrsync.py	2010-04-27 02:24:35 +0000
@@ -79,8 +79,7 @@
         """Synchronize the database with a Bazaar branch, handling locking.
         """
         if bzr_branch is None:
-            bzr_branch = BranchMirrorer(WarehouseBranchPolicy()).open(
-                self.db_branch.warehouse_url)
+            bzr_branch = self.db_branch.getBzrBranch()
         bzr_branch.lock_read()
         try:
             self.syncBranch(bzr_branch)
 
=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2010-04-27 02:24:30 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-04-27 02:24:35 +0000
@@ -108,7 +108,7 @@
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
-        self.useBzrBranches(real_server=True, direct_database=True)
+        self.useBzrBranches(direct_database=True)
 
     def makeOfficialPackageBranch(self, distroseries=None):
         """Make an official package branch with an underlying bzr branch."""
 
=== modified file 'lib/lp/codehosting/tests/test_jobs.py'
--- lib/lp/codehosting/tests/test_jobs.py	2009-06-30 16:56:07 +0000
+++ lib/lp/codehosting/tests/test_jobs.py	2010-04-27 02:24:35 +0000
@@ -25,7 +25,7 @@
 
     def test_runJob_generates_diff(self):
         """Ensure that a diff is actually generated in this environment."""
-        self.useBzrBranches()
+        self.useBzrBranches(direct_database=True)
         branch, tree = self.create_branch_and_tree()
         branch.subscribe(branch.registrant,
             BranchSubscriptionNotificationLevel.FULL,
 
=== modified file 'lib/lp/codehosting/vfs/__init__.py'
--- lib/lp/codehosting/vfs/__init__.py	2010-04-27 02:24:30 +0000
+++ lib/lp/codehosting/vfs/__init__.py	2010-04-27 02:24:35 +0000
@@ -10,6 +10,7 @@
     'BranchFileSystemClient',
     'get_lp_server',
     'get_multi_server',
+    'get_ro_server',
     'get_rw_server',
     'get_scanner_server',
     'LaunchpadServer',
@@ -18,7 +19,7 @@
 
 from lp.codehosting.vfs.branchfs import (
     AsyncLaunchpadTransport, branch_id_to_path, get_lp_server,
-    get_multi_server, get_rw_server, get_scanner_server, LaunchpadServer,
-    make_branch_mirrorer)
+    get_multi_server, get_ro_server, get_rw_server, get_scanner_server,
+    LaunchpadServer, make_branch_mirrorer)
 from lp.codehosting.vfs.branchfsclient import (
     BlockingProxy,BranchFileSystemClient)
 
=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2010-04-27 02:24:30 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2010-04-27 02:24:35 +0000
@@ -55,6 +55,7 @@
     'DirectDatabaseLaunchpadServer',
     'get_lp_server',
     'get_multi_server',
+    'get_ro_server',
     'get_rw_server',
     'get_scanner_server',
     'make_branch_mirrorer',
@@ -167,15 +168,16 @@
     return absolute_path.endswith('/.bzr/branch/lock/held')
 
 
-def get_scanner_server():
+def get_ro_server():
     """Get a Launchpad internal server for scanning branches."""
     proxy = xmlrpclib.ServerProxy(config.codehosting.codehosting_endpoint)
     codehosting_endpoint = BlockingProxy(proxy)
     branch_transport = get_readonly_transport(
         get_transport(config.codehosting.internal_branch_by_id_root))
     return LaunchpadInternalServer(
-        'lp-mirrored:///', codehosting_endpoint, branch_transport)
+        'lp-internal:///', codehosting_endpoint, branch_transport)
 
+get_scanner_server = get_ro_server
 
 def get_rw_server(direct_database=False):
     """Get a server that can write to the Launchpad branch vfs.
 
=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2010-04-27 02:24:30 +0000
+++ lib/lp/testing/__init__.py	2010-04-27 02:24:35 +0000
@@ -412,6 +412,7 @@
         from lp.testing.factory import LaunchpadObjectFactory
         self.factory = LaunchpadObjectFactory()
         self.direct_database_server = False
+        self._use_bzr_branch_called = False
 
     def getUserBrowser(self, url=None, user=None, password='test'):
         """Return a Browser logged in as a fresh user, maybe opened at `url`.
@@ -478,9 +479,10 @@
         :param db_branch: The database branch to create the branch for.
         :param parent: If supplied, the bzr branch to use as a parent.
         """
-        bzr_branch = self.createBranchAtURL(db_branch.warehouse_url)
+        bzr_branch = self.createBranchAtURL(db_branch.getInternalBzrUrl())
         if parent:
             bzr_branch.pull(parent)
+            removeSecurityProxy(db_branch).last_scanned_id = bzr_branch.last_revision()
         return bzr_branch
 
     @staticmethod
@@ -537,6 +539,11 @@
         :param direct_database: If true, translate branch locations by
             directly querying the database, not the internal XML-RPC server.
         """
+        if self._use_bzr_branch_called:
+            if direct_database != self.direct_database_server:
+                raise AssertionError("XXX")
+            return
+        self._use_bzr_branch_called = True
         self.useTempBzrHome()
         self.direct_database_server = direct_database
         server = get_rw_server(direct_database=direct_database)
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-04-27 02:24:30 +0000
+++ lib/lp/testing/factory.py	2010-04-27 02:24:35 +0000
@@ -2284,8 +2284,8 @@
         md = MergeDirective2.from_objects(
             source_branch.repository, source_branch.last_revision(),
             public_branch=source_branch.get_public_branch(),
-            target_branch=target_branch.warehouse_url,
-            local_target_branch=target_branch.warehouse_url, time=0,
+            target_branch=target_branch.getInternalBzrUrl(),
+            local_target_branch=target_branch.getInternalBzrUrl(), time=0,
             timezone=0)
         email = None
         if sender is not None:
 
=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-04-27 02:24:30 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py	2010-04-27 02:24:35 +0000
@@ -149,7 +149,7 @@
     def _makeTranslationBranch(self, fake_pottery_compatible=None):
         """Create a branch that provides translations for a productseries."""
         if fake_pottery_compatible is None:
-            self.useBzrBranches()
+            self.useBzrBranches(direct_database=True)
             branch, tree = self.create_branch_and_tree()
         else:
             branch = self.factory.makeAnyBranch()
@@ -219,6 +219,7 @@
         # If the feature is enabled, a TipChanged event for a branch that
         # generates templates will schedule a templates build.
         branch = self._makeTranslationBranch()
+        removeSecurityProxy(branch).last_scanned_id = 'null:'
         commit = DirectBranchCommit(branch)
         commit.writeFile('POTFILES.in', 'foo')
         commit.commit('message')