Merge lp:~rockstar/launchpad/fix-scan-branches-script into lp:launchpad/db-devel

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi stub-

  Upon QAing the new branch scanner, I found that I was trying to connect to
the hosted and mirrored areas, where the branch scanner really only needs the
mirrored area. In order to make the tests pass, I needed to change a test
config. mwhudson told me that I would want to take my own life if I found out
why, so I just trusted him. The config change broke some tests that I then
fixed.

Cheers,
Paul

[Stuart Bishop (stub)]

review: Approve

[Aaron Bentley (abentley)]

I am not sure that this config change is the best approach. In our production environment, we have three internal locations for launchpad branches: read-write hosting, read-only hosting, and mirrored. We should mirror this in our testing environment by providing a read-only hosting location, preferably over http.

[Gary Poster (gary)]

review: Approve (rc)

=== modified file 'configs/testrunner/launchpad-lazr.conf'
--- configs/testrunner/launchpad-lazr.conf	2010-01-13 18:36:41 +0000
+++ configs/testrunner/launchpad-lazr.conf	2010-01-22 05:28:17 +0000
@@ -38,7 +38,7 @@
 error_dir: /var/tmp/codehosting.test
 oops_prefix: SMPSSH
 access_log: /tmp/test-codehosting-access.log
-internal_branch_by_id_root: file:///var/tmp/bzrsync/
+internal_branch_by_id_root: file:///var/tmp/bazaar.launchpad.dev/mirrors
 
 [create_merge_proposals]
 oops_prefix: TMPCJ

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-01-22 03:16:44 +0000
+++ lib/lp/code/model/branchjob.py	2010-01-22 05:28:17 +0000
@@ -52,7 +52,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
+from lp.codehosting.vfs import (branch_id_to_path, get_multi_server,
+    get_scanner_server)
 from lp.services.job.model.job import Job
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.runner import BaseRunnableJob
@@ -283,7 +284,7 @@
     def contextManager():
         """See `IBranchScanJobSource`."""
         errorlog.globalErrorUtility.configure('branchscanner')
-        server = get_multi_server()
+        server = get_scanner_server()
         server.setUp()
         yield
         server.tearDown()

=== modified file 'lib/lp/codehosting/tests/test_rewrite.py'
--- lib/lp/codehosting/tests/test_rewrite.py	2010-01-07 06:40:23 +0000
+++ lib/lp/codehosting/tests/test_rewrite.py	2010-01-22 05:28:17 +0000
@@ -50,7 +50,7 @@
             rewriter.rewriteLine("/%s/.bzr/README" % branch.unique_name)
             for branch in branches]
         expected = [
-            'file:///var/tmp/bzrsync/%s/.bzr/README'
+            'file:///var/tmp/bazaar.launchpad.dev/mirrors/%s/.bzr/README'
             % branch_id_to_path(branch.id)
             for branch in branches]
         self.assertEqual(expected, output)
@@ -179,7 +179,7 @@
             "/%s/.bzr/README" % branch.unique_name for branch in branches] + [
             "/%s/changes" % branch.unique_name for branch in branches]
         expected_lines = [
-            'file:///var/tmp/bzrsync/%s/.bzr/README'
+            'file:///var/tmp/bazaar.launchpad.dev/mirrors/%s/.bzr/README'
             % branch_id_to_path(branch.id)
             for branch in branches] + [
             'http://localhost:8080/%s/changes' % branch.unique_name
@@ -206,14 +206,14 @@
 
         new_branch_input = '/%s/.bzr/README' % new_branch.unique_name
         expected_lines.append(
-            'file:///var/tmp/bzrsync/%s/.bzr/README'
+            'file:///var/tmp/bazaar.launchpad.dev/mirrors/%s/.bzr/README'
             % branch_id_to_path(new_branch.id))
         proc.stdin.write(new_branch_input + '\n')
         output_lines.append(proc.stdout.readline().rstrip('\n'))
 
         edited_branch_input = '/%s/.bzr/README' % edited_branch.unique_name
         expected_lines.append(
-            'file:///var/tmp/bzrsync/%s/.bzr/README'
+            'file:///var/tmp/bazaar.launchpad.dev/mirrors/%s/.bzr/README'
             % branch_id_to_path(edited_branch.id))
         proc.stdin.write(edited_branch_input + '\n')
         output_lines.append(proc.stdout.readline().rstrip('\n'))