1
=== modified file 'lib/lp/services/mailman/doc/staging.txt'
2
--- lib/lp/services/mailman/doc/staging.txt	2010-10-03 15:30:06 +0000
3
+++ lib/lp/services/mailman/doc/staging.txt	2010-10-07 18:59:42 +0000
4
@@ -19,122 +19,43 @@
5
19
informing them of their new list.  We can ignore these.
19
informing them of their new list.  We can ignore these.
6
20
20
7
21
    >>> from canonical.launchpad.ftests import login, logout
21
    >>> from canonical.launchpad.ftests import login, logout
8
22
    >>> from Mailman import MailList
9
23
10
24
    >>> def makeMailmanList(lp_mailing_list):
11
25
    ...     mlist = MailList.MailList()
12
26
    ...     team = lp_mailing_list.team
13
27
    ...     owner_email = team.teamowner.preferredemail.email
14
28
    ...     mlist.Create(team.name, owner_email, 'password')
15
29
    ...     mlist.host_name = 'lists.prod.launchpad.dev'
16
30
    ...     mlist.web_page_url = 'http://lists.prod.launchpad.dev/mailman/'
17
31
    ...     mlist.Save()
18
32
    ...     mlist.addNewMember(owner_email)
19
33
    ...     mlist.Unlock()
20
34
    ...     return mlist
21
22
35
22
23
    >>> login('admin@canonical.com')
36
    >>> login('admin@canonical.com')
121
24
37
    >>> team_one, list_one = factory.makeTeamAndMailingList(
122
25
    >>> from zope.security.proxy import removeSecurityProxy
38
    ...     'staging-one', 'owner-one')
123
26
    >>> owner = removeSecurityProxy(factory.makePerson())
39
    >>> team_two, list_two = factory.makeTeamAndMailingList(
124
27
    >>> team_one = factory.makeTeam(owner=owner, name='staging-one')
40
    ...     'staging-two', 'owner-two')
125
28
    >>> team_two = factory.makeTeam(owner=owner, name='staging-two')
41
    >>> mlist_one = makeMailmanList(list_one)
126
29
    >>> transaction.commit()
42
    >>> mlist_two = makeMailmanList(list_two)
29
30
    >>> logout()
30
31
31
32
    >>> from canonical.launchpad.testing.pages import setupBrowser
32
33
    >>> browser = setupBrowser('Basic %s:%s' %
33
34
    ...     (owner.preferredemail.email, owner._password_cleartext_cached))
34
35
35
36
    >>> from lp.services.mailman.testing import helpers
36
37
    >>> helpers.apply_for_list(browser, 'staging-one')
37
38
    >>> list_one = helpers.review_list('staging-one')
38
39
39
40
    >>> helpers.apply_for_list(browser, 'staging-two')
40
41
    >>> list_two = helpers.review_list('staging-two')
41
42
42
43
Anne subscribes to two mailing lists.  Bart and Cris both subscribe to only
43
44
one of the mailing lists.
44
45
45
46
    >>> helpers.subscribe('Anne', 'staging-one')
46
47
    >>> helpers.subscribe('Anne', 'staging-two')
47
48
    >>> helpers.subscribe('Bart', 'staging-one')
48
49
    >>> helpers.subscribe('Cris', 'staging-two')
49
50
50
51
A bunch of messages are sent to the mailing lists.
51
52
52
53
    >>> smtpd.reset()
53
54
    >>> from Mailman.Post import inject
54
55
    >>> inject('staging-one', """\
55
56
    ... From: anne.person@example.com
56
57
    ... To: staging-one@lists.launchpad.dev
57
58
    ... Subject: hello
58
59
    ... Message-ID: <first-injection>
59
60
    ...
60
61
    ... Hello team!
61
62
    ... """)
62
63
63
64
    # Wait for all recipients to receive the message.
64
65
    >>> for index in range(3):
65
66
    ...     smtpd_watcher.wait_for_mbox_delivery('first-injection')
66
67
67
68
    >>> inject('staging-two', """\
68
69
    ... From: anne.person@example.com
69
70
    ... To: staging-two@lists.launchpad.dev
70
71
    ... Subject: hello
71
72
    ... Message-ID: <second-injection>
72
73
    ...
73
74
    ... Hello team!
74
75
    ... """)
75
76
76
77
    # Wait for all recipients to receive the message.
77
78
    >>> for index in range(3):
78
79
    ...     smtpd_watcher.wait_for_mbox_delivery('second-injection')
79
80
80
81
    >>> inject('staging-one', """\
81
82
    ... From: bart.person@example.com
82
83
    ... To: staging-one@lists.launchpad.dev
83
84
    ... Subject: hello
84
85
    ... Message-ID: <third-injection>
85
86
    ...
86
87
    ... Hello team!
87
88
    ... """)
88
89
89
90
    # Wait for all recipients to receive the message.
90
91
    >>> for index in range(3):
91
92
    ...     smtpd_watcher.wait_for_mbox_delivery('third-injection')
92
93
93
94
    >>> inject('staging-two', """\
94
95
    ... From: cris.person@example.com
95
96
    ... To: staging-two@lists.launchpad.dev
96
97
    ... Subject: hello
97
98
    ... Message-ID: <fourth-injection>
98
99
    ...
99
100
    ... Hello team!
100
101
    ... """)
101
102
102
103
    # Wait for all recipients to receive the message.
103
104
    >>> for index in range(3):
104
105
    ...     smtpd_watcher.wait_for_mbox_delivery('fourth-injection')
105
106
106
107
    >>> from operator import itemgetter
107
108
    >>> for message in sorted(smtpd, key=itemgetter('sender')):
108
109
    ...     print message['sender']
109
110
    staging-one-bounces+anne.person=example.com@lists.launchpad.dev
110
111
    staging-one-bounces+anne.person=example.com@lists.launchpad.dev
111
112
    staging-one-bounces+archive=mail-archive.dev@lists.launchpad.dev
112
113
    staging-one-bounces+archive=mail-archive.dev@lists.launchpad.dev
113
114
    staging-one-bounces+bart.person=example.com@lists.launchpad.dev
114
115
    staging-one-bounces+bart.person=example.com@lists.launchpad.dev
115
116
    staging-two-bounces+anne.person=example.com@lists.launchpad.dev
116
117
    staging-two-bounces+anne.person=example.com@lists.launchpad.dev
117
118
    staging-two-bounces+archive=mail-archive.dev@lists.launchpad.dev
118
119
    staging-two-bounces+archive=mail-archive.dev@lists.launchpad.dev
119
120
    staging-two-bounces+cris.person=example.com@lists.launchpad.dev
120
121
    staging-two-bounces+cris.person=example.com@lists.launchpad.dev
127
122
43
128
123
Give one of the mailing lists a contact address, to further simulate what the
44
Give one of the mailing lists a contact address, to further simulate what the
129
124
sync script has to deal with.
45
sync script has to deal with.
130
125
46
134
126
    >>> from canonical.launchpad.ftests import login, logout
47
    >>> from canonical.launchpad.interfaces.emailaddress import (
135
127
    >>> from canonical.launchpad.interfaces import (
48
    ...     EmailAddressStatus, IEmailAddressSet)
133
128
    ...     EmailAddressStatus, IEmailAddressSet, IPersonSet)
136
129
    >>> from zope.component import getUtility
49
    >>> from zope.component import getUtility
137
130
    >>> login('admin@canonical.com')
138
131
    >>> team = getUtility(IPersonSet).getByName('staging-two')
139
132
    >>> email = getUtility(IEmailAddressSet).new(
50
    >>> email = getUtility(IEmailAddressSet).new(
142
133
    ...     'contact@example.com', team, EmailAddressStatus.VALIDATED)
51
    ...     'contact@example.com', team_two, EmailAddressStatus.VALIDATED)
143
134
    >>> team.setContactAddress(email)
52
    >>> team_two.setContactAddress(email)
144
135
    >>> logout()
53
    >>> logout()
145
136
    >>> transaction.commit()
54
    >>> transaction.commit()
146
137
55
147
56
XXX sinzui 2010-10-07 bug=656417: The archive/mbox rsync rules are not tested
148
57
and we need a way to build test versions.
149
58
150
138
Now we need to simulate the difference between the staging and production
59
Now we need to simulate the difference between the staging and production
151
139
databases.  To do this, we'll use a helper, but first we need to stop Mailman.
60
databases.  To do this, we'll use a helper, but first we need to stop Mailman.
152
140
61
153
141
62
154
=== modified file 'scripts/mlist-sync.py'
155
--- scripts/mlist-sync.py	2010-10-03 15:30:06 +0000
156
+++ scripts/mlist-sync.py	2010-10-07 18:59:42 +0000
157
@@ -40,7 +40,7 @@
158
40
from canonical.launchpad.interfaces import (
40
from canonical.launchpad.interfaces import (
159
41
    IEmailAddressSet, IMailingListSet, IPersonSet)
41
    IEmailAddressSet, IMailingListSet, IPersonSet)
160
42
from lp.services.mailman.config import configure_prefix
42
from lp.services.mailman.config import configure_prefix
162
43
from lp.services.scripts.base import LaunchpadCronScript
43
from lp.services.scripts.base import LaunchpadScript
163
44
44
164
45
45
165
46
RSYNC_OPTIONS = ('-avz', '--delete')
46
RSYNC_OPTIONS = ('-avz', '--delete')
166
@@ -49,7 +49,7 @@
167
49
SPACE = ' '
49
SPACE = ' '
168
50
50
169
51
51
171
52
class MailingListSyncScript(LaunchpadCronScript):
52
class MailingListSyncScript(LaunchpadScript):
172
53
    """
53
    """
173
54
    %prog [options] source_url
54
    %prog [options] source_url
174
55
55
175
@@ -205,7 +205,7 @@
176
205
            # Keep going.
205
            # Keep going.
177
206
206
178
207
    def main(self):
207
    def main(self):
180
208
        """See `LaunchpadCronScript`."""
208
        """See `LaunchpadScript`."""
181
209
        source_url = None
209
        source_url = None
182
210
        if len(self.args) == 0:
210
        if len(self.args) == 0:
183
211
            self.parser.error('Missing source_url')
211
            self.parser.error('Missing source_url')
Reviewer	Review Type	Date Requested	Status
Edwin Grubbs (community)	code	2010-10-07	Approve on 2010-10-07
Review via email: mp+37885@code.launchpad.net