Merge lp:~wallyworld/launchpad/new-project-sharing-policies-1040989 into lp:launchpad

[Ian Booth]

New projects are created with sensible default sharing policies.

== Implementation ==

The IProductSet createProduct() API is updated to ensure projects are created with the correct default sharing policies.

Open (non-proprietary) projects get PUBLIC for bugs and branches.
Proprietary projects get PROPRIETARY for bugs and branches.

== Tests ==

Update TestProduct:
- test_open_product_creation_sharing_policies
- test_proprietary_product_creation_sharing_policies

== Lint ==

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/model/product.py
  lib/lp/registry/tests/test_product.py

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/tests/test_bug_views.py'
--- lib/lp/bugs/browser/tests/test_bug_views.py	2012-08-28 09:49:44 +0000
+++ lib/lp/bugs/browser/tests/test_bug_views.py	2012-08-29 21:47:18 +0000
@@ -23,6 +23,10 @@
     InformationType,
     BugSharingPolicy,
     )
+from lp.registry.interfaces.accesspolicy import (
+    IAccessPolicyGrantSource,
+    IAccessPolicySource,
+    )
 from lp.registry.interfaces.person import PersonVisibility
 from lp.services.webapp.interfaces import IOpenLaunchBag
 from lp.services.webapp.publisher import canonical_url
@@ -403,7 +407,6 @@
         # bug will become invisible but and no visibility check is performed.
         product = self.factory.makeProduct(
             bug_sharing_policy=BugSharingPolicy.PUBLIC_OR_PROPRIETARY)
-        self.factory.makeAccessPolicy(pillar=product)
         bug = self.factory.makeBug(target=product)
         self._assert_secrecy_view_ajax_render(bug, 'PROPRIETARY', False)
 
@@ -414,14 +417,16 @@
         bug_owner = self.factory.makePerson()
         product = self.factory.makeProduct(
             bug_sharing_policy=BugSharingPolicy.PUBLIC_OR_PROPRIETARY)
-        self.factory.makeCommercialSubscription(product)
         bug = self.factory.makeBug(target=product, owner=bug_owner)
+        userdata_policy = getUtility(IAccessPolicySource).find(
+            [(product, InformationType.USERDATA)])
+        getUtility(IAccessPolicyGrantSource).revokeByPolicy(userdata_policy)
 
         extra = {'HTTP_X_REQUESTED_WITH': 'XMLHttpRequest'}
         request = LaunchpadTestRequest(
             method='POST', form={
                 'field.actions.change': 'Change',
-                'field.information_type': 'PROPRIETARY',
+                'field.information_type': 'USERDATA',
                 'field.validate_change': 'on'},
             **extra)
         with person_logged_in(bug_owner):
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugs.py'
--- lib/lp/bugs/browser/tests/test_bugs.py	2012-08-22 14:23:12 +0000
+++ lib/lp/bugs/browser/tests/test_bugs.py	2012-08-29 21:47:18 +0000
@@ -160,7 +160,7 @@
 
     def test_createBug_default_private_bugs_true(self):
         # createBug() does not adapt the default kwargs when they are none.
-        project = self.factory.makeProduct(
+        project = self.factory.makeLegacyProduct(
             licenses=[License.OTHER_PROPRIETARY])
         with person_logged_in(project.owner):
             project.setPrivateBugs(True, project.owner)
@@ -170,7 +170,7 @@
 
     def test_createBug_public_bug_private_bugs_true(self):
         # createBug() adapts a kwarg to InformationType if one is is not None.
-        project = self.factory.makeProduct(
+        project = self.factory.makeLegacyProduct(
             licenses=[License.OTHER_PROPRIETARY])
         with person_logged_in(project.owner):
             project.setPrivateBugs(True, project.owner)
@@ -202,13 +202,23 @@
 
     def test_createBug_default_private_bugs_false(self):
         # createBug() does not adapt the default kwargs when they are none.
+        project = self.factory.makeLegacyProduct(
+            licenses=[License.OTHER_PROPRIETARY])
+        with person_logged_in(project.owner):
+            project.setPrivateBugs(False, project.owner)
+            bug = self.application.createBug(
+                project.owner, 'title', 'description', project)
+            self.assertEqual(InformationType.PUBLIC, bug.information_type)
+
+    def test_createBug_proprietary_project(self):
+        # crateBug() make proprietary bugs for proprietary projects.
         project = self.factory.makeProduct(
             licenses=[License.OTHER_PROPRIETARY])
         with person_logged_in(project.owner):
             project.setPrivateBugs(False, project.owner)
             bug = self.application.createBug(
                 project.owner, 'title', 'description', project)
-            self.assertEqual(InformationType.PUBLIC, bug.information_type)
+            self.assertEqual(InformationType.PROPRIETARY, bug.information_type)
 
     def test_createBug_private_bug_private_bugs_false(self):
         # createBug() adapts a kwarg to InformationType if one is is not None.
 
=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_filebug.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_filebug.py	2012-08-22 14:23:12 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_filebug.py	2012-08-29 21:47:18 +0000
@@ -362,7 +362,7 @@
         }
         if information_type:
             form['field.information_type'] = information_type
-        product = self.factory.makeProduct(official_malone=True)
+        product = self.factory.makeLegacyProduct(official_malone=True)
         if private_bugs:
             removeSecurityProxy(product).private_bugs = True
         if bug_sharing_policy:
@@ -490,7 +490,7 @@
             'field.security_related': 'on' if security_related else '',
             'field.actions.submit_bug': 'Submit Bug Request',
         }
-        product = self.factory.makeProduct(official_malone=True)
+        product = self.factory.makeLegacyProduct(official_malone=True)
         if private_bugs:
             removeSecurityProxy(product).private_bugs = True
         if bug_sharing_policy:
@@ -657,7 +657,7 @@
         self._assert_cache_values(view, True)
 
     def test_product_private_bugs(self):
-        project = self.factory.makeProduct(
+        project = self.factory.makeLegacyProduct(
             official_malone=True, private_bugs=True)
         user = self.factory.makePerson()
         login_person(user)
 
=== modified file 'lib/lp/bugs/tests/test_bugs_webservice.py'
--- lib/lp/bugs/tests/test_bugs_webservice.py	2012-08-22 14:23:12 +0000
+++ lib/lp/bugs/tests/test_bugs_webservice.py	2012-08-29 21:47:18 +0000
@@ -380,7 +380,7 @@
         # Verify the path through user submission, to MaloneApplication to
         # BugSet, and back to the user creates a private bug according
         # to the project's bugs are private by default rule.
-        project = self.factory.makeProduct(
+        project = self.factory.makeLegacyProduct(
             licenses=[License.OTHER_PROPRIETARY])
         with person_logged_in(project.owner):
             project.setPrivateBugs(True, project.owner)
@@ -392,9 +392,9 @@
 
     def test_explicit_private_private_bugs_true(self):
         # Verify the path through user submission, to MaloneApplication to
-        # BugSet, and back to the user creates a private bug beause the
+        # BugSet, and back to the user creates a private bug because the
         # user commands it.
-        project = self.factory.makeProduct(
+        project = self.factory.makeLegacyProduct(
             licenses=[License.OTHER_PROPRIETARY])
         with person_logged_in(project.owner):
             project.setPrivateBugs(True, project.owner)
 
=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2012-08-29 04:48:13 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2012-08-29 21:47:18 +0000
@@ -919,7 +919,7 @@
     def test_forbidden_owner_is_error(self):
         # An error is displayed if a branch's owner is changed to
         # a value forbidden by the visibility policy.
-        product = self.factory.makeProduct(displayname='Some Product')
+        product = self.factory.makeLegacyProduct(displayname='Some Product')
         person = self.factory.makePerson()
         branch = self.factory.makeBranch(product=product, owner=person)
         self.factory.makeTeam(
@@ -944,7 +944,8 @@
         # A branch's owner can be changed to a private team permitted by the
         # visibility policy.
         person = self.factory.makePerson()
-        branch = self.factory.makeProductBranch(owner=person)
+        product = self.factory.makeLegacyProduct()
+        branch = self.factory.makeProductBranch(product=product, owner=person)
         team = self.factory.makeTeam(
             owner=person, displayname="Private team",
             visibility=PersonVisibility.PRIVATE)
@@ -1027,14 +1028,16 @@
             self.assertContentEqual(types, view.getInformationTypesToShow())
 
     def test_public_branch(self):
-        # A normal public branch on a public project can only be a public
-        # information type.
+        # A normal public branch on a public project can be any information
+        # type except embargoed and proprietary.
         # The model doesn't enforce this, so it's just a UI thing.
         branch = self.factory.makeBranch(
             information_type=InformationType.PUBLIC)
         self.assertShownTypes(
             [InformationType.PUBLIC,
-             InformationType.PUBLICSECURITY],
+             InformationType.PUBLICSECURITY,
+             InformationType.PRIVATESECURITY,
+             InformationType.USERDATA],
             branch)
 
     def test_branch_with_disallowed_type(self):
@@ -1048,6 +1051,8 @@
         self.assertShownTypes(
             [InformationType.PUBLIC,
              InformationType.PUBLICSECURITY,
+             InformationType.PRIVATESECURITY,
+             InformationType.USERDATA,
              InformationType.PROPRIETARY],
             branch)
 
 
=== modified file 'lib/lp/code/browser/tests/test_product.py'
--- lib/lp/code/browser/tests/test_product.py	2012-07-17 03:51:38 +0000
+++ lib/lp/code/browser/tests/test_product.py	2012-08-29 21:47:18 +0000
@@ -22,7 +22,6 @@
 from lp.code.interfaces.revision import IRevisionSet
 from lp.code.publisher import CodeLayer
 from lp.registry.enums import InformationType
-from lp.services.features.testing import FeatureFixture
 from lp.services.webapp import canonical_url
 from lp.testing import (
     ANONYMOUS,
@@ -355,7 +354,7 @@
     def test_is_private(self):
         team_owner = self.factory.makePerson()
         team = self.factory.makeTeam(team_owner)
-        product = self.factory.makeProduct(owner=team_owner)
+        product = self.factory.makeLegacyProduct(owner=team_owner)
         branch = self.factory.makeProductBranch(product=product)
         login_person(product.owner)
         product.development_focus.branch = branch
 
=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2012-08-22 14:23:12 +0000
+++ lib/lp/code/model/tests/test_branch.py	2012-08-29 21:47:18 +0000
@@ -2481,7 +2481,8 @@
     def test_public_to_private_not_allowed(self):
         # If there are no privacy policies allowing private branches, then
         # BranchCannotChangeInformationType is rasied.
-        branch = self.factory.makeProductBranch()
+        product = self.factory.makeLegacyProduct()
+        branch = self.factory.makeBranch(product=product)
         self.assertRaises(
             BranchCannotChangeInformationType,
             branch.setPrivate,
@@ -2523,7 +2524,9 @@
         # If the namespace policy does not allow public branches, attempting
         # to change the branch to be public raises
         # BranchCannotChangeInformationType.
-        branch = self.factory.makeProductBranch(
+        product = self.factory.makeLegacyProduct()
+        branch = self.factory.makeBranch(
+            product=product,
             information_type=InformationType.USERDATA)
         branch.product.setBranchVisibilityTeamPolicy(
             None, BranchVisibilityRule.FORBIDDEN)
 
=== modified file 'lib/lp/code/model/tests/test_branchnamespace.py'
--- lib/lp/code/model/tests/test_branchnamespace.py	2012-08-24 05:09:51 +0000
+++ lib/lp/code/model/tests/test_branchnamespace.py	2012-08-29 21:47:18 +0000
@@ -385,7 +385,7 @@
         # and the namespace owner is in that team, then the team is
         # subscribed.
         person = self.factory.makePerson()
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         namespace = ProductNamespace(person, product)
         team = self.factory.makeTeam(owner=person)
         product.setBranchVisibilityTeamPolicy(
@@ -399,7 +399,7 @@
         team = self.factory.makeTeam(
             membership_policy=TeamMembershipPolicy.MODERATED,
             owner=person)
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         namespace = ProductNamespace(team, product)
         product.setBranchVisibilityTeamPolicy(
             team, BranchVisibilityRule.PRIVATE)
@@ -436,7 +436,7 @@
         # those rules is private, then the team that has the private rule is
         # the subscriber.
         person = self.factory.makePerson()
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         namespace = ProductNamespace(person, product)
         product.setBranchVisibilityTeamPolicy(
             self.factory.makeTeam(owner=person), BranchVisibilityRule.PUBLIC)
@@ -985,7 +985,7 @@
                                             BaseCanCreateBranchesMixin):
 
     def _getNamespace(self, owner):
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         return ProductNamespace(owner, product)
 
     def setUp(self):
@@ -1097,7 +1097,8 @@
 
     def setUp(self):
         TestCaseWithFactory.setUp(self)
-        self.product = self.factory.makeProduct()
+        self.product = self.factory.makeLegacyProduct()
+        removeSecurityProxy(self.product).branch_sharing_policy = None
 
     def _getNamespace(self, owner):
         return ProductNamespace(owner, self.product)
@@ -1299,6 +1300,7 @@
             '[e-mail]')
         # Our test product.
         self.product = self.factory.makeProduct()
+        removeSecurityProxy(self.product).branch_sharing_policy = None
         # Create some test people.
         self.albert = self.factory.makePerson(
             name='albert', displayname='Albert Tester')
 
=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2012-08-23 02:52:31 +0000
+++ lib/lp/registry/model/product.py	2012-08-29 21:47:18 +0000
@@ -1552,8 +1552,20 @@
             project_reviewed=project_reviewed,
             icon=icon, logo=logo, mugshot=mugshot, license_info=license_info)
 
+        # Set up the sharing policies and product licence.
+        bug_sharing_policy_to_use = BugSharingPolicy.PUBLIC
+        branch_sharing_policy_to_use = BranchSharingPolicy.PUBLIC
         if len(licenses) > 0:
             product._setLicenses(licenses, reset_project_reviewed=False)
+            # By default, new non-proprietary projects use public bugs and
+            # branches. Proprietary projects are given a complimentary 30 day
+            # commercial subscription and so may use proprietary sharing
+            # policies.
+            if License.OTHER_PROPRIETARY in licenses:
+                bug_sharing_policy_to_use = BugSharingPolicy.PROPRIETARY
+                branch_sharing_policy_to_use = BranchSharingPolicy.PROPRIETARY
+        product.setBugSharingPolicy(bug_sharing_policy_to_use)
+        product.setBranchSharingPolicy(branch_sharing_policy_to_use)
 
         # Create a default trunk series and set it as the development focus
         trunk = product.newSeries(
 
=== modified file 'lib/lp/registry/services/tests/test_sharingservice.py'
--- lib/lp/registry/services/tests/test_sharingservice.py	2012-08-28 23:25:43 +0000
+++ lib/lp/registry/services/tests/test_sharingservice.py	2012-08-29 21:47:18 +0000
@@ -183,7 +183,6 @@
         # if it is not in the nominally allowed policy list.
         product = self.factory.makeProduct(
             branch_sharing_policy=BranchSharingPolicy.EMBARGOED_OR_PROPRIETARY)
-        self.factory.makeCommercialSubscription(product)
         self._assert_getBranchSharingPolicies(
             product,
             [BranchSharingPolicy.PUBLIC,
 
=== modified file 'lib/lp/registry/tests/test_product.py'
--- lib/lp/registry/tests/test_product.py	2012-08-23 02:52:31 +0000
+++ lib/lp/registry/tests/test_product.py	2012-08-29 21:47:18 +0000
@@ -363,6 +363,31 @@
         grantees = set([grant.grantee for grant in grants])
         self.assertEqual(expected_grantess, grantees)
 
+    def test_open_product_creation_sharing_policies(self):
+        # Creating a new open (non-proprietary) product sets the bug and branch
+        # sharing polices to public.
+        owner = self.factory.makePerson()
+        with person_logged_in(owner):
+            product = getUtility(IProductSet).createProduct(
+                owner, 'carrot', 'Carrot', 'Carrot', 'testing',
+                licenses=[License.MIT])
+        self.assertEqual(BugSharingPolicy.PUBLIC, product.bug_sharing_policy)
+        self.assertEqual(
+            BranchSharingPolicy.PUBLIC, product.branch_sharing_policy)
+
+    def test_proprietary_product_creation_sharing_policies(self):
+        # Creating a new proprietary product sets the bug and branch sharing
+        # polices to proprietary.
+        owner = self.factory.makePerson()
+        with person_logged_in(owner):
+            product = getUtility(IProductSet).createProduct(
+                owner, 'carrot', 'Carrot', 'Carrot', 'testing',
+                licenses=[License.OTHER_PROPRIETARY])
+        self.assertEqual(
+            BugSharingPolicy.PROPRIETARY, product.bug_sharing_policy)
+        self.assertEqual(
+            BranchSharingPolicy.PROPRIETARY, product.branch_sharing_policy)
+
 
 class TestProductBugInformationTypes(TestCaseWithFactory):
 
@@ -387,7 +412,7 @@
     def test_legacy_private_bugs(self):
         # The deprecated private_bugs attribute overrides the default
         # information type to USERDATA.
-        product = self.factory.makeProduct(private_bugs=True)
+        product = self.factory.makeLegacyProduct(private_bugs=True)
         self.assertContentEqual(
             FREE_INFORMATION_TYPES, product.getAllowedBugInformationTypes())
         self.assertEqual(
 
=== modified file 'lib/lp/registry/tests/test_product_webservice.py'
--- lib/lp/registry/tests/test_product_webservice.py	2012-08-22 13:57:25 +0000
+++ lib/lp/registry/tests/test_product_webservice.py	2012-08-29 21:47:18 +0000
@@ -67,7 +67,7 @@
     def test_branch_sharing_policy_non_commercial(self):
         # An API attempt to set a commercial-only branch_sharing_policy
         # on a non-commercial project returns Forbidden.
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         webservice = webservice_for_person(
             product.owner, permission=OAuthPermission.WRITE_PRIVATE)
         response = self.patch(
@@ -93,7 +93,7 @@
     def test_bug_sharing_policy_non_commercial(self):
         # An API attempt to set a commercial-only bug_sharing_policy
         # on a non-commercial project returns Forbidden.
-        product = self.factory.makeProduct()
+        product = self.factory.makeLegacyProduct()
         webservice = webservice_for_person(
             product.owner, permission=OAuthPermission.WRITE_PRIVATE)
         response = self.patch(
 
=== modified file 'lib/lp/scripts/tests/test_garbo.py'
--- lib/lp/scripts/tests/test_garbo.py	2012-08-29 14:16:30 +0000
+++ lib/lp/scripts/tests/test_garbo.py	2012-08-29 21:47:18 +0000
@@ -1036,14 +1036,16 @@
         # set.
         with dbuser('testadmin'):
             non_commercial_products = [
-                self.factory.makeProduct()
+                self.factory.makeLegacyProduct()
                 for i in range(10)]
-            commercial_project = self.factory.makeProduct()
+            commercial_project = self.factory.makeLegacyProduct()
             self.factory.makeCommercialSubscription(commercial_project)
             configured_project = self.factory.makeProduct(
                 bug_sharing_policy=BugSharingPolicy.PROPRIETARY)
-            private_project = self.factory.makeProduct(private_bugs=True)
-            project_with_bvp = self.factory.makeProduct()
+            removeSecurityProxy(
+                configured_project).branch_sharing_policy = None
+            private_project = self.factory.makeLegacyProduct(private_bugs=True)
+            project_with_bvp = self.factory.makeLegacyProduct()
             project_with_bvp.setBranchVisibilityTeamPolicy(
                 None, BranchVisibilityRule.FORBIDDEN)
 
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2012-08-28 00:00:47 +0000
+++ lib/lp/testing/factory.py	2012-08-29 21:47:18 +0000
@@ -137,6 +137,8 @@
     IHWSubmissionSet,
     )
 from lp.registry.enums import (
+    BranchSharingPolicy,
+    BugSharingPolicy,
     DistroSeriesDifferenceStatus,
     DistroSeriesDifferenceType,
     InformationType,
@@ -995,10 +997,27 @@
             naked_product.driver = driver
         if private_bugs:
             naked_product.private_bugs = private_bugs
+        if ((branch_sharing_policy and
+            branch_sharing_policy != BranchSharingPolicy.PUBLIC) or
+            (bug_sharing_policy and
+            bug_sharing_policy != BugSharingPolicy.PUBLIC)):
+            self.makeCommercialSubscription(product)
         if branch_sharing_policy:
-            naked_product.branch_sharing_policy = branch_sharing_policy
+            naked_product.setBranchSharingPolicy(branch_sharing_policy)
         if bug_sharing_policy:
-            naked_product.bug_sharing_policy = bug_sharing_policy
+            naked_product.setBugSharingPolicy(bug_sharing_policy)
+
+        return product
+
+    def makeLegacyProduct(self, **kwargs):
+        # Create a product which does not have any of the new bug and branch
+        # sharing policies set. New products have these set to default values
+        # but we need to test for existing products which have not yet been
+        # migrated.
+        # XXX This method can be removed when branch visibility policy dies.
+        product = self.makeProduct(**kwargs)
+        removeSecurityProxy(product).bug_sharing_policy = None
+        removeSecurityProxy(product).branch_sharing_policy = None
         return product
 
     def makeProductSeries(self, product=None, name=None, owner=None,