Merge lp:~wgrant/launchpad/fix-mailman-testrot into lp:launchpad

[William Grant]

Fix two bitrotten MailmanLayer tests.

This branch fixes two MailmanLayer tests that have bitrotted, since MailmanLayer tests aren't run normally.

Good luck trying to run them.

 bin/test --layer=MailmanLayer -vvt staging.txt -t reactivate-lists.txt

[Michael Nelson (michael.nelson)]

Hi William,

Thanks for fixing the bitrot... I'm assuming from your comment that it's expected that staging.txt will continue to fail (http://pastebin.ubuntu.com/414936/).

review: Approve

=== modified file 'lib/lp/services/mailman/doc/reactivate-lists.txt'
--- lib/lp/services/mailman/doc/reactivate-lists.txt	2009-09-24 18:51:29 +0000
+++ lib/lp/services/mailman/doc/reactivate-lists.txt	2010-04-15 11:50:41 +0000
@@ -50,7 +50,7 @@
 
 Now the team owner reactivates the list.
 
-    >>> browser.getLink('Create a mailing list').click()
+    >>> browser.getLink('Configure mailing list').click()
     >>> browser.getControl('Reactivate this Mailing List').click()
     >>> xmlrpc_watcher.wait_for_reactivation('itest-one')
 

=== modified file 'lib/lp/services/mailman/doc/staging.txt'
--- lib/lp/services/mailman/doc/staging.txt	2009-12-02 22:56:09 +0000
+++ lib/lp/services/mailman/doc/staging.txt	2010-04-15 11:50:41 +0000
@@ -22,7 +22,8 @@
 
     >>> login('[e-mail]')
 
-    >>> owner = factory.makePerson()
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> owner = removeSecurityProxy(factory.makePerson())
     >>> team_one = factory.makeTeam(owner=owner, name='staging-one')
     >>> team_two = factory.makeTeam(owner=owner, name='staging-two')
     >>> transaction.commit()