Barry Warsaw pushed to branch fluflpublic at mailman / Mailman
Commits:
b0f5e430 by Barry Warsaw at 2016-11-30T15:03:35-05:00
Finish configuring flufl.testing.
Also, use the better way to set the LMTP ident.
- - - - -
3 changed files:
- src/mailman/runners/lmtp.py
- src/mailman/testing/helpers.py
- unittest.cfg
Changes:
=====================================
src/mailman/runners/lmtp.py
=====================================
--- a/src/mailman/runners/lmtp.py
+++ b/src/mailman/runners/lmtp.py
@@ -93,9 +93,6 @@ ERR_502 = '502 Error: command HELO not implemented'
ERR_550 = '550 Requested action not taken: mailbox unavailable'
ERR_550_MID = '550 No Message-ID header provided'
-# XXX Blech
-aiosmtpd.smtp.__version__ = 'GNU Mailman LMTP runner 2.0'
-
def split_recipient(address):
"""Split an address into listname, subaddress and domain parts.
@@ -218,7 +215,9 @@ class LMTPHandler:
class LMTPController(Controller):
def factory(self):
- return LMTP(self.handler)
+ server = LMTP(self.handler)
+ server.__ident__ = 'GNU Mailman LMTP runner 2.0'
+ return server
def make_socket(self):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
=====================================
src/mailman/testing/helpers.py
=====================================
--- a/src/mailman/testing/helpers.py
+++ b/src/mailman/testing/helpers.py
@@ -568,3 +568,11 @@ def hackenv(envar, new_value):
del os.environ[envar]
else:
os.environ[envar] = old_value
+
+
+def nose2_start_test_run_callback(plugin):
+ from mailman.testing.layers import ConfigLayer, MockAndMonkeyLayer
+ MockAndMonkeyLayer.testing_mode = True
+ if (plugin.stderr or
+ len(os.environ.get('MM_VERBOSE_TESTLOG', '').strip()) > 0):
+ ConfigLayer.stderr = True
=====================================
unittest.cfg
=====================================
--- a/unittest.cfg
+++ b/unittest.cfg
@@ -9,3 +9,7 @@ always-on = False
[flufl.testing]
always-on = True
package = mailman
+start_run = mailman.testing.helpers.nose2_start_test_run_callback
+default_layer = mailman.testing.layers.SMTPLayer
+setup = mailman.testing.documentation.setup
+teardown = mailman.testing.documentation.teardown
View it on GitLab:
https://gitlab.com/mailman/mailman/commit/b0f5e43046c6b4be473e1d98623e3157221719af
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
