Merge lp:~wgrant/launchpad/exterminate-shipit-admins into lp:launchpad

[William Grant]

[r=stevenk][no-qa] Exterminate the shipit-admins team from tests and sampledata.

Demoting shipit-admins to a normal team was insufficient to satisfy my intense dislike of our former parasite. This branch fixes tests to use the factory instead, and removes shipit-admins from sampledata.

[Steve Kowalik (stevenk)]

My only niggle is using a female identifier for no-priv. Fix it, or ignore it, I don't mind.

review: Approve (code)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2011-04-20 19:23:30 +0000
+++ database/sampledata/current-dev.sql	2011-04-21 10:44:38 +0000
@@ -1,6 +1,6 @@
 -- Copyright 2010 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
--- Created using pg_dump (PostgreSQL) 8.4.7
+-- Created using pg_dump (PostgreSQL) 8.4.8
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -1805,7 +1805,6 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (68, 'Launchpad Beta Testers Owner', NULL, NULL, 'launchpad-beta-owner', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:56:25.096519', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 681);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (69, 'Launchpad Beta Testers', 68, 'People who are testing the new Launchpad "beta" UI.', 'launchpad-beta-testers', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:57:54.592917', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (70, 'Former User', NULL, NULL, 'former-user-deactivatedaccount', NULL, NULL, NULL, NULL, 1, NULL, '2006-12-13 21:19:06.369142', NULL, NULL, NULL, true, 2, 'when importing bugs from http://bugzilla.gnome.org/', NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 701);
-INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243601, 'ShipIt Administrators', 1, 'ShipIt Administrators', 'shipit-admins', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-05 06:24:03.06971', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243602, 'No Team Memberships', NULL, NULL, 'no-team-memberships', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-19 11:17:57.755666', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436021);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243603, 'One Membership', NULL, NULL, 'one-membership', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-21 10:53:59.700105', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436031);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243604, 'Simple Team', 243603, 'This team should have only one member, the "One Membership" user.', 'simple-team', NULL, NULL, NULL, NULL, 3, NULL, '2007-02-21 10:55:03.899255', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
@@ -5249,7 +5248,6 @@
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (68, 'Launchpad Beta Testers Owner', NULL, NULL, 'launchpad-beta-owner', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:56:25.096519', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 681);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (69, 'Launchpad Beta Testers', 68, 'People who are testing the new Launchpad "beta" UI.', 'launchpad-beta-testers', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:57:54.592917', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (70, 'Former User', NULL, NULL, 'former-user-deactivatedaccount', NULL, NULL, NULL, NULL, 1, NULL, '2006-12-13 21:19:06.369142', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 2, 'when importing bugs from http://bugzilla.gnome.org/', NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 701);
-INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243601, 'ShipIt Administrators', 1, 'ShipIt Administrators', 'shipit-admins', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-05 06:24:03.06971', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243602, 'No Team Memberships', NULL, NULL, 'no-team-memberships', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-19 11:17:57.755666', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436021);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243603, 'One Membership', NULL, NULL, 'one-membership', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-21 10:53:59.700105', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436031);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243604, 'Simple Team', 243603, 'This team should have only one member, the "One Membership" user.', 'simple-team', NULL, NULL, NULL, NULL, 3, NULL, '2007-02-21 10:55:03.899255', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
@@ -5374,7 +5372,6 @@
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (84, 53, 50);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (85, 53, 46);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (86, 53, 16);
-INSERT INTO lp_teamparticipation (id, team, person) VALUES (87, 243601, 55);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (88, 52, 52);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (89, 56, 56);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (90, 30, 56);
@@ -5402,7 +5399,6 @@
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (112, 64, 64);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (113, 67, 67);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (114, 69, 69);
-INSERT INTO lp_teamparticipation (id, team, person) VALUES (115, 243601, 243601);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (116, 53, 53);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (117, 55, 55);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (118, 17, 17);
@@ -6490,7 +6486,6 @@
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (68, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (69, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (70, true);
-INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243601, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243602, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243603, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243604, true);
@@ -10945,7 +10940,6 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (42, 50, 53, 2, '2005-07-12 14:34:36.906758', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:34:36.906758', NULL, NULL, '2005-07-12 14:34:36.906758', NULL, NULL, NULL, '2008-02-15 13:59:16.999283');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (43, 46, 53, 2, '2005-07-12 14:35:44.635842', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:35:44.635842', NULL, NULL, '2005-07-12 14:35:44.635842', NULL, NULL, NULL, '2008-02-15 13:59:16.999505');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (44, 16, 53, 2, '2005-07-12 14:36:09.587753', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:36:09.587753', NULL, NULL, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, '2008-02-15 13:59:16.999728');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (45, 55, 243601, 2, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, 1, NULL, 1, '2005-07-12 14:36:09.587753', NULL, NULL, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, '2008-02-15 13:59:16.99995');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (46, 12, 31, 4, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2008-02-15 13:59:17.000172');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (47, 12, 32, 6, '2005-09-28 20:08:08.248467', '2007-08-29 00:00:00', 16, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2008-02-15 13:59:17.000395');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (48, 56, 30, 2, '2005-10-07 12:22:54.947939', NULL, 13, NULL, 1, NULL, 1, '2005-10-07 12:22:54.947939', NULL, NULL, '2005-10-07 12:22:54.947939', NULL, NULL, NULL, '2008-02-15 13:59:17.000619');
@@ -11085,7 +11079,6 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (84, 53, 50);
 INSERT INTO teamparticipation (id, team, person) VALUES (85, 53, 46);
 INSERT INTO teamparticipation (id, team, person) VALUES (86, 53, 16);
-INSERT INTO teamparticipation (id, team, person) VALUES (87, 243601, 55);
 INSERT INTO teamparticipation (id, team, person) VALUES (88, 52, 52);
 INSERT INTO teamparticipation (id, team, person) VALUES (89, 56, 56);
 INSERT INTO teamparticipation (id, team, person) VALUES (90, 30, 56);
@@ -11113,7 +11106,6 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (112, 64, 64);
 INSERT INTO teamparticipation (id, team, person) VALUES (113, 67, 67);
 INSERT INTO teamparticipation (id, team, person) VALUES (114, 69, 69);
-INSERT INTO teamparticipation (id, team, person) VALUES (115, 243601, 243601);
 INSERT INTO teamparticipation (id, team, person) VALUES (116, 53, 53);
 INSERT INTO teamparticipation (id, team, person) VALUES (117, 55, 55);
 INSERT INTO teamparticipation (id, team, person) VALUES (118, 17, 17);

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2011-04-20 19:23:30 +0000
+++ database/sampledata/current.sql	2011-04-21 10:44:38 +0000
@@ -1,6 +1,6 @@
 -- Copyright 2010 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
--- Created using pg_dump (PostgreSQL) 8.4.7
+-- Created using pg_dump (PostgreSQL) 8.4.8
 
 SET check_function_bodies = false;
 SET client_encoding = 'UTF8';
@@ -1805,7 +1805,6 @@
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (68, 'Launchpad Beta Testers Owner', NULL, NULL, 'launchpad-beta-owner', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:56:25.096519', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 681);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (69, 'Launchpad Beta Testers', 68, 'People who are testing the new Launchpad "beta" UI.', 'launchpad-beta-testers', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:57:54.592917', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (70, 'Former User', NULL, NULL, 'former-user-deactivatedaccount', NULL, NULL, NULL, NULL, 1, NULL, '2006-12-13 21:19:06.369142', NULL, NULL, NULL, true, 2, 'when importing bugs from http://bugzilla.gnome.org/', NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 701);
-INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243601, 'ShipIt Administrators', 1, 'ShipIt Administrators', 'shipit-admins', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-05 06:24:03.06971', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243602, 'No Team Memberships', NULL, NULL, 'no-team-memberships', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-19 11:17:57.755666', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436021);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243603, 'One Membership', NULL, NULL, 'one-membership', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-21 10:53:59.700105', NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436031);
 INSERT INTO person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243604, 'Simple Team', 243603, 'This team should have only one member, the "One Membership" user.', 'simple-team', NULL, NULL, NULL, NULL, 3, NULL, '2007-02-21 10:55:03.899255', NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
@@ -5181,7 +5180,6 @@
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (68, 'Launchpad Beta Testers Owner', NULL, NULL, 'launchpad-beta-owner', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:56:25.096519', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 681);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (69, 'Launchpad Beta Testers', 68, 'People who are testing the new Launchpad "beta" UI.', 'launchpad-beta-testers', NULL, NULL, NULL, NULL, 1, NULL, '2007-01-31 06:57:54.592917', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (70, 'Former User', NULL, NULL, 'former-user-deactivatedaccount', NULL, NULL, NULL, NULL, 1, NULL, '2006-12-13 21:19:06.369142', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, true, 2, 'when importing bugs from http://bugzilla.gnome.org/', NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 701);
-INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243601, 'ShipIt Administrators', 1, 'ShipIt Administrators', 'shipit-admins', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-05 06:24:03.06971', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243602, 'No Team Memberships', NULL, NULL, 'no-team-memberships', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-19 11:17:57.755666', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436021);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243603, 'One Membership', NULL, NULL, 'one-membership', NULL, NULL, NULL, NULL, 1, NULL, '2007-02-21 10:53:59.700105', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, 8, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, 2436031);
 INSERT INTO lp_person (id, displayname, teamowner, teamdescription, name, language, fti, defaultmembershipperiod, defaultrenewalperiod, subscriptionpolicy, merged, datecreated, addressline1, addressline2, organization, city, province, country, postcode, phone, homepage_content, icon, mugshot, hide_email_addresses, creation_rationale, creation_comment, registrant, logo, renewal_policy, personal_standing, personal_standing_reason, mail_resumption_date, mailing_list_auto_subscribe_policy, mailing_list_receive_duplicates, visibility, verbose_bugnotifications, account) VALUES (243604, 'Simple Team', 243603, 'This team should have only one member, the "One Membership" user.', 'simple-team', NULL, NULL, NULL, NULL, 3, NULL, '2007-02-21 10:55:03.899255', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, NULL, NULL, NULL, NULL, 10, 0, NULL, NULL, 1, true, 1, false, NULL);
@@ -5306,7 +5304,6 @@
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (84, 53, 50);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (85, 53, 46);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (86, 53, 16);
-INSERT INTO lp_teamparticipation (id, team, person) VALUES (87, 243601, 55);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (88, 52, 52);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (89, 56, 56);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (90, 30, 56);
@@ -5334,7 +5331,6 @@
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (112, 64, 64);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (113, 67, 67);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (114, 69, 69);
-INSERT INTO lp_teamparticipation (id, team, person) VALUES (115, 243601, 243601);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (116, 53, 53);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (117, 55, 55);
 INSERT INTO lp_teamparticipation (id, team, person) VALUES (118, 17, 17);
@@ -6422,7 +6418,6 @@
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (68, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (69, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (70, true);
-INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243601, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243602, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243603, true);
 INSERT INTO personsettings (person, selfgenerated_bugnotifications) VALUES (243604, true);
@@ -10871,7 +10866,6 @@
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (42, 50, 53, 2, '2005-07-12 14:34:36.906758', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:34:36.906758', NULL, NULL, '2005-07-12 14:34:36.906758', NULL, NULL, NULL, '2008-02-15 13:59:16.999283');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (43, 46, 53, 2, '2005-07-12 14:35:44.635842', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:35:44.635842', NULL, NULL, '2005-07-12 14:35:44.635842', NULL, NULL, NULL, '2008-02-15 13:59:16.999505');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (44, 16, 53, 2, '2005-07-12 14:36:09.587753', NULL, 13, NULL, 1, NULL, 1, '2005-07-12 14:36:09.587753', NULL, NULL, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, '2008-02-15 13:59:16.999728');
-INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (45, 55, 243601, 2, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, 1, NULL, 1, '2005-07-12 14:36:09.587753', NULL, NULL, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, '2008-02-15 13:59:16.99995');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (46, 12, 31, 4, '2005-07-12 14:36:09.587753', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2008-02-15 13:59:17.000172');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (47, 12, 32, 6, '2005-09-28 20:08:08.248467', '2007-08-29 00:00:00', 16, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2008-02-15 13:59:17.000395');
 INSERT INTO teammembership (id, person, team, status, date_joined, date_expires, last_changed_by, last_change_comment, proposed_by, acknowledged_by, reviewed_by, date_proposed, date_last_changed, date_acknowledged, date_reviewed, proponent_comment, acknowledger_comment, reviewer_comment, date_created) VALUES (48, 56, 30, 2, '2005-10-07 12:22:54.947939', NULL, 13, NULL, 1, NULL, 1, '2005-10-07 12:22:54.947939', NULL, NULL, '2005-10-07 12:22:54.947939', NULL, NULL, NULL, '2008-02-15 13:59:17.000619');
@@ -11011,7 +11005,6 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (84, 53, 50);
 INSERT INTO teamparticipation (id, team, person) VALUES (85, 53, 46);
 INSERT INTO teamparticipation (id, team, person) VALUES (86, 53, 16);
-INSERT INTO teamparticipation (id, team, person) VALUES (87, 243601, 55);
 INSERT INTO teamparticipation (id, team, person) VALUES (88, 52, 52);
 INSERT INTO teamparticipation (id, team, person) VALUES (89, 56, 56);
 INSERT INTO teamparticipation (id, team, person) VALUES (90, 30, 56);
@@ -11039,7 +11032,6 @@
 INSERT INTO teamparticipation (id, team, person) VALUES (112, 64, 64);
 INSERT INTO teamparticipation (id, team, person) VALUES (113, 67, 67);
 INSERT INTO teamparticipation (id, team, person) VALUES (114, 69, 69);
-INSERT INTO teamparticipation (id, team, person) VALUES (115, 243601, 243601);
 INSERT INTO teamparticipation (id, team, person) VALUES (116, 53, 53);
 INSERT INTO teamparticipation (id, team, person) VALUES (117, 55, 55);
 INSERT INTO teamparticipation (id, team, person) VALUES (118, 17, 17);

=== modified file 'lib/canonical/launchpad/doc/vocabulary-json.txt'
--- lib/canonical/launchpad/doc/vocabulary-json.txt	2010-12-06 23:18:20 +0000
+++ lib/canonical/launchpad/doc/vocabulary-json.txt	2011-04-21 10:44:38 +0000
@@ -65,7 +65,7 @@
     >>> view = create_vocabulary_view(form)
     >>> result = simplejson.loads(view())
     >>> result['total_size']
-    7
+    6
     >>> len(result['entries'])
     5
 
@@ -84,7 +84,7 @@
                 "value": "commercial-admins"
             }
         ],
-        "total_size": 7
+        "total_size": 6
     }
 
     >>> form = dict(name='ValidPersonOrTeam', search_text='admin',
@@ -101,7 +101,7 @@
                 "value": "name16"
             }
         ],
-        "total_size": 7
+        "total_size": 6
     }
 
 Long descriptions will be truncated.

=== modified file 'lib/canonical/launchpad/pagetests/README.txt'
--- lib/canonical/launchpad/pagetests/README.txt	2009-08-13 19:03:36 +0000
+++ lib/canonical/launchpad/pagetests/README.txt	2011-04-21 10:44:38 +0000
@@ -114,9 +114,6 @@
     >>> browser = setupBrowser(
     ...     auth='Basic [e-mail]:cprov')
 
-  for Marilize Coetzee (shipit admin)
-    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
-
   for David Allouche (member of vcs-imports)
     >>> browser = setupBrowser(auth='Basic [e-mail]:test')
 

=== modified file 'lib/lp/bugs/doc/bugnotification-sending.txt'
--- lib/lp/bugs/doc/bugnotification-sending.txt	2011-03-25 03:26:29 +0000
+++ lib/lp/bugs/doc/bugnotification-sending.txt	2011-04-21 10:44:38 +0000
@@ -352,16 +352,19 @@
 If a team without a contact address is subscribed to the bug, the
 notification will be sent to all members individually.
 
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> shipit_admins = getUtility(IPersonSet).getByName('shipit-admins')
-    >>> shipit_admins.preferredemail is None
+    >>> with lp_dbuser():
+    ...     owner = factory.makePerson(email='[e-mail]')
+    ...     addressless = factory.makeTeam(
+    ...         owner=owner, name='addressless',
+    ...         displayname='Addressless Team')
+    >>> addressless.preferredemail is None
     True
-    >>> for member in shipit_admins.activemembers:
+    >>> for member in addressless.activemembers:
     ...     print member.preferredemail.email
-    [e-mail]
+    [e-mail]
 
     >>> with lp_dbuser():
-    ...     ignored = bug_one.subscribe(shipit_admins, shipit_admins)
+    ...     ignored = bug_one.subscribe(addressless, addressless)
     ...     comment = getUtility(IMessageSet).fromText(
     ...         'subject', 'a comment.', sample_person,
     ...         datecreated=ten_minutes_ago)
@@ -377,8 +380,8 @@
     ...     for message in messages:
     ...         print message['To']
     [e-mail]
-    [e-mail]
     [e-mail]
+    [e-mail]
     [e-mail]
     [e-mail]
 
@@ -613,10 +616,10 @@
     ...
     X-Launchpad-Message-Rationale: Subscriber (mozilla-firefox in Ubuntu)
     ...
-    INFO    Notifying [e-mail] about bug 1.
-    ...
     INFO    Notifying [e-mail] about bug 1.
     ...
+    INFO    Notifying [e-mail] about bug 1.
+    ...
     INFO    Notifying [e-mail] about bug 1.
     ...
     INFO    Notifying [e-mail] about bug 1.
@@ -649,10 +652,10 @@
     <BLANKLINE>
     Title:
       Firefox does not support SVG
-    INFO    Notifying [e-mail] about bug 1.
-    ...
     INFO    Notifying [e-mail] about bug 1.
     ...
+    INFO    Notifying [e-mail] about bug 1.
+    ...
     INFO    Notifying [e-mail] about bug 1.
     ...
     INFO    Notifying [e-mail] about bug 1.
@@ -863,6 +866,7 @@
     ...     print message.get('X-Launchpad-Bug-Commenters')
     name12
 
+    >>> from lp.registry.interfaces.person import IPersonSet
     >>> foo_bar = getUtility(IPersonSet).getByEmail('[e-mail]')
 
     >>> from lp.bugs.interfaces.bugmessage import IBugMessageSet
@@ -1204,12 +1208,6 @@
     mozilla-firefox in Ubuntu.
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
-    ...
-    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a bug assignee.
@@ -1227,6 +1225,12 @@
     Firefox.
     ...
     ----------------------------------------------------------------------
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
+    ...
+    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a member of Ubuntu
@@ -1266,12 +1270,6 @@
     mozilla-firefox in Ubuntu.
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
-    ...
-    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a bug assignee.
@@ -1291,6 +1289,12 @@
     Matching subscriptions: Allow-comments filter
     ...
     ----------------------------------------------------------------------
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
+    ...
+    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a member of Ubuntu
@@ -1327,21 +1331,21 @@
     mozilla-firefox in Ubuntu.
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a bug assignee.
+    ...
+    ----------------------------------------------------------------------
+    To: [e-mail]
     From: Sample Person <[e-mail]>
     Subject: [Bug 1] subject
-    X-Launchpad-Message-Rationale: Subscriber @shipit-admins
+    X-Launchpad-Message-Rationale: Subscriber @addressless
     <BLANKLINE>
     no comment for no-priv.
     <BLANKLINE>
     --
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
-    ...
-    ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a bug assignee.
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
     ...
     ----------------------------------------------------------------------
     To: [e-mail]
@@ -1379,12 +1383,6 @@
     http://bugs.launchpad.dev/bugs/1
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
-    ...
-    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a bug assignee.
@@ -1408,6 +1406,12 @@
     Matching subscriptions: Allow-comments filter
     ...
     ----------------------------------------------------------------------
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
+    ...
+    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a member of Ubuntu
@@ -1444,26 +1448,24 @@
     mozilla-firefox in Ubuntu.
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a bug assignee.
+    ...
+    ----------------------------------------------------------------------
+    To: [e-mail]
     From: Sample Person <[e-mail]>
     Subject: [Bug 1] Re: Firefox does not support SVG
-    X-Launchpad-Message-Rationale: Subscriber @shipit-admins
+    X-Launchpad-Message-Rationale: Subscriber @addressless
     <BLANKLINE>
     ** Summary changed:
     - Whatever
     + Whatever else
     <BLANKLINE>
     --
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
     http://bugs.launchpad.dev/bugs/1
-    <BLANKLINE>
-    Title:
-      Firefox does not support SVG
-    ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a bug assignee.
     ...
     ----------------------------------------------------------------------
     To: [e-mail]
@@ -1507,12 +1509,6 @@
     http://bugs.launchpad.dev/bugs/1
     ...
     ----------------------------------------------------------------------
-    To: [e-mail]
-    ...
-    You received this bug notification because you are a member of ShipIt
-    Administrators, which is a direct subscriber.
-    ...
-    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a bug assignee.
@@ -1532,6 +1528,12 @@
     Firefox.
     ...
     ----------------------------------------------------------------------
+    To: [e-mail]
+    ...
+    You received this bug notification because you are a member of Addressless
+    Team, which is a direct subscriber.
+    ...
+    ----------------------------------------------------------------------
     To: [e-mail]
     ...
     You received this bug notification because you are a member of Ubuntu

=== modified file 'lib/lp/bugs/doc/bugnotificationrecipients.txt'
--- lib/lp/bugs/doc/bugnotificationrecipients.txt	2011-03-23 16:28:51 +0000
+++ lib/lp/bugs/doc/bugnotificationrecipients.txt	2011-04-21 10:44:38 +0000
@@ -196,8 +196,8 @@
     >>> vcs_imports = personset.getByName("vcs-imports")
     >>> recipients.addRegistrant(vcs_imports, gnomebaker)
 
-    >>> shipit_admins = personset.getByName("shipit-admins")
-    >>> recipients.addDirectSubscriber(shipit_admins)
+    >>> commercial_admins = personset.getByName("commercial-admins")
+    >>> recipients.addDirectSubscriber(commercial_admins)
 
 You'll notice that the rationales this time state clearly which team
 membership is causing us to send mail.
@@ -208,6 +208,10 @@
           You received this bug notification because you are a member
           of testing Spanish team, which is a subscriber of a
           duplicate bug.
+      [e-mail]
+          Subscriber @commercial-admins
+          You received this bug notification because you are a member
+          of Commercial Subscription Admins, which is a direct subscriber.
       [e-mail]
           Registrant (gnomebaker) @vcs-imports
           You received this bug notification because you are a member
@@ -222,10 +226,6 @@
           You received this bug notification because you are a member
           of testing Spanish team, which is a subscriber of a
           duplicate bug.
-      [e-mail]
-          Subscriber @shipit-admins
-          You received this bug notification because you are a member
-          of ShipIt Administrators, which is a direct subscriber.
       [e-mail]
           Subscriber of Duplicate @testing-spanish-team
           You received this bug notification because you are a member

=== modified file 'lib/lp/registry/doc/person.txt'
--- lib/lp/registry/doc/person.txt	2011-01-20 17:05:12 +0000
+++ lib/lp/registry/doc/person.txt	2011-04-21 10:44:38 +0000
@@ -184,23 +184,23 @@
 setContactAddress() rather than setPreferredEmail() here, since the
 latter can be used only for people and the former only for teams)
 
-    >>> shipit_admins = personset.getByName('shipit-admins')
-    >>> shipit_admins.account_status
+    >>> team = factory.makeTeam(name='foo', displayname='foobaz')
+    >>> team.account_status
     <DBItem AccountStatus.NOACCOUNT...
 
-    >>> email = emailset.new('[e-mail]', shipit_admins)
-    >>> shipit_admins.setContactAddress(email)
+    >>> email = emailset.new('[e-mail]', team)
+    >>> team.setContactAddress(email)
     >>> email.status
     <DBItem EmailAddressStatus.PREFERRED...
 
-    >>> shipit_admins.account_status
+    >>> team.account_status
     <DBItem AccountStatus.NOACCOUNT...
 
 Unlike people, teams don't need a contact address, so we can pass None
 to setContactAddress() to leave a team without a contact address.
 
-    >>> shipit_admins.setContactAddress(None)
-    >>> print shipit_admins.preferredemail
+    >>> team.setContactAddress(None)
+    >>> print team.preferredemail
     None
 
 When a new sourcepackage is imported and a Person entry has to be

=== modified file 'lib/lp/registry/doc/teammembership.txt'
--- lib/lp/registry/doc/teammembership.txt	2011-03-25 23:42:33 +0000
+++ lib/lp/registry/doc/teammembership.txt	2011-04-21 10:44:38 +0000
@@ -854,11 +854,14 @@
     >>> list(t3.getDirectAdministrators()) == list(t3.adminmembers)
     True
 
-    >>> shipit_admins = personset.getByName('shipit-admins')
-    >>> shipit_admins.adminmembers.count() == 0
+    >>> from lp.testing import person_logged_in
+    >>> owner = factory.makePerson()
+    >>> adminless_team = factory.makeTeam(owner=owner)
+    >>> with person_logged_in(owner):
+    ...     owner.leave(adminless_team)
+    >>> adminless_team.adminmembers.count() == 0
     True
-    >>> owner = shipit_admins.teamowner
-    >>> list(shipit_admins.getDirectAdministrators()) == [owner]
+    >>> list(adminless_team.getDirectAdministrators()) == [owner]
     True
 
 Note that the team administrators can contain teams, so if you want to

=== modified file 'lib/lp/registry/doc/vocabularies.txt'
--- lib/lp/registry/doc/vocabularies.txt	2011-03-25 23:42:33 +0000
+++ lib/lp/registry/doc/vocabularies.txt	2011-04-21 10:44:38 +0000
@@ -992,7 +992,6 @@
      (u'Other Team', u'Owner'),
      (u'Registry Administrators', u'Mark Shuttleworth'),
      (u'Rosetta Administrators', u'Launchpad Administrators'),
-     (u'ShipIt Administrators', u'Mark Shuttleworth'),
      (u'Simple Team', u'One Membership'),
      (u'Ubuntu Gnome Team', u'Mark Shuttleworth'),
      (u'Ubuntu Security Team', u'Colin Watson'),

=== modified file 'lib/lp/registry/stories/vouchers/xx-voucher-redemption.txt'
--- lib/lp/registry/stories/vouchers/xx-voucher-redemption.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/registry/stories/vouchers/xx-voucher-redemption.txt	2011-04-21 10:44:38 +0000
@@ -26,19 +26,19 @@
     Redeem Vouchers for Commercial Subscriptions
     ...Select the project you wish to subscribe...
 
-Marilize is not an administrator on any projects.  When she accesses
+no-priv is not an administrator on any projects.  When she accesses
 the page she is not given the option to redeem a voucher.
 
-    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> browser.open('http://launchpad.dev/~marilize/+vouchers')
+    >>> browser = setupBrowser(auth='Basic [e-mail]:test')
+    >>> browser.open('http://launchpad.dev/~no-priv/+vouchers')
     >>> main = find_main_content(browser.contents)
     >>> print extract_text(main)
     Redeem Vouchers for Commercial Subscriptions...
-    Marilize Coetzee does not own any commercial projects. Only project
+    No Privileges Person does not own any commercial projects. Only project
     owners can redeem vouchers for a project.
 
 A user can access her voucher page but not someone else's.  Here
-Marilize tries to access '+vouchers' on another user and is not
+no-priv tries to access '+vouchers' on another user and is not
 allowed.
 
     >>> browser.open('http://launchpad.dev/~mark/+vouchers')

=== modified file 'utilities/page-performance-report.ini'
--- utilities/page-performance-report.ini	2010-12-17 21:54:30 +0000
+++ utilities/page-performance-report.ini	2011-04-21 10:44:38 +0000
@@ -43,7 +43,6 @@
 API=^https?://api\.
 Public XML-RPC=^https?://xmlrpc\.
 Private XML-RPC=^https?://xmlrpc-private\.
-Shipit=^https?://shipit\.
 
 [metrics]
 ppr_all=All Launchpad except operational pages