Revision: 8117
http://svn.sourceforge.net/mailman/?rev=8117&view=rev
Author: bwarsaw
Date: 2006-12-11 19:58:06 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Unit test repairs; even though the unit tests are still pretty fragile,
everything now passes with the SQLAlchemy storage of list data.
Added missing 'personalize' column. Converted mailmanctl and qrunner to
initialize() interface. Fixed _cookie_path() to not fail if SCRIPT_NAME is
not in the environment.
Modified Paths:
--------------
branches/tmp-sqlalchemy-branch/Mailman/SecurityManager.py
branches/tmp-sqlalchemy-branch/Mailman/bin/mailmanctl.py
branches/tmp-sqlalchemy-branch/Mailman/bin/qrunner.py
branches/tmp-sqlalchemy-branch/Mailman/database/listdata.py
branches/tmp-sqlalchemy-branch/Mailman/testing/test_handlers.py
branches/tmp-sqlalchemy-branch/Mailman/testing/test_message.py
branches/tmp-sqlalchemy-branch/Mailman/testing/test_security_mgr.py
Modified: branches/tmp-sqlalchemy-branch/Mailman/SecurityManager.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/SecurityManager.py 2006-12-11
12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/SecurityManager.py 2006-12-12
03:58:06 UTC (rev 8117)
@@ -71,7 +71,9 @@
log = logging.getLogger('mailman.error')
+SLASH = '/'
+
class SecurityManager:
def InitVars(self):
@@ -227,7 +229,8 @@
return False
def _cookie_path(self):
- return '/'.join(os.environ['SCRIPT_NAME'].split('/')[:-1]) + '/'
+ script_name = os.environ.get('SCRIPT_NAME', '')
+ return SLASH.join(script_name.split(SLASH)[:-1]) + SLASH
def MakeCookie(self, authcontext, user=None):
key, secret = self.AuthContextInfo(authcontext, user)
Modified: branches/tmp-sqlalchemy-branch/Mailman/bin/mailmanctl.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/bin/mailmanctl.py 2006-12-11
12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/bin/mailmanctl.py 2006-12-12
03:58:06 UTC (rev 8117)
@@ -34,6 +34,7 @@
from Mailman.MailList import MailList
from Mailman.configuration import config
from Mailman.i18n import _
+from Mailman.initialize import initialize
__i18n_templates__ = True
@@ -300,9 +301,8 @@
global elog, qlog, opts
parser, opts, args = parseargs()
- config.load(opts.config)
+ initialize(opts.config)
- loginit.initialize()
elog = logging.getLogger('mailman.error')
qlog = logging.getLogger('mailman.qrunner')
Modified: branches/tmp-sqlalchemy-branch/Mailman/bin/qrunner.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/bin/qrunner.py 2006-12-11
12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/bin/qrunner.py 2006-12-12
03:58:06 UTC (rev 8117)
@@ -24,6 +24,7 @@
from Mailman import loginit
from Mailman.configuration import config
from Mailman.i18n import _
+from Mailman.initialize import initialize
__i18n_templates__ = True
@@ -181,7 +182,7 @@
global log, opts
parser, opts, args = parseargs()
- config.load(opts.config)
+ initialize(opts.config)
# If we're not running as a subprocess of mailmanctl, then we'll log to
# stderr in addition to logging to the log files. We do this by passing a
Modified: branches/tmp-sqlalchemy-branch/Mailman/database/listdata.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/database/listdata.py 2006-12-11
12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/database/listdata.py 2006-12-12
03:58:06 UTC (rev 8117)
@@ -119,6 +119,7 @@
Column('owner', PickleType),
Column('pass_filename_extensions', PickleType),
Column('pass_mime_types', PickleType),
+ Column('personalize', Integer),
Column('preferred_language', Unicode),
Column('private_roster', Boolean),
Column('real_name', Unicode),
Modified: branches/tmp-sqlalchemy-branch/Mailman/testing/test_handlers.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/testing/test_handlers.py
2006-12-11 12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/testing/test_handlers.py
2006-12-12 03:58:06 UTC (rev 8117)
@@ -143,8 +143,8 @@
was successfully received by the _xtest mailing list.
-List info page: http://www.example.com/mailman/listinfo/_xtest
-Your preferences:
http://www.example.com/mailman/options/_xtest/aperson%40example.org
+List info page: http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]
+Your preferences: http://www.example.com/mailman/options/[EMAIL
PROTECTED]/aperson%40example.org
""")
# Make sure we dequeued the only message
eq(len(self._sb.files()), 0)
@@ -183,8 +183,8 @@
was successfully received by the _xtest mailing list.
-List info page: http://www.example.com/mailman/listinfo/_xtest
-Your preferences:
http://www.example.com/mailman/options/_xtest/aperson%40example.org
+List info page: http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]
+Your preferences: http://www.example.com/mailman/options/[EMAIL
PROTECTED]/aperson%40example.org
""")
# Make sure we dequeued the only message
eq(len(self._sb.files()), 0)
@@ -690,13 +690,14 @@
eq(msg['list-id'], '<_xtest.example.com>')
eq(msg['list-help'], '<mailto:[EMAIL PROTECTED]>')
eq(msg['list-unsubscribe'],
- '<http://www.example.com/mailman/listinfo/_xtest>,'
+ '<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,'
'\n\t<mailto:[EMAIL PROTECTED]>')
eq(msg['list-subscribe'],
- '<http://www.example.com/mailman/listinfo/_xtest>,'
+ '<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,'
'\n\t<mailto:[EMAIL PROTECTED]>')
eq(msg['list-post'], '<mailto:[EMAIL PROTECTED]>')
- eq(msg['list-archive'], '<http://www.example.com/pipermail/_xtest>')
+ eq(msg['list-archive'],
+ '<http://www.example.com/pipermail/[EMAIL PROTECTED]>')
def test_list_headers_with_description(self):
eq = self.assertEqual
@@ -710,10 +711,10 @@
eq(unicode(msg['list-id']), u'A Test List <_xtest.example.com>')
eq(msg['list-help'], '<mailto:[EMAIL PROTECTED]>')
eq(msg['list-unsubscribe'],
- '<http://www.example.com/mailman/listinfo/_xtest>,'
+ '<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,'
'\n\t<mailto:[EMAIL PROTECTED]>')
eq(msg['list-subscribe'],
- '<http://www.example.com/mailman/listinfo/_xtest>,'
+ '<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,'
'\n\t<mailto:[EMAIL PROTECTED]>')
eq(msg['list-post'], '<mailto:[EMAIL PROTECTED]>')
Modified: branches/tmp-sqlalchemy-branch/Mailman/testing/test_message.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/testing/test_message.py
2006-12-11 12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/testing/test_message.py
2006-12-12 03:58:06 UTC (rev 8117)
@@ -56,11 +56,11 @@
eq(qmsg['list-help'],
'<mailto:[EMAIL PROTECTED]>')
eq(qmsg['list-subscribe'], """\
-<http://www.example.com/mailman/listinfo/_xtest>,
+<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,
\t<mailto:[EMAIL PROTECTED]>""")
eq(qmsg['list-id'], '<_xtest.example.com>')
eq(qmsg['list-unsubscribe'], """\
-<http://www.example.com/mailman/listinfo/_xtest>,
+<http://www.example.com/mailman/listinfo/[EMAIL PROTECTED]>,
\t<mailto:[EMAIL PROTECTED]>""")
eq(qmsg.get_payload(), 'About your test list')
Modified: branches/tmp-sqlalchemy-branch/Mailman/testing/test_security_mgr.py
===================================================================
--- branches/tmp-sqlalchemy-branch/Mailman/testing/test_security_mgr.py
2006-12-11 12:27:47 UTC (rev 8116)
+++ branches/tmp-sqlalchemy-branch/Mailman/testing/test_security_mgr.py
2006-12-12 03:58:06 UTC (rev 8117)
@@ -57,28 +57,28 @@
mlist.addNewMember('[EMAIL PROTECTED]', password='xxXXxx')
self.assertEqual(
mlist.AuthContextInfo(config.AuthUser, '[EMAIL PROTECTED]'),
- ('_xtest+user+aperson--at--dom.ain', 'xxXXxx'))
+ ('_xtest%40example.com+user+aperson--at--dom.ain', 'xxXXxx'))
def test_auth_context_moderator(self):
mlist = self._mlist
mlist.mod_password = 'yyYYyy'
self.assertEqual(
mlist.AuthContextInfo(config.AuthListModerator),
- ('_xtest+moderator', 'yyYYyy'))
+ ('_xtest%40example.com+moderator', 'yyYYyy'))
def test_auth_context_admin(self):
mlist = self._mlist
mlist.password = 'zzZZzz'
self.assertEqual(
mlist.AuthContextInfo(config.AuthListAdmin),
- ('_xtest+admin', 'zzZZzz'))
+ ('_xtest%40example.com+admin', 'zzZZzz'))
def test_auth_context_site(self):
mlist = self._mlist
mlist.password = 'aaAAaa'
self.assertEqual(
mlist.AuthContextInfo(config.AuthSiteAdmin),
- ('_xtest+admin', 'aaAAaa'))
+ ('_xtest%40example.com+admin', 'aaAAaa'))
def test_auth_context_huh(self):
self.assertEqual(
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
