launchpad-reviewers team mailing list archive

[Tim Penhey <tim.penhey@xxxxxxxxxxxxx>]

Tim Penhey has proposed merging lp:~thumper/launchpad/scanner-permissions into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #634451 launchpad code rescans failing
  https://bugs.launchpad.net/bugs/634451


A new corner case found in the branch scanner for updating bug heat.

This was not caught as the tests were not testing all the possible bug tasks being updated from the scanner.

Tests:
  TestBugLinking
-- 
https://code.launchpad.net/~thumper/launchpad/scanner-permissions/+merge/35048
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~thumper/launchpad/scanner-permissions into lp:launchpad/devel.

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-09-03 16:43:11 +0000
+++ database/schema/security.cfg	2010-09-09 22:52:51 +0000
@@ -593,6 +593,7 @@
 public.diff                             = SELECT, INSERT, DELETE
 public.distroseries                     = SELECT
 public.distribution                     = SELECT
+public.distributionsourcepackage        = SELECT
 public.emailaddress                     = SELECT
 public.job                              = SELECT, INSERT, UPDATE, DELETE
 # Karma

=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
--- lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/scanner/tests/test_buglinks.py	2010-09-09 22:52:51 +0000
@@ -120,6 +120,11 @@
     def makeFixtures(self):
         super(TestBugLinking, self).makeFixtures()
         self.bug1 = self.factory.makeBug()
+        self.bug1.addTask(self.bug1.owner, self.factory.makeSourcePackage())
+        self.bug1.addTask(
+            self.bug1.owner, self.factory.makeDistributionSourcePackage())
+        self.bug1.addTask(
+            self.bug1.owner, self.factory.makeDistribution())
         self.bug2 = self.factory.makeBug()
         self.new_db_branch = self.factory.makeAnyBranch()
         self.layer.txn.commit()

=== modified file 'lib/lp/codehosting/scanner/tests/test_bzrsync.py'
--- lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/scanner/tests/test_bzrsync.py	2010-09-09 22:52:51 +0000
@@ -20,6 +20,7 @@
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib.uncommit import uncommit
 import pytz
+from storm.locals import Store
 import transaction
 from twisted.python.util import mergeFunctionMetadata
 from zope.component import getUtility
@@ -79,6 +80,8 @@
         self.lp_db_user = config.launchpad.dbuser
         self.makeFixtures()
         LaunchpadZopelessLayer.switchDbUser(config.branchscanner.dbuser)
+        # Catch both constraints and permissions for the db user.
+        self.addCleanup(Store.of(self.db_branch).flush)
 
     def tearDown(self):
         super(BzrSyncTestCase, self).tearDown()