Merge lp:~stevenk/launchpad/illegaltarget-if-pillar-is-new into lp:launchpad

[Steve Kowalik]

Only validate if the information_type of a bug is legal if it's targeting a new pillar. This allows users to nominate bugs against series if the bug is already bending the rules.

Only validate if the information_type of a bug is legal if it's targeting a new pillar. This allows users to nominate bugs against series if the bug is already bending the rules.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2012-08-30 12:22:35 +0000
+++ lib/lp/bugs/model/bugtask.py	2012-09-12 00:58:18 +0000
@@ -338,7 +338,8 @@
                 raise IllegalTarget(e[0])
 
     legal_types = target.pillar.getAllowedBugInformationTypes()
-    if bug.information_type not in legal_types:
+    new_pillar = target.pillar not in bug.affected_pillars
+    if new_pillar and bug.information_type not in legal_types:
         raise IllegalTarget(
             "%s doesn't allow %s bugs." % (
             target.pillar.bugtargetdisplayname, bug.information_type.title))

=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py	2012-08-30 12:22:35 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py	2012-09-12 00:58:18 +0000
@@ -3055,6 +3055,18 @@
             "%s doesn't allow Public bugs." % commercial_prod.displayname,
             validate_target, bug, commercial_prod)
 
+    def test_illegal_information_type_allowed_if_pillar_not_new(self):
+        # The bug's current information_type does not have to be permitted if
+        # we already affect the pillar.
+        prod = self.factory.makeProduct()
+        series = self.factory.makeProductSeries(product=prod)
+        bug = self.factory.makeBug(
+            target=prod, information_type=InformationType.USERDATA)
+        self.factory.makeCommercialSubscription(prod)
+        with person_logged_in(prod.owner):
+            prod.setBugSharingPolicy(BugSharingPolicy.PROPRIETARY)
+            validate_target(bug, series)
+
 
 class TestValidateNewTarget(TestCaseWithFactory, ValidateTargetMixin):