1
=== modified file 'lib/canonical/launchpad/security.py'
2
--- lib/canonical/launchpad/security.py	2010-03-17 13:36:27 +0000
3
+++ lib/canonical/launchpad/security.py	2010-03-17 15:55:49 +0000
4
@@ -1872,10 +1872,8 @@
5
1872
        """
1872
        """
6
1873
        return (user.inTeam(self.obj.registrant) or
1873
        return (user.inTeam(self.obj.registrant) or
7
1874
                user.inTeam(self.obj.source_branch.owner) or
1874
                user.inTeam(self.obj.source_branch.owner) or
12
1875
                user.inTeam(self.obj.target_branch.owner) or
1875
                check_permission('launchpad.Edit', self.obj.target_branch) or
13
1876
                user.inTeam(self.obj.target_branch.reviewer) or
1876
                user.inTeam(self.obj.target_branch.reviewer))
10
1877
                user.in_admin or
11
1878
                user.in_bazaar_experts)
14
1879
1877
15
1880
1878
16
1881
class ViewEntitlement(AuthorizationBase):
1879
class ViewEntitlement(AuthorizationBase):
17
1882
1880
18
=== added file 'lib/lp/code/tests/test_branchmergeproposal.py'
19
--- lib/lp/code/tests/test_branchmergeproposal.py	1970-01-01 00:00:00 +0000
20
+++ lib/lp/code/tests/test_branchmergeproposal.py	2010-03-17 15:55:49 +0000
21
@@ -0,0 +1,76 @@
22
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
23
2
# GNU Affero General Public License version 3 (see the file LICENSE).
24
3
25
4
"""Unit tests for methods of BranchMergeProposal."""
26
5
27
6
28
7
from zope.component import getUtility
29
8
from zope.security.proxy import removeSecurityProxy
30
9
31
10
from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
32
11
from canonical.testing import DatabaseFunctionalLayer
33
12
34
13
from lp.code.interfaces.linkedbranch import ICanHasLinkedBranch
35
14
from lp.code.tests.test_branch import PermissionTest
36
15
from lp.registry.interfaces.pocket import PackagePublishingPocket
37
16
from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
38
17
from lp.testing import run_with_login
39
18
40
19
41
20
class TestEditMergeProposal(PermissionTest):
42
21
    """Test who can edit branchmergeproposals."""
43
22
44
23
    layer = DatabaseFunctionalLayer
45
24
46
25
    def makePackageProposal(self):
47
26
        branch = self.factory.makePackageBranch()
48
27
        # Make sure the (distroseries, pocket) combination used allows us to
49
28
        # upload to it.
50
29
        pocket = PackagePublishingPocket.RELEASE
51
30
        sourcepackage = branch.sourcepackage
52
31
        suite_sourcepackage = sourcepackage.getSuiteSourcePackage(pocket)
53
32
        registrant = self.factory.makePerson()
54
33
        ubuntu_branches = getUtility(ILaunchpadCelebrities).ubuntu_branches
55
34
        run_with_login(
56
35
            ubuntu_branches.teamowner,
57
36
            ICanHasLinkedBranch(suite_sourcepackage).setBranch,
58
37
            branch, registrant)
59
38
        source_branch = self.factory.makePackageBranch(
60
39
            sourcepackage=branch.sourcepackage)
61
40
        proposal = source_branch.addLandingTarget(
62
41
            source_branch.registrant, branch)
63
42
        return proposal
64
43
65
44
    def test_package_merge_proposal_with_no_upload_permission(self):
66
45
        # If you can't upload the package and have no other relationship
67
46
        # to the proposal or branches then you can't edit the proposal.
68
47
        person = self.factory.makePerson()
69
48
        proposal = self.makePackageProposal()
70
49
71
50
        # Person is not allowed to edit the branch presently.
72
51
        self.assertCannotEdit(person, proposal.target_branch)
73
52
        # And so isn't allowed to edit the merge proposal
74
53
        self.assertCannotEdit(person, proposal)
75
54
76
55
77
56
    def test_package_upload_permissions_grant_merge_proposal_edit(self):
78
57
        # If you can upload to the package then you can edit merge
79
58
        # proposals against the official branch.
80
59
        person = self.factory.makePerson()
81
60
        proposal = self.makePackageProposal()
82
61
83
62
        permission_set = getUtility(IArchivePermissionSet)
84
63
        # Only admins or techboard members can add permissions normally. That
85
64
        # restriction isn't relevant to these tests.
86
65
        permission_set = removeSecurityProxy(permission_set)
87
66
        # Now give 'person' permission to upload to 'package'.
88
67
        archive = proposal.target_branch.distroseries.distribution.main_archive
89
68
        package = proposal.target_branch.sourcepackage
90
69
        spn = package.sourcepackagename
91
70
        permission_set.newPackageUploader(archive, person, spn)
92
71
93
72
        # Now person can edit the branch on the basis of the upload
94
73
        # permissions granted above.
95
74
        self.assertCanEdit(person, proposal.target_branch)
96
75
        # And that means they can edit the proposal too
97
76
        self.assertCanEdit(person, proposal)
Reviewer	Review Type	Date Requested	Status
Jonathan Lange (community)		2010-03-17	Approve on 2010-03-18
Review via email: mp+21561@code.launchpad.net