diff options
| -rw-r--r-- | mailman/bin/docs/master.txt | 2 | ||||
| -rw-r--r-- | mailman/bin/testall.py | 2 | ||||
| -rw-r--r-- | mailman/docs/pipelines.txt | 4 | ||||
| -rw-r--r-- | mailman/pipeline/docs/digests.txt | 2 | ||||
| -rw-r--r-- | mailman/queue/docs/archiver.txt | 2 | ||||
| -rw-r--r-- | mailman/queue/docs/command.txt | 4 | ||||
| -rw-r--r-- | mailman/queue/docs/incoming.txt | 4 | ||||
| -rw-r--r-- | mailman/queue/docs/lmtp.txt | 2 | ||||
| -rw-r--r-- | mailman/queue/docs/outgoing.txt | 4 | ||||
| -rw-r--r-- | mailman/testing/__init__.py | 0 | ||||
| -rw-r--r-- | mailman/testing/helpers.py (renamed from mailman/tests/helpers.py) | 2 | ||||
| -rw-r--r-- | mailman/testing/smtplistener.py (renamed from mailman/tests/smtplistener.py) | 0 | ||||
| -rw-r--r-- | mailman/testing/testing.cfg.in (renamed from mailman/tests/testing.cfg.in) | 0 |
13 files changed, 14 insertions, 14 deletions
diff --git a/mailman/bin/docs/master.txt b/mailman/bin/docs/master.txt index 333893f78..7565e93b1 100644 --- a/mailman/bin/docs/master.txt +++ b/mailman/bin/docs/master.txt @@ -7,7 +7,7 @@ is used to start, stop and manage the queue runners. mailmanctl actually is 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. diff --git a/mailman/bin/testall.py b/mailman/bin/testall.py index e4e2cc140..e7b3c445b 100644 --- a/mailman/bin/testall.py +++ b/mailman/bin/testall.py @@ -198,7 +198,7 @@ def main(): 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: diff --git a/mailman/docs/pipelines.txt b/mailman/docs/pipelines.txt index f475bf88e..0fe51e0e4 100644 --- a/mailman/docs/pipelines.txt +++ b/mailman/docs/pipelines.txt @@ -68,7 +68,7 @@ However there are currently no recipients for this message. 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 @@ This is the message that will actually get delivered to end recipients. 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 diff --git a/mailman/pipeline/docs/digests.txt b/mailman/pipeline/docs/digests.txt index d81e173f8..df01379b9 100644 --- a/mailman/pipeline/docs/digests.txt +++ b/mailman/pipeline/docs/digests.txt @@ -21,7 +21,7 @@ This is a helper function used to iterate through all the accumulated digest 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(): diff --git a/mailman/queue/docs/archiver.txt b/mailman/queue/docs/archiver.txt index 7737ef7d0..8c34e3537 100644 --- a/mailman/queue/docs/archiver.txt +++ b/mailman/queue/docs/archiver.txt @@ -24,7 +24,7 @@ interface. By default, there's a Pipermail archiver. >>> 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() diff --git a/mailman/queue/docs/command.txt b/mailman/queue/docs/command.txt index fdad3bb5c..c18e7a34c 100644 --- a/mailman/queue/docs/command.txt +++ b/mailman/queue/docs/command.txt @@ -28,7 +28,7 @@ sender. The command can be in the Subject header. >>> 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 @@ And now the response is in the virgin queue. >>> 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 diff --git a/mailman/queue/docs/incoming.txt b/mailman/queue/docs/incoming.txt index 024077551..997eac07e 100644 --- a/mailman/queue/docs/incoming.txt +++ b/mailman/queue/docs/incoming.txt @@ -42,7 +42,7 @@ queue, but this is an effective simulation. 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 @@ And now the message is in the pipeline queue. >>> 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: aperson@example.com diff --git a/mailman/queue/docs/lmtp.txt b/mailman/queue/docs/lmtp.txt index 7b25d6a74..bb77203b4 100644 --- a/mailman/queue/docs/lmtp.txt +++ b/mailman/queue/docs/lmtp.txt @@ -10,7 +10,7 @@ message is destined for a valid endpoint, e.g. mylist-join@example.com. Let's start a testable LMTP queue runner. - >>> from mailman.tests import helpers + >>> from mailman.testing import helpers >>> master = helpers.TestableMaster() >>> master.start('lmtp') diff --git a/mailman/queue/docs/outgoing.txt b/mailman/queue/docs/outgoing.txt index fc9161320..ba6cc6d96 100644 --- a/mailman/queue/docs/outgoing.txt +++ b/mailman/queue/docs/outgoing.txt @@ -26,7 +26,7 @@ move messages to the 'retry queue' for handling delivery failures. ... 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 @@ Running the outgoing queue runner processes the message, delivering it to the 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() diff --git a/mailman/testing/__init__.py b/mailman/testing/__init__.py new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/mailman/testing/__init__.py diff --git a/mailman/tests/helpers.py b/mailman/testing/helpers.py index d1eda9e34..af687828f 100644 --- a/mailman/tests/helpers.py +++ b/mailman/testing/helpers.py @@ -46,7 +46,7 @@ from datetime import datetime, timedelta 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') diff --git a/mailman/tests/smtplistener.py b/mailman/testing/smtplistener.py index 1dc11e3e0..1dc11e3e0 100644 --- a/mailman/tests/smtplistener.py +++ b/mailman/testing/smtplistener.py diff --git a/mailman/tests/testing.cfg.in b/mailman/testing/testing.cfg.in index e7b23ac6d..e7b23ac6d 100644 --- a/mailman/tests/testing.cfg.in +++ b/mailman/testing/testing.cfg.in |