launchpad-reviewers team mailing list archive

[Ian Booth <ian.booth@xxxxxxxxxxxxx>]

Ian Booth has proposed merging lp:~wallyworld/launchpad/test-fix-16242 into lp:launchpad.

Commit message:
Test fix for r16242 - rever

Requested reviews:
  Ian Booth (wallyworld)

For more details, see:
https://code.launchpad.net/~wallyworld/launchpad/test-fix-16242/+merge/133181

Test fix for r16242 - revert
-- 
https://code.launchpad.net/~wallyworld/launchpad/test-fix-16242/+merge/133181
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2012-11-07 03:31:18 +0000
+++ lib/lp/code/model/branchjob.py	2012-11-07 04:50:24 +0000
@@ -44,7 +44,6 @@
     SQLObjectNotFound,
     StringCol,
     )
-from storm.exceptions import LostObjectError
 from storm.expr import (
     And,
     SQL,
@@ -240,8 +239,6 @@
 
     def __init__(self, branch_job):
         self.context = branch_job
-        if branch_job.branch:
-            self.branch_unique_name = branch_job.branch.unique_name
 
     def __repr__(self):
         branch = self.branch
@@ -327,15 +324,11 @@
         """See `IBranchScanJob`."""
         from lp.services.scripts import log
         with server(get_ro_server(), no_replace=True):
-            try:
-                with try_advisory_lock(
-                    LockType.BRANCH_SCAN, self.branch.id,
-                    Store.of(self.branch)):
-                    bzrsync = BzrSync(self.branch, log)
-                    bzrsync.syncBranchAndClose()
-            except LostObjectError:
-                log.warning('Skipping branch %s because it has been deleted.'
-                    % self.branch_unique_name)
+            lock = try_advisory_lock(
+                LockType.BRANCH_SCAN, self.branch.id, Store.of(self.branch))
+            with lock:
+                bzrsync = BzrSync(self.branch, log)
+                bzrsync.syncBranchAndClose()
 
     @classmethod
     @contextlib.contextmanager

=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py	2012-11-07 03:37:55 +0000
+++ lib/lp/code/model/tests/test_branchjob.py	2012-11-07 04:50:24 +0000
@@ -174,26 +174,6 @@
 
         self.assertEqual(db_branch.revision_count, 5)
 
-    def test_branch_deleted(self):
-        """Ensure a job for a deleted branch completes with logged message."""
-        self.useBzrBranches(direct_database=True)
-
-        db_branch, bzr_tree = self.create_branch_and_tree()
-        # XXX: AaronBentley 2010-08-06 bug=614404: a bzr username is
-        # required to generate the revision-id.
-        with override_environ(BZR_EMAIL='me@xxxxxxxxxxx'):
-            bzr_tree.commit('First commit', rev_id='rev1')
-            LaunchpadZopelessLayer.commit()
-
-        expected_message = (
-            'Skipping branch %s because it has been deleted.'
-            % db_branch.unique_name)
-        job = BranchScanJob.create(db_branch)
-        db_branch.destroySelf()
-        with self.expectedLog(expected_message):
-            with dbuser(config.branchscanner.dbuser):
-                job.run()
-
     def test_run_with_private_linked_bug(self):
         """Ensure the job scans a branch with a private bug in the revprops."""
         self.useBzrBranches(direct_database=True)