Merge lp:~stevenk/launchpad/branches-are-more-than-private into lp:launchpad

[Steve Kowalik]

No longer override all branches to USERDATA in PillarPersonSharingView.

No longer override all branches to USERDATA in PillarPersonSharingView, and add a test for that case.

I have also done some other clean-up -- we no longer need to special case creating the bug, since makeBug now just takes a target argument. We also don't need to create APAs, so I've removed that too.

[Ian Booth (wallyworld)]

Thanks.

review: Approve

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2012-08-24 05:09:51 +0000
+++ lib/lp/registry/browser/pillar.py	2012-09-03 04:29:19 +0000
@@ -46,10 +46,7 @@
 from lp.bugs.browser.structuralsubscription import (
     StructuralSubscriptionMenuMixin,
     )
-from lp.registry.enums import (
-    EXCLUSIVE_TEAM_POLICY,
-    InformationType,
-    )
+from lp.registry.enums import EXCLUSIVE_TEAM_POLICY
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
     )
@@ -423,15 +420,12 @@
     def _build_branch_template_data(self, branches, request):
         branch_data = []
         for branch in branches:
-            # At the moment, all branches displayed on the sharing details
-            # page are private.
-            information_type = InformationType.USERDATA.title
             branch_data.append(dict(
                 self_link=absoluteURL(branch, request),
                 web_link=canonical_url(branch, path_only_if_possible=True),
                 branch_name=branch.unique_name,
                 branch_id=branch.id,
-                information_type=information_type))
+                information_type=branch.information_type.title))
         return branch_data
 
     def _build_bug_template_data(self, bugtasks, request):

=== modified file 'lib/lp/registry/browser/tests/test_pillar_sharing.py'
--- lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-08-24 05:09:51 +0000
+++ lib/lp/registry/browser/tests/test_pillar_sharing.py	2012-09-03 04:29:19 +0000
@@ -86,7 +86,7 @@
         if with_branch and self.pillar_type == 'product':
             branch = self.factory.makeBranch(
                 product=self.pillar, owner=self.pillar.owner,
-                information_type=InformationType.USERDATA)
+                information_type=InformationType.PRIVATESECURITY)
             artifacts.append(
                 self.factory.makeAccessArtifact(concrete=branch))
 
@@ -95,24 +95,15 @@
                 owner = self.factory.makePerson()
             else:
                 owner = self.pillar.owner
-            if self.pillar_type == 'product':
-                bug = self.factory.makeBug(
-                    target=self.pillar, owner=owner,
-                    information_type=InformationType.USERDATA)
-            elif self.pillar_type == 'distribution':
-                bug = self.factory.makeBug(
-                    target=self.pillar, owner=owner,
-                    information_type=InformationType.USERDATA)
+            bug = self.factory.makeBug(
+                target=self.pillar, owner=owner,
+                information_type=InformationType.USERDATA)
             artifacts.append(
                 self.factory.makeAccessArtifact(concrete=bug))
 
         for artifact in artifacts:
-            self.factory.makeAccessPolicyArtifact(
-                artifact=artifact, policy=self.access_policy)
             self.factory.makeAccessArtifactGrant(
-                artifact=artifact,
-                grantee=grantee,
-                grantor=self.pillar.owner)
+                artifact=artifact, grantee=grantee, grantor=self.pillar.owner)
         return grantee
 
     def setupSharing(self, grantees):
@@ -207,7 +198,7 @@
             self.assertEqual({
                 'branch_id': branch.id,
                 'branch_name': branch.unique_name,
-                'information_type': InformationType.USERDATA.title,
+                'information_type': branch.information_type.title,
                 'web_link': canonical_url(branch, path_only_if_possible=True),
                 'self_link': absoluteURL(branch, request),
             }, cache.objects.get('branches')[0])