Merge lp:~sinzui/launchpad/person-merge-job-3 into lp:launchpad

[Curtis Hovey]

Allow users to merge teams with purges lists.

    Launchpad bug: https://bugs.launchpad.net/bugs/743194
    Pre-implementation: no one
    Test command: ./bin/test -vv -t TestPersonSetMerge

While testing the move the of merge team rules, I discovered there is a defect
in the original rules. There are about 30 teams with purged mailing lists that
will oops because the mailing list checking rules are including purges lists
in the active lists. I believe this one worked, but the checking rules were
altered to only look for deactivated lists because users cannot purge lists.
The affected teams were purged by ~registry or ~admins members. at the request
of users.

--------------------------------------------------------------------

RULES

    * Update the mailing list guard in _purgeUnmergableTeamArtifacts
      to not raise an error if the mailing list is purged.

QA

    * Visit https://qastaging.launchpad.net/~green-squad
    * Choose Delete
    * Verify the team is deleted.

LINT

    lib/lp/registry/model/person.py
    lib/lp/registry/tests/test_person.py

IMPLEMENTATION

Added a test for a purges list. Updated the guard to only raise an error
if the list is not PURGED.
    lib/lp/registry/model/person.py
    lib/lp/registry/tests/test_person.py

[Curtis Hovey (sinzui)]

I am self-approving this because this is a one-line change + a test to prevent an false assertion.

review: Approve (code)

=== modified file 'lib/lp/registry/model/person.py'
--- lib/lp/registry/model/person.py	2011-03-25 23:42:33 +0000
+++ lib/lp/registry/model/person.py	2011-03-26 16:35:59 +0000
@@ -3808,11 +3808,12 @@
         """Purge team artifacts that cannot be merged, but can be removed."""
         # A team cannot have more than one mailing list.
         mailing_list = getUtility(IMailingListSet).get(from_team.name)
-        if mailing_list is not None and mailing_list.status in PURGE_STATES:
-            from_team.mailing_list.purge()
-        elif mailing_list is not None:
-            raise AssertionError(
-                "Teams with active mailing lists cannot be merged.")
+        if mailing_list is not None:
+            if mailing_list.status in PURGE_STATES:
+                from_team.mailing_list.purge()
+            elif mailing_list.status != MailingListStatus.PURGED:
+                raise AssertionError(
+                    "Teams with active mailing lists cannot be merged.")
         # Team email addresses are not transferable.
         from_team.setContactAddress(None)
         # Memberships in the team are not transferable because there

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2011-03-25 23:42:33 +0000
+++ lib/lp/registry/tests/test_person.py	2011-03-26 16:35:59 +0000
@@ -716,6 +716,18 @@
         emails = getUtility(IEmailAddressSet).getByPerson(target_team).count()
         self.assertEqual(0, emails)
 
+    def test_team_with_purged_mailing_list(self):
+        # A team with a purges mailing list can be merged.
+        target_team = self.factory.makeTeam()
+        test_team = self.factory.makeTeam()
+        mailing_list = self.factory.makeMailingList(
+            test_team, test_team.teamowner)
+        mailing_list.deactivate()
+        mailing_list.transitionToStatus(MailingListStatus.INACTIVE)
+        mailing_list.purge()
+        self.person_set.merge(test_team, target_team, test_team.teamowner)
+        self.assertEqual(target_team, test_team.merged)
+
     def test_team_with_members(self):
         # Team members are removed before merging.
         target_team = self.factory.makeTeam()