1
=== modified file 'lib/lp/code/configure.zcml'
2
--- lib/lp/code/configure.zcml	2009-09-04 13:10:32 +0000
3
+++ lib/lp/code/configure.zcml	2009-09-09 15:16:45 +0000
4
@@ -189,6 +189,7 @@
5
189
                    dependent_branch
189
                    dependent_branch
6
190
                    whiteboard
190
                    whiteboard
7
191
                    queue_status
191
                    queue_status
8
192
                    private
9
192
                    reviewer
193
                    reviewer
10
193
                    reviewed_revision_id
194
                    reviewed_revision_id
11
194
                    queuer
195
                    queuer
12
195
196
13
=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
14
--- lib/lp/code/interfaces/branchmergeproposal.py	2009-09-09 02:18:01 +0000
15
+++ lib/lp/code/interfaces/branchmergeproposal.py	2009-09-09 15:16:45 +0000
16
@@ -28,11 +28,11 @@
17
28
from zope.event import notify
28
from zope.event import notify
18
29
from zope.interface import Attribute, Interface
29
from zope.interface import Attribute, Interface
19
30
from zope.schema import (
30
from zope.schema import (
21
31
    Bytes, Choice, Datetime, Int, Object, Text, TextLine)
31
    Bytes, Bool, Choice, Datetime, Int, Object, Text, TextLine)
22
32
32
23
33
from canonical.launchpad import _
33
from canonical.launchpad import _
24
34
from canonical.launchpad.fields import PublicPersonChoice, Summary, Whiteboard
34
from canonical.launchpad.fields import PublicPersonChoice, Summary, Whiteboard
26
35
from canonical.launchpad.interfaces import IBug
35
from canonical.launchpad.interfaces import IBug, IPrivacy
27
36
from lp.code.enums import BranchMergeProposalStatus, CodeReviewVote
36
from lp.code.enums import BranchMergeProposalStatus, CodeReviewVote
28
37
from lp.code.interfaces.branch import IBranch
37
from lp.code.interfaces.branch import IBranch
29
38
from lp.registry.interfaces.person import IPerson
38
from lp.registry.interfaces.person import IPerson
30
@@ -85,7 +85,7 @@
31
85
    )
85
    )
32
86
86
33
87
87
35
88
class IBranchMergeProposal(Interface):
88
class IBranchMergeProposal(IPrivacy):
36
89
    """Branch merge proposals show intent of landing one branch on another."""
89
    """Branch merge proposals show intent of landing one branch on another."""
37
90
90
38
91
    export_as_webservice_entry()
91
    export_as_webservice_entry()
39
@@ -121,6 +121,15 @@
40
121
                          "If this is the same as the target branch, then "
121
                          "If this is the same as the target branch, then "
41
122
                          "leave this field blank.")))
122
                          "leave this field blank.")))
42
123
123
43
124
    # This is redefined from IPrivacy.private because the attribute is
44
125
    # read-only. The value is determined by the involved branches.
45
126
    private = exported(
46
127
        Bool(
47
128
            title=_("Proposal is confidential"), required=False,
48
129
            readonly=True, default=False,
49
130
            description=_(
50
131
                "If True, this proposal is visible only to subscribers.")))
51
132
52
124
    whiteboard = Whiteboard(
133
    whiteboard = Whiteboard(
53
125
        title=_('Whiteboard'), required=False,
134
        title=_('Whiteboard'), required=False,
54
126
        description=_('Notes about the merge.'))
135
        description=_('Notes about the merge.'))
55
127
136
56
=== modified file 'lib/lp/code/model/branchmergeproposal.py'
57
--- lib/lp/code/model/branchmergeproposal.py	2009-09-09 02:18:01 +0000
58
+++ lib/lp/code/model/branchmergeproposal.py	2009-09-09 15:16:45 +0000
59
@@ -117,6 +117,13 @@
60
117
        enum=BranchMergeProposalStatus, notNull=True,
117
        enum=BranchMergeProposalStatus, notNull=True,
61
118
        default=BranchMergeProposalStatus.WORK_IN_PROGRESS)
118
        default=BranchMergeProposalStatus.WORK_IN_PROGRESS)
62
119
119
63
120
    @property
64
121
    def private(self):
65
122
        return (
66
123
            self.source_branch.private or self.target_branch.private or
67
124
            (self.dependent_branch is not None and
68
125
             self.dependent_branch.private))
69
126
70
120
    reviewer = ForeignKey(
127
    reviewer = ForeignKey(
71
121
        dbName='reviewer', foreignKey='Person',
128
        dbName='reviewer', foreignKey='Person',
72
122
        storm_validator=validate_public_person, notNull=False,
129
        storm_validator=validate_public_person, notNull=False,
73
123
130
74
=== modified file 'lib/lp/code/model/tests/test_branchmergeproposals.py'
75
--- lib/lp/code/model/tests/test_branchmergeproposals.py	2009-09-09 02:18:01 +0000
76
+++ lib/lp/code/model/tests/test_branchmergeproposals.py	2009-09-09 15:16:45 +0000
77
@@ -24,6 +24,7 @@
78
24
    DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
24
    DatabaseFunctionalLayer, LaunchpadFunctionalLayer, LaunchpadZopelessLayer)
79
25
from lazr.lifecycle.event import ObjectModifiedEvent
25
from lazr.lifecycle.event import ObjectModifiedEvent
80
26
26
81
27
from canonical.launchpad.interfaces import IPrivacy
82
27
from canonical.launchpad.interfaces.message import IMessageJob
28
from canonical.launchpad.interfaces.message import IMessageJob
83
28
from canonical.launchpad.webapp.testing import verifyObject
29
from canonical.launchpad.webapp.testing import verifyObject
84
29
from lp.code.event.branchmergeproposal import (
30
from lp.code.event.branchmergeproposal import (
85
@@ -33,11 +34,12 @@
86
33
    ANONYMOUS, import_secret_test_key, login, syncUpdate)
34
    ANONYMOUS, import_secret_test_key, login, syncUpdate)
87
34
from lp.code.enums import (
35
from lp.code.enums import (
88
35
    BranchMergeProposalStatus, BranchSubscriptionNotificationLevel,
36
    BranchMergeProposalStatus, BranchSubscriptionNotificationLevel,
90
36
    BranchType, CodeReviewNotificationLevel, CodeReviewVote)
37
    BranchType, CodeReviewNotificationLevel, CodeReviewVote,
91
38
    BranchVisibilityRule)
92
37
from lp.code.interfaces.branchmergeproposal import (
39
from lp.code.interfaces.branchmergeproposal import (
93
38
    BadStateTransition,
40
    BadStateTransition,
94
39
    BRANCH_MERGE_PROPOSAL_FINAL_STATES as FINAL_STATES,
41
    BRANCH_MERGE_PROPOSAL_FINAL_STATES as FINAL_STATES,
96
40
    IBranchMergeProposalGetter, IBranchMergeProposalJob,
42
    IBranchMergeProposal, IBranchMergeProposalGetter, IBranchMergeProposalJob,
97
41
    ICreateMergeProposalJob, ICreateMergeProposalJobSource,
43
    ICreateMergeProposalJob, ICreateMergeProposalJobSource,
98
42
    IMergeProposalCreatedJob, notify_modified, WrongBranchMergeProposal)
44
    IMergeProposalCreatedJob, notify_modified, WrongBranchMergeProposal)
99
43
from lp.code.model.branchmergeproposaljob import (
45
from lp.code.model.branchmergeproposaljob import (
100
@@ -56,6 +58,51 @@
101
56
from lp.testing.mail_helpers import pop_notifications
58
from lp.testing.mail_helpers import pop_notifications
102
57
59
103
58
60
104
61
class TestBranchMergeProposalInterface(TestCaseWithFactory):
105
62
    """Ensure that BranchMergeProposal implements its interface."""
106
63
107
64
    layer = DatabaseFunctionalLayer
108
65
109
66
    def test_BranchMergeProposal_implements_interface(self):
110
67
        """Ensure that BranchMergeProposal implements its interface."""
111
68
        bmp = self.factory.makeBranchMergeProposal()
112
69
        verifyObject(IBranchMergeProposal, bmp)
113
70
114
71
115
72
class TestBranchMergeProposalPrivacy(TestCaseWithFactory):
116
73
    """Ensure that BranchMergeProposal implements its interface."""
117
74
118
75
    layer = DatabaseFunctionalLayer
119
76
120
77
    def test_BranchMergeProposal_implements_interface(self):
121
78
        """Ensure that BranchMergeProposal implements privacy."""
122
79
        bmp = self.factory.makeBranchMergeProposal()
123
80
        verifyObject(IPrivacy, bmp)
124
81
125
82
    @staticmethod
126
83
    def setPrivate(branch):
127
84
        """Force a branch to be private."""
128
85
        login_person(branch.owner)
129
86
        branch.product.setBranchVisibilityTeamPolicy(
130
87
            branch.owner, BranchVisibilityRule.PRIVATE)
131
88
        branch.setPrivate(True)
132
89
133
90
    def test_private(self):
134
91
        """Private flag should be True if True for any involved branch."""
135
92
        bmp = self.factory.makeBranchMergeProposal()
136
93
        self.assertFalse(bmp.private)
137
94
        self.setPrivate(bmp.source_branch)
138
95
        self.assertTrue(bmp.private)
139
96
        bmp.source_branch.setPrivate(False)
140
97
        self.setPrivate(bmp.target_branch)
141
98
        self.assertTrue(bmp.private)
142
99
        bmp.target_branch.setPrivate(False)
143
100
        removeSecurityProxy(bmp).dependent_branch = self.factory.makeBranch(
144
101
            product=bmp.source_branch.product)
145
102
        self.setPrivate(bmp.dependent_branch)
146
103
        self.assertTrue(bmp.private)
147
104
148
105
149
59
class TestBranchMergeProposalTransitions(TestCaseWithFactory):
106
class TestBranchMergeProposalTransitions(TestCaseWithFactory):
150
60
    """Test the state transitions of branch merge proposals."""
107
    """Test the state transitions of branch merge proposals."""
151
61
108
Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)	code	2009-09-09	Approve on 2009-09-09
Review via email: mp+11442@code.staging.launchpad.net