------------------------------------------------------------
revno: 6635
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: reorg
timestamp: Thu 2008-07-03 15:32:25 -0400
message:
mailman.tests should contain only tests.
mailman.testing should contain any support for running the tests.
added:
mailman/testing/
mailman/testing/__init__.py
renamed:
mailman/tests/helpers.py => mailman/testing/helpers.py
mailman/tests/smtplistener.py => mailman/testing/smtplistener.py
mailman/tests/testing.cfg.in => mailman/testing/testing.cfg.in
modified:
mailman/bin/docs/master.txt
mailman/bin/testall.py
mailman/docs/pipelines.txt
mailman/pipeline/docs/digests.txt
mailman/queue/docs/archiver.txt
mailman/queue/docs/command.txt
mailman/queue/docs/incoming.txt
mailman/queue/docs/lmtp.txt
mailman/queue/docs/outgoing.txt
mailman/testing/helpers.py
=== modified file 'mailman/bin/docs/master.txt'
--- a/mailman/bin/docs/master.txt 2008-03-12 22:35:16 +0000
+++ b/mailman/bin/docs/master.txt 2008-07-03 19:32:25 +0000
@@ -7,7 +7,7 @@
just a wrapper around the real queue runner watcher script called master.py.
>>> from mailman.configuration import config
- >>> from mailman.tests.helpers import TestableMaster
+ >>> from mailman.testing.helpers import TestableMaster
Start the master in a subthread.
=== modified file 'mailman/bin/testall.py'
--- a/mailman/bin/testall.py 2008-03-31 18:12:04 +0000
+++ b/mailman/bin/testall.py 2008-07-03 19:32:25 +0000
@@ -198,7 +198,7 @@
enable_logging_cfg = True
cfg_in = pkg_resources.resource_string(
- 'mailman.tests', 'testing.cfg.in')
+ 'mailman.testing', 'testing.cfg.in')
fd, cfg_out = tempfile.mkstemp(suffix='.cfg')
os.close(fd)
with open(cfg_out, 'w') as fp:
=== modified file 'mailman/docs/pipelines.txt'
--- a/mailman/docs/pipelines.txt 2008-02-27 06:26:18 +0000
+++ b/mailman/docs/pipelines.txt 2008-07-03 19:32:25 +0000
@@ -68,7 +68,7 @@
And the message is now sitting in various other processing queues.
- >>> from mailman.tests.helpers import get_queue_messages
+ >>> from mailman.testing.helpers import get_queue_messages
>>> from mailman.configuration import config
>>> messages = get_queue_messages(config.ARCHQUEUE_DIR)
>>> len(messages)
@@ -144,7 +144,7 @@
There's now one message in the digest mailbox, getting ready to be sent.
- >>> from mailman.tests.helpers import digest_mbox
+ >>> from mailman.testing.helpers import digest_mbox
>>> digest = digest_mbox(mlist)
>>> sum(1 for mboxmsg in digest)
1
=== modified file 'mailman/pipeline/docs/digests.txt'
--- a/mailman/pipeline/docs/digests.txt 2008-02-27 06:26:18 +0000
+++ b/mailman/pipeline/docs/digests.txt 2008-07-03 19:32:25 +0000
@@ -21,7 +21,7 @@
messages, in the order in which they were posted. This makes it easier to
update the tests when we switch to a different mailbox format.
- >>> from mailman.tests.helpers import digest_mbox
+ >>> from mailman.testing.helpers import digest_mbox
>>> from itertools import count
>>> from string import Template
>>> def makemsg():
=== modified file 'mailman/queue/docs/archiver.txt'
--- a/mailman/queue/docs/archiver.txt 2008-03-31 17:16:40 +0000
+++ b/mailman/queue/docs/archiver.txt 2008-07-03 19:32:25 +0000
@@ -24,7 +24,7 @@
>>> ignore = archiver_queue.enqueue(msg, {}, listname=mlist.fqdn_listname)
>>> from mailman.queue.archive import ArchiveRunner
- >>> from mailman.tests.helpers import make_testable_runner
+ >>> from mailman.testing.helpers import make_testable_runner
>>> runner = make_testable_runner(ArchiveRunner)
>>> runner.run()
=== modified file 'mailman/queue/docs/command.txt'
--- a/mailman/queue/docs/command.txt 2008-04-26 05:57:53 +0000
+++ b/mailman/queue/docs/command.txt 2008-07-03 19:32:25 +0000
@@ -28,7 +28,7 @@
>>> from mailman.inject import inject_message
>>> inject_message(mlist, msg, qdir=config.CMDQUEUE_DIR)
>>> from mailman.queue.command import CommandRunner
- >>> from mailman.tests.helpers import make_testable_runner
+ >>> from mailman.testing.helpers import make_testable_runner
>>> command = make_testable_runner(CommandRunner)
>>> command.run()
@@ -38,7 +38,7 @@
>>> virgin_queue = Switchboard(config.VIRGINQUEUE_DIR)
>>> len(virgin_queue.files)
1
- >>> from mailman.tests.helpers import get_queue_messages
+ >>> from mailman.testing.helpers import get_queue_messages
>>> item = get_queue_messages(virgin_queue)[0]
>>> print item.msg.as_string()
Subject: The results of your email commands
=== modified file 'mailman/queue/docs/incoming.txt'
--- a/mailman/queue/docs/incoming.txt 2008-03-31 15:41:40 +0000
+++ b/mailman/queue/docs/incoming.txt 2008-07-03 19:32:25 +0000
@@ -42,7 +42,7 @@
The incoming queue runner runs until it is empty.
>>> from mailman.queue.incoming import IncomingRunner
- >>> from mailman.tests.helpers import make_testable_runner
+ >>> from mailman.testing.helpers import make_testable_runner
>>> incoming = make_testable_runner(IncomingRunner)
>>> incoming.run()
@@ -56,7 +56,7 @@
>>> incoming_queue = Switchboard(config.INQUEUE_DIR)
>>> len(incoming_queue.files)
0
- >>> from mailman.tests.helpers import get_queue_messages
+ >>> from mailman.testing.helpers import get_queue_messages
>>> item = get_queue_messages(pipeline_queue)[0]
>>> print item.msg.as_string()
From: [EMAIL PROTECTED]
=== modified file 'mailman/queue/docs/lmtp.txt'
--- a/mailman/queue/docs/lmtp.txt 2008-03-13 13:00:20 +0000
+++ b/mailman/queue/docs/lmtp.txt 2008-07-03 19:32:25 +0000
@@ -10,7 +10,7 @@
Let's start a testable LMTP queue runner.
- >>> from mailman.tests import helpers
+ >>> from mailman.testing import helpers
>>> master = helpers.TestableMaster()
>>> master.start('lmtp')
=== modified file 'mailman/queue/docs/outgoing.txt'
--- a/mailman/queue/docs/outgoing.txt 2008-03-27 09:14:14 +0000
+++ b/mailman/queue/docs/outgoing.txt 2008-07-03 19:32:25 +0000
@@ -26,7 +26,7 @@
... u'password', DeliveryMode.regular, u'en',
... ack=False, admin_notif=False)
- >>> from mailman.tests.helpers import SMTPServer
+ >>> from mailman.testing.helpers import SMTPServer
>>> smtpd = SMTPServer()
>>> smtpd.start()
>>> from mailman.configuration import config
@@ -70,7 +70,7 @@
upstream SMTP, which happens to be our test server.
>>> from mailman.queue.outgoing import OutgoingRunner
- >>> from mailman.tests.helpers import make_testable_runner
+ >>> from mailman.testing.helpers import make_testable_runner
>>> outgoing = make_testable_runner(OutgoingRunner)
>>> outgoing.run()
=== added directory 'mailman/testing'
=== added file 'mailman/testing/__init__.py'
=== renamed file 'mailman/tests/helpers.py' => 'mailman/testing/helpers.py'
--- a/mailman/tests/helpers.py 2008-03-27 09:14:14 +0000
+++ b/mailman/testing/helpers.py 2008-07-03 19:32:25 +0000
@@ -46,7 +46,7 @@
from mailman.bin.master import Loop as Master
from mailman.configuration import config
from mailman.queue import Switchboard
-from mailman.tests.smtplistener import Server
+from mailman.testing.smtplistener import Server
log = logging.getLogger('mailman.debug')
=== renamed file 'mailman/tests/smtplistener.py' =>
'mailman/testing/smtplistener.py'
=== renamed file 'mailman/tests/testing.cfg.in' =>
'mailman/testing/testing.cfg.in'
--
Primary development focus
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
