Merge ~cjwatson/launchpad:fix-wsgi-ppa-auth into launchpad:master

[Colin Watson]

Fix close-account tests for auth token changes

Archive.getAuthToken no longer returns tokens whose associated subscription has been cancelled, so adjust tests to account for that.

Broken by https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/399617.

[Cristian Gonzalez (cristiangsp)]

Looks good!

review: Approve

diff --git a/lib/lp/registry/scripts/tests/test_closeaccount.py b/lib/lp/registry/scripts/tests/test_closeaccount.py
index f5afc52..c366539 100644
--- a/lib/lp/registry/scripts/tests/test_closeaccount.py
+++ b/lib/lp/registry/scripts/tests/test_closeaccount.py
@@ -59,6 +59,7 @@ from lp.soyuz.enums import (
     PackagePublishingStatus,
     )
 from lp.soyuz.model.archive import Archive
+from lp.soyuz.model.archiveauthtoken import ArchiveAuthToken
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import (
     login_celebrity,
@@ -408,7 +409,15 @@ class TestCloseAccount(TestCaseWithFactory):
         self.assertEqual(now, subscription.date_cancelled)
         self.assertEqual(
             ArchiveSubscriberStatus.CURRENT, other_subscription.status)
-        self.assertIsNotNone(ppa.getAuthToken(person))
+        # The token remains, but is no longer valid since the subscription
+        # has been cancelled.
+        self.assertIsNotNone(
+            IStore(ArchiveAuthToken).find(
+                ArchiveAuthToken,
+                ArchiveAuthToken.archive == ppa,
+                ArchiveAuthToken.date_deactivated == None,
+                ArchiveAuthToken.person == person).one())
+        self.assertIsNone(ppa.getAuthToken(person))
 
     def test_handles_hardware_submissions(self):
         # Launchpad used to support hardware submissions.  This is in the