summaryrefslogtreecommitdiff
path: root/src/mailman/tests
diff options
context:
space:
mode:
authorBarry Warsaw2012-08-17 23:32:47 -0400
committerBarry Warsaw2012-08-17 23:32:47 -0400
commitffd6b7b2ec632920cbf9d413aa20d83d8333c87f (patch)
treea75e7bff8ad7fd2340c61f16d4cac388ddec7730 /src/mailman/tests
parent82d2ef15e3810abf984dc70c800dac3ebca02f03 (diff)
downloadmailman-ffd6b7b2ec632920cbf9d413aa20d83d8333c87f.tar.gz
mailman-ffd6b7b2ec632920cbf9d413aa20d83d8333c87f.tar.zst
mailman-ffd6b7b2ec632920cbf9d413aa20d83d8333c87f.zip
* Show devmode in `bin/mailman info` output. (LP: #1035028)
Also, allow doctest cleanups to be tuples, in which case the first item is the callable and the subsequent items are the arguments. Makes for config.pop()'ing much nicer.
Diffstat (limited to 'src/mailman/tests')
-rw-r--r--src/mailman/tests/test_documentation.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mailman/tests/test_documentation.py b/src/mailman/tests/test_documentation.py
index 329e0176a..b769f07d6 100644
--- a/src/mailman/tests/test_documentation.py
+++ b/src/mailman/tests/test_documentation.py
@@ -34,6 +34,8 @@ import sys
import doctest
import unittest
+from inspect import isfunction, ismethod
+
import mailman
from mailman.app.lifecycle import create_list
@@ -169,7 +171,10 @@ def setup(testobj):
def teardown(testobj):
for cleanup in testobj.globs['cleanups']:
- cleanup()
+ if isfunction(cleanup) or ismethod(cleanup):
+ cleanup()
+ else:
+ cleanup[0](*cleanup[1:])