1
=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
2
--- lib/canonical/launchpad/interfaces/__init__.py	2010-09-11 19:25:13 +0000
3
+++ lib/canonical/launchpad/interfaces/__init__.py	2010-09-29 21:54:47 +0000
4
@@ -96,6 +96,7 @@
5
96
from canonical.launchpad.interfaces.packagerelationship import *
96
from canonical.launchpad.interfaces.packagerelationship import *
6
97
from canonical.launchpad.interfaces.pathlookup import *
97
from canonical.launchpad.interfaces.pathlookup import *
7
98
from lp.registry.interfaces.poll import *
98
from lp.registry.interfaces.poll import *
8
99
from lp.registry.errors import TeamMembershipTransitionError
9
99
from lp.soyuz.interfaces.processor import *
100
from lp.soyuz.interfaces.processor import *
10
100
from lp.registry.interfaces.product import *
101
from lp.registry.interfaces.product import *
11
101
from lp.registry.interfaces.productlicense import *
102
from lp.registry.interfaces.productlicense import *
12
102
103
13
=== added file 'lib/lp/registry/errors.py'
14
--- lib/lp/registry/errors.py	1970-01-01 00:00:00 +0000
15
+++ lib/lp/registry/errors.py	2010-09-29 21:54:47 +0000
16
@@ -0,0 +1,20 @@
17
1
# Copyright 2009 Canonical Ltd.  This software is licensed under the
18
2
# GNU Affero General Public License version 3 (see the file LICENSE).
19
3
20
4
__metaclass__ = type
21
5
__all__ = [
22
6
    'TeamMembershipTransitionError',
23
7
    ]
24
8
25
9
import httplib
26
10
27
11
from lazr.restful.declarations import webservice_error
28
12
29
13
30
14
class TeamMembershipTransitionError(ValueError):
31
15
    """Indicates something has gone wrong with the transtiion.
32
16
33
17
    Generally, this indicates a bad transition (e.g. approved to proposed)
34
18
    or an invalid transition (e.g. unicorn).
35
19
    """
36
20
    webservice_error(httplib.BAD_REQUEST)
37
0
21
38
=== modified file 'lib/lp/registry/model/teammembership.py'
39
--- lib/lp/registry/model/teammembership.py	2010-09-27 20:47:58 +0000
40
+++ lib/lp/registry/model/teammembership.py	2010-09-29 21:54:47 +0000
41
@@ -46,6 +46,7 @@
42
46
from canonical.launchpad.mailnotification import MailWrapper
46
from canonical.launchpad.mailnotification import MailWrapper
43
47
from canonical.launchpad.webapp import canonical_url
47
from canonical.launchpad.webapp import canonical_url
44
48
from lp.app.browser.tales import DurationFormatterAPI
48
from lp.app.browser.tales import DurationFormatterAPI
45
49
from lp.registry.errors import TeamMembershipTransitionError
46
49
from lp.registry.interfaces.person import (
50
from lp.registry.interfaces.person import (
47
50
    IPersonSet,
51
    IPersonSet,
48
51
    TeamMembershipRenewalPolicy,
52
    TeamMembershipRenewalPolicy,
49
@@ -331,11 +332,14 @@
50
331
            declined: [proposed, approved, admin],
332
            declined: [proposed, approved, admin],
51
332
            invited: [approved, admin, invitation_declined],
333
            invited: [approved, admin, invitation_declined],
52
333
            invitation_declined: [invited, approved, admin]}
334
            invitation_declined: [invited, approved, admin]}
58
334
        assert self.status in state_transition, (
335
59
335
            "Unknown status: %s" % self.status.name)
336
        if self.status not in state_transition:
60
336
        assert status in state_transition[self.status], (
337
            raise TeamMembershipTransitionError(
61
337
            "Bad state transition from %s to %s"
338
                "Unknown status: %s" % self.status.name)
62
338
            % (self.status.name, status.name))
339
        if status not in state_transition[self.status]:
63
340
            raise TeamMembershipTransitionError(
64
341
                "Bad state transition from %s to %s"
65
342
                % (self.status.name, status.name))
66
339
343
67
340
        if status in ACTIVE_STATES and self.team in self.person.allmembers:
344
        if status in ACTIVE_STATES and self.team in self.person.allmembers:
68
341
            raise CyclicalTeamMembershipError(
345
            raise CyclicalTeamMembershipError(
69
@@ -589,7 +593,8 @@
70
589
            SELECT 1 FROM TeamParticipation
593
            SELECT 1 FROM TeamParticipation
71
590
            WHERE person = %(person_id)s AND team IN (
594
            WHERE person = %(person_id)s AND team IN (
72
591
                    SELECT person
595
                    SELECT person
74
592
                    FROM TeamParticipation JOIN Person ON (person = Person.id)
596
                    FROM TeamParticipation JOIN Person ON
75
597
                        (person = Person.id)
76
593
                    WHERE team = %(team_id)s
598
                    WHERE team = %(team_id)s
77
594
                        AND person NOT IN (%(team_id)s, %(person_id)s)
599
                        AND person NOT IN (%(team_id)s, %(person_id)s)
78
595
                        AND teamowner IS NOT NULL
600
                        AND teamowner IS NOT NULL
79
596
601
80
=== added file 'lib/lp/registry/tests/test_teammembership_webservice.py'
81
--- lib/lp/registry/tests/test_teammembership_webservice.py	1970-01-01 00:00:00 +0000
82
+++ lib/lp/registry/tests/test_teammembership_webservice.py	2010-09-29 21:54:47 +0000
83
@@ -0,0 +1,68 @@
84
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
85
2
# GNU Affero General Public License version 3 (see the file LICENSE).
86
3
87
4
__metaclass__ = type
88
5
89
6
import unittest
90
7
91
8
from zope.component import getUtility
92
9
93
10
from canonical.testing import DatabaseFunctionalLayer
94
11
from lazr.restfulclient.errors import HTTPError
95
12
from lp.registry.interfaces.teammembership import (
96
13
    ITeamMembershipSet,
97
14
    TeamMembershipStatus,
98
15
    )
99
16
from lp.testing import (
100
17
    TestCaseWithFactory,
101
18
    launchpadlib_for,
102
19
    )
103
20
104
21
105
22
class TestTeamMembershipTransitions(TestCaseWithFactory):
106
23
107
24
    layer = DatabaseFunctionalLayer
108
25
109
26
    def setUp(self):
110
27
        super(TestTeamMembershipTransitions, self).setUp()
111
28
        self.person = self.factory.makePerson(name='some-person')
112
29
        owner = self.factory.makePerson()
113
30
        self.team = self.factory.makeTeam(
114
31
            name='some-team',
115
32
            owner=owner)
116
33
        membership_set = getUtility(ITeamMembershipSet)
117
34
        membership = membership_set.new(
118
35
            self.person,
119
36
            self.team,
120
37
            TeamMembershipStatus.APPROVED,
121
38
            self.person)
122
39
        self.launchpad = launchpadlib_for("test", owner.name)
123
40
124
41
    def test_no_such_status(self):
125
42
        # An error should be thrown when transitioning to a status that
126
43
        # doesn't exist.
127
44
        team = self.launchpad.people['some-team']
128
45
        team_membership = team.members_details[1]
129
46
        # The error in this instance should be a valueerror, b/c the
130
47
        # WADL used by launchpadlib will enforce the method args.
131
48
        api_exception = self.assertRaises(
132
49
            ValueError,
133
50
            team_membership.setStatus,
134
51
            status='NOTVALIDSTATUS')
135
52
136
53
    def test_invalid_transition(self):
137
54
        # An error should be thrown when transitioning to a status that
138
55
        # isn't a valid move.
139
56
        team = self.launchpad.people['some-team']
140
57
        team_membership = team.members_details[1]
141
58
        # The error used here should be an HTTPError, since it is being
142
59
        # passed back by the server across the API.
143
60
        api_exception = self.assertRaises(
144
61
            HTTPError,
145
62
            team_membership.setStatus,
146
63
            status='Proposed')
147
64
        self.assertEqual(400, api_exception.response.status)
148
65
149
66
150
67
def test_suite():
151
68
    return unittest.TestLoader().loadTestsFromName(__name__)
Reviewer	Review Type	Date Requested	Status
Graham Binns (community)	code	2010-09-27	Approve on 2010-09-28
Review via email: mp+36726@code.launchpad.net