Summary
-------

This branch fixes a bunch of tests. Most of the fixes are simple search and
replace, but there are a good 731 lines that are more complicated, so they
need a review instead of a rubber stamp. I have included those diff lines
in this comment so you don't have to read the automated diff.


Implementation details
----------------------

Display the correct informational message in the browser
corresponding to the new behavior for addMember().
    lib/lp/registry/browser/team.py

I changed the owners of several teams in this test so that
it tests the permissions more appropriately. Previously, it
was using foobar for everything, and that is a Launchpad admin,
so it effectively had admin access on all the teams.
    lib/lp/registry/doc/teammembership.txt

I changed the user for these tests, since salgado is also a
Launchpad admin.
    lib/lp/registry/stories/team/xx-team-add-my-teams.txt

Verify that the former members of a team are now only viewable
by the admins of the team on the +members page.
    lib/lp/registry/stories/teammembership/20-managing-members.txt

I changed some of the teams involved in the tests and the logged-in
user, since addMember() will fully add a team if the user is an
admin on both teams. If the user is only an admin on the team adding
another team, then addMember() will set the status to INVITED.
    lib/lp/registry/stories/teammembership/xx-add-member.txt
    lib/lp/registry/stories/teammembership/xx-private-membership.txt
    lib/lp/registry/stories/webservice/xx-private-membership.txt

In the REST API, the logged-in user is passed in as the reviewer
argument. Therefore, the no_priv user has to be used to create a
cyclical invitation as opposed to a cyclical active membership.
    lib/lp/registry/tests/test_teammembership.py

Tests
-----

./bin/test -vv -t registry


Pruned incremental diff
-----------------------
{{{
=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2009-12-10 18:11:38 +0000
+++ lib/lp/registry/browser/team.py	2010-01-04 17:12:48 +0000
@@ -993,9 +993,11 @@
         assert newmember != self.context, (
             "Can't add team to itself: %s" % newmember)
 
-        self.context.addMember(newmember, reviewer=self.user,
-                               status=TeamMembershipStatus.APPROVED)
-        if newmember.isTeam():
+        changed, new_status = self.context.addMember(
+            newmember, reviewer=self.user,
+            status=TeamMembershipStatus.APPROVED)
+
+        if new_status == TeamMembershipStatus.INVITED:
             msg = "%s has been invited to join this team." % (
                   newmember.unique_displayname)
         else:

=== modified file 'lib/lp/registry/doc/teammembership.txt'
--- lib/lp/registry/doc/teammembership.txt	2009-12-16 02:22:29 +0000
+++ lib/lp/registry/doc/teammembership.txt	2010-01-04 17:12:47 +0000
@@ -22,23 +22,28 @@
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces import IPersonSet
     >>> personset = getUtility(IPersonSet)
-    >>> foobar = personset.getByName('name16')
-    >>> reviewer = foobar
+    >>> jblack = personset.getByName('jblack')
+    >>> nopriv = personset.getByName('no-priv')
+    >>> jdub = personset.getByName('jdub')
+    >>> reviewer = nopriv
     >>> t1 = personset.newTeam(
-    ...     foobar, 't1', 't1',
+    ...     jblack, 't1', 't1',
     ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
     >>> t2 = personset.newTeam(
-    ...     foobar, 't2', 't2',
+    ...     nopriv, 't2', 't2',
     ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
     >>> t3 = personset.newTeam(
-    ...     foobar, 't3', 't3',
+    ...     jdub, 't3', 't3',
     ...     subscriptionpolicy=TeamSubscriptionPolicy.MODERATED)
     >>> t4 = personset.newTeam(
-    ...     foobar, 't4', 't4',
+    ...     nopriv, 't4', 't4',
     ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
     >>> t5 = personset.newTeam(
-    ...     foobar, 't5', 't5',
+    ...     nopriv, 't5', 't5',
     ...     subscriptionpolicy=TeamSubscriptionPolicy.OPEN)
+    >>> t6 = personset.newTeam(
+    ...     jdub, 't6', 't6',
+    ...     subscriptionpolicy=TeamSubscriptionPolicy.MODERATED)
 
     # Make sure the teams have predictable (and different) creation dates as
     # some of our tests depend on that.
@@ -66,15 +71,15 @@
 member of that team --somebody has to approve his membership first:
 
     >>> [m.displayname for m in t4.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado']
+    [u'Guilherme Salgado', u'No Privileges Person']
 
     >>> [m.displayname for m in t3.allmembers]
-    [u'Foo Bar']
+    [u'Jeff Waugh']
     >>> login_person(t3.teamowner)
     >>> t3.setMembershipData(salgado, TeamMembershipStatus.APPROVED, reviewer)
     >>> flush_database_updates()
     >>> [m.displayname for m in t3.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado']
+    [u'Guilherme Salgado', u'Jeff Waugh']
 
 The join() method is not allowed for teams whose subscription policy is
 RESTRICTED. And it'll be a no-op in case the user has already joined the
@@ -141,12 +146,12 @@
     # Log in as the team owner.
     >>> login_person(t3.teamowner)
 
-addMember returns True if the member got added (i.e. he wasn't already a
-member of the team).
+If the member was added (i.e. he wasn't already a member of the team),
+addMember returns a tuple with True plus the new membership status.
 
     >>> t3.addMember(
     ...     salgado, reviewer=mark, status=TeamMembershipStatus.ADMIN)
-    True
+    (True, <DBItem TeamMembershipStatus.ADMIN...)
     >>> from canonical.launchpad.interfaces import ITeamMembershipSet
     >>> membershipset = getUtility(ITeamMembershipSet)
     >>> flush_database_updates()
@@ -158,26 +163,26 @@
     >>> salgado in t3.activemembers
     True
 
-addMember returns True also when the member is added as a proposed
-member.
+addMember returns (True, PROPOSED) also when the member is added as a
+proposed member.
 
     >>> marilize = personset.getByName('marilize')
     >>> t3.addMember(
     ...     marilize, reviewer=mark, status=TeamMembershipStatus.PROPOSED)
-    True
+    (True, <DBItem TeamMembershipStatus.PROPOSED...)
     >>> flush_database_updates()
     >>> marilize in t3.activemembers
     False
 
 If addMember is called with a person that is already a member, it
-returns False.
+returns a tuple with False and the current status of the membership.
 
     >>> t3.addMember(
     ...     salgado, reviewer=mark, status=TeamMembershipStatus.ADMIN)
-    False
+    (False, <DBItem TeamMembershipStatus.ADMIN...)
     >>> t3.addMember(
     ...     marilize, reviewer=mark, status=TeamMembershipStatus.PROPOSED)
-    False
+    (False, <DBItem TeamMembershipStatus.PROPOSED...)
 
 As expected, the membership object implements ITeamMembership.
 
@@ -188,29 +193,37 @@
 
 Note that, by default, the ITeam.addMember() API works slightly different
 when the added member is a team. In that case the team will actually be
-invited to be a member and one of the team's admins will have to accpet the
+invited to be a member and one of the team's admins will have to accept the
 invitation before the team is made a member.
 
-    >>> t1.addMember(t2, reviewer)
+    >>> login_person(t1.teamowner)
+
+    # If the reviewer were also an admin of the team being added,
+    # the status would go to APPROVED instead of INVITED.
+    >>> t2.teamowner != t1.teamowner
     True
+    >>> t1.addMember(t2, reviewer=t1.teamowner)
+    (True, <DBItem TeamMembershipStatus.INVITED...)
     >>> membership = membershipset.getByPersonAndTeam(t2, t1)
     >>> membership.status == TeamMembershipStatus.INVITED
     True
     >>> [m.displayname for m in t1.allmembers]
-    [u'Foo Bar']
+    [u'James Blackwell']
 
 Once one of the t2 admins approve the membership, t2 is shown as a member
-of t1.
+of t1 and the owner of t2 is an indirect member.
 
     >>> login_person(t2.teamowner)
     >>> t2.acceptInvitationToBeMemberOf(t1, comment='something')
+    >>> [m.displayname for m in t1.activemembers]
+    [u'James Blackwell', u't2']
     >>> [m.displayname for m in t1.allmembers]
-    [u'Foo Bar', u't2']
+    [u'James Blackwell', u'No Privileges Person', u't2']
 
 A team admin can also decline an invitation made to his team.
 
     >>> t2.addMember(t3, reviewer=mark)
-    True
+    (True, <DBItem TeamMembershipStatus.INVITED...)
     >>> login_person(t3.teamowner)
     >>> t3.declineInvitationToBeMemberOf(t2, comment='something')
     >>> membership = membershipset.getByPersonAndTeam(t3, t2)
@@ -222,21 +235,40 @@
 force_team_add=True to addMember(). We'll use that to add t3 as a member of
 t2, thus making all t3 members be considered members of t2 as well.
 
-    >>> login_person(t3.teamowner)
-    >>> t2.addMember(t3, reviewer=mark, force_team_add=True)
+    >>> login_person(t2.teamowner)
+
+    # If the reviewer is also an admin of the team being added,
+    # force_team_add is unnecessary, and we can't prove that that
+    # argument works.
+    >>> t3.teamowner != t2.teamowner
     True
+    >>> t2.addMember(t3, reviewer=t2.teamowner, force_team_add=True)
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> [m.displayname for m in t2.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't3']
+    [u'Guilherme Salgado', u'Jeff Waugh', u'No Privileges Person', u't3']
 
 And members of t1 as well, since t2 is a member of t1.
 
     >>> [m.displayname for m in t1.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't2', u't3']
+    [u'Guilherme Salgado', u'James Blackwell', u'Jeff Waugh',
+    u'No Privileges Person', u't2', u't3']
+
+
+Passing in force_team_add=True is not necessary if the reviewer is the
+admin of the team being added.
+
+    >>> login_person(t3.teamowner)
+    >>> t6.addMember(t3, reviewer=t3.teamowner)
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
+    >>> [m.displayname for m in t6.allmembers]
+    [u'Guilherme Salgado', u'Jeff Waugh', u't3']
 
 Can we add t2 as a member of t3? No, we prevent this kind of loop, and users
 can't do this because our vocabularies won't allow members that would cause
 loops.
 
+    >>> foobar = personset.getByName('name16')
+    >>> login_person(foobar)
     >>> t3.addMember(t2, reviewer)
     Traceback (most recent call last):
     ...
@@ -246,19 +278,21 @@
 Adding t2 as a member of t5 will add all t2 members as t5 members too.
 
     >>> t5.addMember(t2, reviewer, force_team_add=True)
-    True
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> [m.displayname for m in t5.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't2', u't3']
+    [u'Guilherme Salgado', u'Jeff Waugh', u'No Privileges Person',
+    u't2', u't3']
 
 Adding t5 and t1 as members of t4 will add all t5 and t1 members as t4
 members too.
 
     >>> t4.addMember(t5, reviewer, force_team_add=True)
-    True
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> t4.addMember(t1, reviewer, force_team_add=True)
-    True
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> [m.displayname for m in t4.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't1', u't2', u't3', u't5']
+    [u'Guilherme Salgado', u'James Blackwell', u'Jeff Waugh',
+    u'No Privileges Person', u't1', u't2', u't3', u't5']
 
     >>> flush_database_updates()
 
@@ -305,18 +339,20 @@
 member anymore, it doesn't have any members apart from its owner.
 
     >>> [m.displayname for m in t5.allmembers]
-    [u'Foo Bar']
+    [u'No Privileges Person']
 
 Removing t2 from t5 won't remove it from t4, because t2 is also a member of
 t1, which is a member of t4.
 
     >>> [m.displayname for m in t4.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't1', u't2', u't3', u't5']
+    [u'Guilherme Salgado', u'James Blackwell', u'Jeff Waugh',
+    u'No Privileges Person', u't1', u't2', u't3', u't5']
 
 Nothing changes in t1, because t5 wasn't one of its members.
 
     >>> [m.displayname for m in t1.allmembers]
-    [u'Foo Bar', u'Guilherme Salgado', u't2', u't3']
+    [u'Guilherme Salgado', u'James Blackwell', u'Jeff Waugh',
+    u'No Privileges Person', u't2', u't3']
 
 If 'Guilherme Salgado' decides to leave t3, he'll also be removed from t1
 and t2, but not from t4, because he's a direct member of t4.
@@ -350,31 +386,31 @@
 
     >>> cprov = getUtility(IPersonSet).getByName('cprov')
     >>> t3.addMember(cprov, reviewer)
-    True
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> [m.displayname for m in t3.allmembers]
-    [u'Celso Providelo', u'Foo Bar']
+    [...u'Celso Providelo'...
 
     >>> [m.displayname for m in t2.allmembers]
-    [u'Celso Providelo', u'Foo Bar', u't3']
+    [...u'Celso Providelo'...
 
     >>> [m.displayname for m in t1.allmembers]
-    [u'Celso Providelo', u'Foo Bar', u't2', u't3']
+    [...u'Celso Providelo'...
 
     >>> [m.displayname for m in t4.allmembers]
-    [u'Celso Providelo', u'Foo Bar', u'Guilherme Salgado', u't1', u't2',
-     u't3', u't5']
-
-
-It's important to note that even if Foo Bar leaves the team he's the owner,
-he'll retains his rights over the team because he's the team's owner. This
-ensures we'll never have teams which can't be managed.
-
-    >>> login_person(foobar)
-    >>> foobar.leave(t5)
+    [...u'Celso Providelo'...
+
+
+It's important to note that even if the owner leaves the team, which
+removes his membership, he will still be the team's owner and retain his
+rights over it. This ensures we'll never have teams which can't be
+managed.
+
+    >>> login_person(t5.teamowner)
+    >>> t5.teamowner.leave(t5)
     >>> flush_database_updates()
     >>> [m.displayname for m in t5.allmembers]
     []
-    >>> foobar.inTeam(t5)
+    >>> t5.teamowner.inTeam(t5)
     True
 
 
@@ -390,7 +426,7 @@
 
     # Foo Bar is a launchpad admin, but even so he can't change a membership's
     # status/expiry-date by hand.
-    >>> login('<email address hidden>')
+    >>> login_person(foobar)
     >>> membership = foobar.myactivememberships[0]
     >>> membership.status = None
     Traceback (most recent call last):
@@ -709,7 +745,7 @@
 
     >>> [(membership.person.name, membership.status.title)
     ...  for membership in t3.member_memberships]
-    [(u'cprov', 'Approved'), (u'name16', 'Administrator')]
+    [(u'cprov', 'Approved'), (u'jdub', 'Administrator')]
 
 A team has a number of other methods that return the people which are members
 of it, all based on Person.getMembersByStatus:
@@ -748,7 +784,7 @@
 admin members plus the owner in case he is not one of the admin members.
 
     >>> [admin.unique_displayname for admin in t3.adminmembers]
-    [u'Foo Bar (name16)']
+    [u'Jeff Waugh (jdub)']
     >>> list(t3.getDirectAdministrators()) == list(t3.adminmembers)
     True
 
@@ -823,7 +859,7 @@
     >>> admins = getUtility(IPersonSet).getByName('admins')
     >>> login_person(t1.teamowner)
     >>> t1.addMember(admins, reviewer=t1.teamowner, force_team_add=True)
-    True
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> flush_database_updates()
     >>> print '\n'.join(sorted(
     ...     team.name for team in salgado.teams_participated_in))
@@ -834,11 +870,12 @@
     t1
     t4
 
-On the other hand, making t2 a member of admins won't change anything
+On the other hand, making t3 a member of admins won't change anything
 for Salgado.
 
-    >>> admins.addMember(t2, reviewer=admins.teamowner, force_team_add=True)
-    True
+    >>> login_person(foobar)
+    >>> admins.addMember(t3, reviewer=admins.teamowner, force_team_add=True)
+    (True, <DBItem TeamMembershipStatus.APPROVED...)
     >>> flush_database_updates()
     >>> print '\n'.join(sorted(
     ...     team.name for team in salgado.teams_participated_in))
@@ -855,8 +892,8 @@
 Person instances have membership caches (_inTeam_cache) to avoid the
 need to reissue identical membership queries repeatedly. (This test uses
 Person directly to allow us access to an unproxied object, since
-_inTeam_cache is private, and TeamMembershipSet directly to allow us to
-call TeamMembership.setStatus, which is private).
+_inTeam_cache is private, and it uses TeamMembershipSet directly to allow
+us to call TeamMembership.setStatus, which is private).
 
     >>> from lp.registry.model.person import Person
     >>> from lp.registry.model.teammembership import TeamMembershipSet
@@ -864,7 +901,7 @@
     >>> no_priv.inTeam(admins)
     False
     >>> no_priv._inTeam_cache
-    {25: False}
+    {...25: False...}
 
 This cache is cleared when memberships are created:
 
@@ -920,7 +957,7 @@
     >>> transaction.commit()
 
     >>> [m.displayname for m in t3.allmembers]
-    [u'Bad-user', u'Foo Bar']
+    [u'Bad-user', u'Jeff Waugh']
     >>> bad_user.is_valid_person
     False
     >>> print bad_user.preferredemail

=== modified file 'lib/lp/registry/stories/team/xx-team-add-my-teams.txt'
--- lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2009-11-22 15:43:16 +0000
+++ lib/lp/registry/stories/team/xx-team-add-my-teams.txt	2010-01-04 17:12:48 +0000
@@ -6,8 +6,9 @@
 This is done from the +add-my-teams page, which is linked from a team's
 home page.
 
-    >>> browser = setupBrowser(auth='Basic <email address hidden>:zeca')
-    >>> browser.open('http://launchpad.dev/~ubuntu-team')
+    >>> browser = setupBrowser(
+    ...     auth='Basic <email address hidden>:test')
+    >>> browser.open('http://launchpad.dev/~name21')
     >>> browser.getLink('Add one of my teams').click()
     >>> browser.title
     'Propose/add one of your teams to another one...
@@ -18,47 +19,48 @@
     >>> print extract_text(find_tag_by_id(browser.contents, 'candidates'))
     This is a moderated team, so one of its administrators will have
     to review any memberships you propose.
-    Launchpad Administrators
-    Mailing List Experts
-    Rosetta Administrators
+    GuadaMen
+    Ubuntu Security Team
+    Ubuntu Team
     or Cancel
 
-We'll now propose Launchpad Administrators as a member of Ubuntu Team.
+We'll now propose Ubuntu Team as a member of the Hoary Gnome Team (name21).
 
-    >>> browser.getControl(name='field.teams').value = ['admins']
+    >>> browser.open('http://launchpad.dev/~name21')
+    >>> link = browser.getLink('Add one of my teams')
+    >>> link.click()
+    >>> browser.getControl(name='field.teams').value = ['ubuntu-team']
     >>> browser.getControl('Continue').click()
     >>> browser.title
-    'Ubuntu Team in Launchpad'
+    'Hoary Gnome Team in Launchpad'
     >>> print get_feedback_messages(browser.contents)
-    [u'Launchpad Administrators has been proposed to this team.']
+    [u'Ubuntu Team has been proposed to this team.']
     >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'recently-applied'))
+    ...     find_tag_by_id(browser.contents, 'recently-proposed'))
     Pending approval
-    Launchpad Administrators
-    ...
+    Ubuntu Team...
 
 If it were an OPEN team, we'd be able to directly add any of our teams as
 members.
 
-    >>> admin_browser.open('http://launchpad.dev/~ubuntu-team/+edit')
+    >>> admin_browser.open('http://launchpad.dev/~name21/+edit')
     >>> admin_browser.getControl(
     ...     name='field.subscriptionpolicy').displayValue = ['Open Team']
     >>> admin_browser.getControl('Save').click()
     >>> admin_browser.title
-    'Ubuntu Team in Launchpad'
+    'Hoary Gnome Team in Launchpad'
 
-    >>> browser.open('http://launchpad.dev/~ubuntu-team/+add-my-teams')
-    >>> browser.getControl(name='field.teams').value = ['rosetta-admins']
+    >>> browser.open('http://launchpad.dev/~name21/+add-my-teams')
+    >>> browser.getControl(name='field.teams').value = ['ubuntu-team']
     >>> browser.getControl('Continue').click()
     >>> browser.title
-    'Ubuntu Team in Launchpad'
+    'Hoary Gnome Team in Launchpad'
     >>> print get_feedback_messages(browser.contents)
-    [u'Rosetta Administrators has been added to this team.']
+    [u'Ubuntu Team has been added to this team.']
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'recently-approved'))
-    Recently approved
-    Rosetta Administrators
-    ...
+    Latest members
+    Ubuntu Team...
 
 In the case of restricted teams, though, there is no way to propose any of
 your teams as members.
@@ -88,38 +90,38 @@
     Traceback (most recent call last):
     Unauthorized:...
 
-You also can't propose a team to itself. Here although Salgado is usually
-allowed to propose Launchpad Administrators in other team, it doesn't
-appear in the list when proposing a team for the Launchpad
-Administrators team. Likewise Mailing List Experts isn't shown because
-the Launchpad Administrators are a member of Mailing List Experts.
-Adding Mailing List Experts would create a cycle.
+You also can't propose a team to itself. Here although Colin Watson is
+usually allowed to propose Guadamen in other team, it doesn't appear in
+the list when proposing a team for the Guadamen team. Likewise Mailing
+List Experts isn't shown because the Launchpad Administrators are a
+member of Mailing List Experts.  Adding Mailing List Experts would
+create a cycle.
 
-    >>> browser.open('http://launchpad.dev/~admins/+add-my-teams')
+    >>> browser.open('http://launchpad.dev/~guadamen/+add-my-teams')
     >>> browser.getControl(name='field.teams').options
-    ['rosetta-admins']
+    ['ubuntu-security']
 
 Teams that are already member of the team can't be proposed or added.
-For example, Rosetta Administrators is not in the list of choices
-anymore of the Ubuntu Team:
+For example, Ubuntu Team is not in the list of choices
+anymore of the Hoary Gnome Team:
 
-    >>> admin_browser.open('http://launchpad.dev/~ubuntu-team/+edit')
+    >>> admin_browser.open('http://launchpad.dev/~name21/+edit')
     >>> admin_browser.getControl(
     ...     name='field.subscriptionpolicy').displayValue = ['Open']
     >>> admin_browser.getControl('Save').click()
 
-    >>> browser.open('http://launchpad.dev/~ubuntu-team/+add-my-teams')
+    >>> browser.open('http://launchpad.dev/~name21/+members')
+    >>> browser.open('http://launchpad.dev/~name21/+add-my-teams')
     >>> browser.getControl(name='field.teams').options
-    ['admins', 'mailing-list-experts']
+    ['guadamen', 'ubuntu-security']
     >>> browser.getControl(name='field.teams').value = [
-    ...     'admins', 'mailing-list-experts']
+    ...     'guadamen', 'ubuntu-security']
     >>> browser.getControl('Continue').click()
     >>> print "\n".join(get_feedback_messages(browser.contents))
-    Launchpad Administrators, Mailing List Experts have been added to this
-    team.
+    GuadaMen, Ubuntu Security Team have been added to this team.
 
 And when no teams can be added, a message is displayed:
 
-    >>> browser.open('http://launchpad.dev/~ubuntu-team/+add-my-teams')
+    >>> browser.open('http://launchpad.dev/~name21/+add-my-teams')
     >>> print extract_text(find_tag_by_id(browser.contents, 'no-candidates'))
     None of the teams you administer can be added to this team.

=== modified file 'lib/lp/registry/stories/teammembership/20-managing-members.txt'
--- lib/lp/registry/stories/teammembership/20-managing-members.txt	2009-09-18 21:24:09 +0000
+++ lib/lp/registry/stories/teammembership/20-managing-members.txt	2010-01-04 17:12:48 +0000
@@ -28,7 +28,15 @@
     >>> print_members(browser.contents, 'proposedmembers')
     Foo Bar
 
-    >>> print_members(browser.contents, 'inactivemembers')
+Former members are only viewable by admins of the team.
+
+    >>> print find_tag_by_id(browser.contents, 'inactivemembers')
+    None
+
+    >>> name12_browser = setupBrowser(
+    ...     auth="Basic <email address hidden>:test")
+    >>> name12_browser.open(browser.url)
+    >>> print_members(name12_browser.contents, 'inactivemembers')
     Karl Tilbury
     No Privileges Person
 
@@ -57,12 +65,13 @@
     ... [launchpad]
     ... default_batch_size: 2
     ... """)
-    >>> browser.open('http://launchpad.dev/~admins/+members?inactive_batch=2')
-    >>> print_members(browser.contents, 'inactivemembers')
+    >>> admin_browser.open(
+    ...     'http://launchpad.dev/~admins/+members?inactive_batch=2')
+    >>> print_members(admin_browser.contents, 'inactivemembers')
     Celso Providelo
     David Allouche
-    >>> browser.getLink('Next', index=2).click()
-    >>> print_members(browser.contents, 'inactivemembers')
+    >>> admin_browser.getLink('Next', index=2).click()
+    >>> print_members(admin_browser.contents, 'inactivemembers')
     James Blackwell
     >>> config_data = config.pop('default-batch-size')
 

=== modified file 'lib/lp/registry/stories/teammembership/xx-add-member.txt'
--- lib/lp/registry/stories/teammembership/xx-add-member.txt	2009-10-26 14:37:31 +0000
+++ lib/lp/registry/stories/teammembership/xx-add-member.txt	2010-01-04 17:12:47 +0000
@@ -49,7 +49,7 @@
     >>> from canonical.launchpad.interfaces import TeamMembershipStatus
     >>> from canonical.launchpad.ftests import ANONYMOUS, login, logout
     >>> login(ANONYMOUS) # login() because we need a zope interaction.
-    >>> cprov_landscape_membership.setStatus(
+    >>> ignored = cprov_landscape_membership.setStatus(
     ...     TeamMembershipStatus.DEACTIVATED, landscape_team.teamowner)
     >>> logout()
     >>> cprov_landscape_membership.syncUpdate()
@@ -171,44 +171,47 @@
 same. When an admin accepts or declines an invitation, the other admin can't
 take action on that invitation anymore.
 
-First invite ubuntu-team to be member of the name21 team.
+First invite ubuntu-team to be member of the name20 team.
 
-    >>> browser.open('http://launchpad.dev/~name21/+addmember')
-    >>> browser.getControl('New member:').value = 'ubuntu-team'
+    >>> browser = setupBrowser(
+    ...     auth='Basic <email address hidden>:test')
+    >>> browser.open('http://launchpad.dev/~ubuntu-team/+addmember')
+    >>> browser.getControl('New member:').value = 'name20'
     >>> browser.getControl('Add Member').click()
 
     >>> for tag in find_tags_by_class(browser.contents,
     ...                               'informational message'):
     ...     print tag.renderContents()
-    Ubuntu Team (ubuntu-team) has been invited to join this team.
+    Warty Security Team (name20) has been invited to join this team.
 
 Open the invitations page with one admin browser.
 
-    >>> browser.open('http://launchpad.dev/~ubuntu-team/+invitation/name21')
+    >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
+    >>> browser.open('http://launchpad.dev/~name20/+invitation/ubuntu-team')
 
 Open the same page with another admin browser.
 
-    >>> second_browser = setupBrowser(auth='Basic <email address hidden>:test')
+    >>> second_browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> second_browser.open(
-    ...     'http://launchpad.dev/~ubuntu-team/+invitation/name21')
+    ...     'http://launchpad.dev/~name20/+invitation/ubuntu-team')
 
 Accept the invitation in the first browser.
 
     >>> browser.getControl('Accept').click()
     >>> browser.url
-    'http://launchpad.dev/~ubuntu-team'
+    'http://launchpad.dev/~name20'
 
     >>> for tag in find_tags_by_class(browser.contents,
     ...                               'informational message'):
     ...     print tag.renderContents()
-    This team is now a member of Hoary Gnome Team
+    This team is now a member of Ubuntu Team
 
 Accepting the invitation in the second browser, redirects to the team page
 and a message is displayed.
 
     >>> second_browser.getControl('Accept').click()
     >>> second_browser.url
-    'http://launchpad.dev/~ubuntu-team'
+    'http://launchpad.dev/~name20'
 
     >>> for tag in find_tags_by_class(second_browser.contents,
     ...                               'informational message'):
@@ -233,7 +236,7 @@
     >>> login(ANONYMOUS) # login() because we need a zope interaction.
     >>> carlos_translators_membership = TeamMembership.selectOneBy(
     ...     personID=carlos.id, teamID=ubuntu_translators.id)
-    >>> carlos_translators_membership.setStatus(
+    >>> ignored = carlos_translators_membership.setStatus(
     ...     TeamMembershipStatus.DEACTIVATED, ubuntu_translators.teamowner)
     >>> logout()
     >>> carlos_translators_membership.syncUpdate()

=== modified file 'lib/lp/registry/stories/teammembership/xx-private-membership.txt'
--- lib/lp/registry/stories/teammembership/xx-private-membership.txt	2009-12-01 22:09:05 +0000
+++ lib/lp/registry/stories/teammembership/xx-private-membership.txt	2010-01-04 17:12:48 +0000
@@ -43,7 +43,7 @@
     <...<a href=".../~member" class="sprite person">Gold Member</a>...
 
 
-    >>> find_tag_by_id(browser.contents, 'recently-applied')
+    >>> find_tag_by_id(browser.contents, 'recently-proposed')
     <...<a href=".../~no-priv" class="sprite person">No Privileges Person</a>...
 
     >>> print extract_text(
@@ -257,9 +257,9 @@
 team's home page, they see the private team show up in the "Subteam of"
 section.
 
-    >>> admin_browser.open('http://launchpad.dev/~myteam/+addmember')
-    >>> admin_browser.getControl('New member').value = 'guadamen'
-    >>> admin_browser.getControl('Add Member').click()
+    >>> owner_browser.open('http://launchpad.dev/~myteam/+addmember')
+    >>> owner_browser.getControl('New member').value = 'guadamen'
+    >>> owner_browser.getControl('Add Member').click()
     >>> admin_browser.open(
     ...     'http://launchpad.dev/~guadamen/+invitation/myteam')
     >>> admin_browser.getControl('Accept').click()

=== modified file 'lib/lp/registry/stories/webservice/xx-private-membership.txt'
--- lib/lp/registry/stories/webservice/xx-private-membership.txt	2009-10-01 12:30:32 +0000
+++ lib/lp/registry/stories/webservice/xx-private-membership.txt	2010-01-04 17:12:48 +0000
@@ -35,9 +35,10 @@
 Similarly, when a public team is a sub-team of a private team, non-members
 cannot see the private team in the public team's super_team's attribute.
 
-    >>> admin_browser.open('http://launchpad.dev/~myteam/+addmember')
-    >>> admin_browser.getControl('New member').value = 'guadamen'
-    >>> admin_browser.getControl('Add Member').click()
+    >>> owner_browser = setupBrowser(auth="Basic <email address hidden>:test")
+    >>> owner_browser.open('http://launchpad.dev/~myteam/+addmember')
+    >>> owner_browser.getControl('New member').value = 'guadamen'
+    >>> owner_browser.getControl('Add Member').click()
     >>> admin_browser.open(
     ...     'http://launchpad.dev/~guadamen/+invitation/myteam')
     >>> admin_browser.getControl('Accept').click()

=== modified file 'lib/lp/registry/tests/test_teammembership.py'
--- lib/lp/registry/tests/test_teammembership.py	2009-10-19 16:14:18 +0000
+++ lib/lp/registry/tests/test_teammembership.py	2010-01-04 17:12:48 +0000
@@ -546,8 +546,8 @@
         # Invite team2 as member of team1 and team1 as member of team2. This
         # is not a problem because that won't make any team an active member
         # of the other.
-        self.team1.addMember(self.team2, self.foobar)
-        self.team2.addMember(self.team1, self.foobar)
+        self.team1.addMember(self.team2, self.no_priv)
+        self.team2.addMember(self.team1, self.no_priv)
         team1_on_team2 = getUtility(ITeamMembershipSet).getByPersonAndTeam(
             self.team1, self.team2)
         team2_on_team1 = getUtility(ITeamMembershipSet).getByPersonAndTeam(
@@ -580,7 +580,7 @@
         """No status change can create cyclical participation."""
         # Invite team1 as a member of team3 and forcibly add team2 as member
         # of team1 and team3 as member of team2.
-        self.team3.addMember(self.team1, self.foobar)
+        self.team3.addMember(self.team1, self.no_priv)
         self.team1.addMember(self.team2, self.foobar, force_team_add=True)
         self.team2.addMember(self.team3, self.foobar, force_team_add=True)
 
@@ -593,7 +593,7 @@
             TeamMembershipStatus.APPROVED, self.foobar)
 
     def test_invited_member_can_be_made_admin(self):
-        self.team2.addMember(self.team1, self.foobar)
+        self.team2.addMember(self.team1, self.no_priv)
         team1_on_team2 = getUtility(ITeamMembershipSet).getByPersonAndTeam(
             self.team1, self.team2)
         self.assertEqual(team1_on_team2.status, TeamMembershipStatus.INVITED)

}}}