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

Proposed by William Grant
Status: Merged
Approved by: Michael Nelson
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/fix-mailman-testrot
Merge into: lp:launchpad
Diff against target: 26 lines (+3/-2)
2 files modified
lib/lp/services/mailman/doc/reactivate-lists.txt (+1/-1)
lib/lp/services/mailman/doc/staging.txt (+2/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/fix-mailman-testrot
Reviewer Review Type Date Requested Status
Michael Nelson (community) Approve
Review via email: mp+23475@code.launchpad.net

Commit message

Fix two bitrotten MailmanLayer tests.

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
5050
51Now the team owner reactivates the list.51Now the team owner reactivates the list.
5252
53 >>> browser.getLink('Create a mailing list').click()53 >>> browser.getLink('Configure mailing list').click()
54 >>> browser.getControl('Reactivate this Mailing List').click()54 >>> browser.getControl('Reactivate this Mailing List').click()
55 >>> xmlrpc_watcher.wait_for_reactivation('itest-one')55 >>> xmlrpc_watcher.wait_for_reactivation('itest-one')
5656
5757
=== 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 @@
2222
23 >>> login('admin@canonical.com')23 >>> login('admin@canonical.com')
2424
25 >>> owner = factory.makePerson()25 >>> from zope.security.proxy import removeSecurityProxy
26 >>> owner = removeSecurityProxy(factory.makePerson())
26 >>> team_one = factory.makeTeam(owner=owner, name='staging-one')27 >>> team_one = factory.makeTeam(owner=owner, name='staging-one')
27 >>> team_two = factory.makeTeam(owner=owner, name='staging-two')28 >>> team_two = factory.makeTeam(owner=owner, name='staging-two')
28 >>> transaction.commit()29 >>> transaction.commit()