Merge ~ubuntu-release/britney/+git/britney2-ubuntu:email-direct-upload-sponsor into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Iain Lane]

I noticed that the testsuite for a sponsored direct upload emails the sponsor only.

I think it should email both the sponsor and the sponsoree. This change fixes that and doesn't regress any of the other testcases - could you see if it's sane please?

[Robert Bruce Park (robru)]

(some comments inline)

A cleaner-looking and faster solution would be:

people = {
         source['package_signer_link'],
         source['sponsor_link'],
         source['creator_link'],
} - {None} - BOTS
bileto = source['package_signer_link'] in BOTS
regular = not source['creator_link'] and not source['sponsor_link']
if bileto or regular:
    people.add(source['package_creator_link'])
return people

[Iain Lane (laney)]

Thanks - I didn't know that nested functions are bad for performance if called a lot. I'll eliminate those. I don't necessarily agree that it's clearer, but I'll fix it as you suggest.

[Iain Lane (laney)]

I fixed the comments and merged a while ago, sorry for forgetting to close this MP

diff --git a/britney2/policies/email.py b/britney2/policies/email.py
index b612bb7..50c8e86 100644
--- a/britney2/policies/email.py
+++ b/britney2/policies/email.py
@@ -38,12 +38,19 @@ If you have any questions about this email, please ask them in #ubuntu-release c
 
 def person_chooser(source):
     """Assign blame for the current source package."""
+    def should_add_package_creator():
+        # things which were copied into unstable by a known bot
+        bot = source['package_signer_link'] in BOTS
+        # direct uploads
+        regular = not source['creator_link'] and not source['sponsor_link']
+        return bot or regular
+
     people = {
         source['package_signer_link'],
         source['sponsor_link'],
         source['creator_link'],
     } - {None} - BOTS
-    if source['package_signer_link'] in BOTS:
+    if should_add_package_creator():
         people.add(source['package_creator_link'])
     return people
 
diff --git a/tests/test_email.py b/tests/test_email.py
index a9ae1a3..fa398e4 100755
--- a/tests/test_email.py
+++ b/tests/test_email.py
@@ -127,6 +127,7 @@ class T(unittest.TestCase):
         })
         self.assertEqual(person_chooser(SPONSORED_UPLOAD), {
             'https://api.launchpad.net/1.0/~apw',
+            'https://api.launchpad.net/1.0/~smb'
         })
         self.assertEqual(person_chooser(BILETO), {
             'https://api.launchpad.net/1.0/~dobey',