Merge lp:~abentley/launchpad/processmail-packagebranch into lp:launchpad/db-devel

[Aaron Bentley]

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

= Summary =
Fix bug #426779

== Proposed fix ==
Allow SELECT on seriessourcepackagebranch for the processmail user

== Pre-implementation notes ==
No preimplementation was done.

== Implementation details ==

== Tests ==
bin/test test_codehandler -t test_process_packagebranch

== Demo and Q/A ==
Using staging
 - create a merge proposal involving a package branch
 - send an email to the merge proposal's address
 - observe that the email is shown as a comment on the merge proposal's
   page.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/code/mail/tests/test_codehandler.py
  database/schema/security.cfg
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqn3cwACgkQ0F+nu1YWqI1eIACfT4PQojfyzQnVG89aFvdiyjwf
UEkAn05Ee2dikF5ChKmUjL29fCR+/lk8
=xLtz
-----END PGP SIGNATURE-----

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-08-24 20:19:36 +0000
+++ database/schema/security.cfg	2009-09-09 16:23:55 +0000
@@ -1467,6 +1467,7 @@
 public.mergedirectivejob                = SELECT, INSERT
 public.staticdiff                       = SELECT, INSERT, UPDATE
 public.sourcepackagename                = SELECT
+public.seriessourcepackagebranch        = SELECT
 
 
 [mlist-sync]

=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py	2009-07-30 19:44:08 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py	2009-09-09 16:23:55 +0000
@@ -152,6 +152,19 @@
         # if the message has not been created, this raises SQLObjectNotFound
         message = MessageSet().get('<my-id>')
 
+    def test_process_packagebranch(self):
+        """Processing an email related to a package branch works.."""
+        mail = self.factory.makeSignedMessage('<my-id>')
+        target_branch = self.factory.makePackageBranch()
+        bmp = self.factory.makeBranchMergeProposal(
+            target_branch=target_branch)
+        email_addr = bmp.address
+        self.switchDbUser(config.processmail.dbuser)
+        self.code_handler.process( mail, email_addr, None)
+        self.assertIn(
+            '<my-id>', [comment.message.rfc822msgid
+                        for comment in bmp.all_comments])
+
     def test_processBadAddress(self):
         """When a bad address is supplied, it returns False."""
         mail = self.factory.makeSignedMessage('<my-id>')