From 0120c079ed8c9a9b0b1bc5d8341ac2ec1a8638d3 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Tue, 18 Jun 2013 22:43:40 -0400
Subject: Switch to PEP 435 enums from flufl.enums.
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'setup.py')
diff --git a/setup.py b/setup.py
index 3e032f46c..f3fc7faaa 100644
--- a/setup.py
+++ b/setup.py
@@ -93,8 +93,8 @@ case second `m'. Any other spelling is incorrect.""",
'console_scripts' : list(scripts),
},
install_requires = [
+ 'enum34',
'flufl.bounce',
- 'flufl.enum',
'flufl.i18n',
'flufl.lock',
'httplib2',
--
cgit v1.2.3-70-g09d2
From 4be0e93b771e440dd9b59f418cddc4f59f98be42 Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 25 Aug 2013 14:55:33 -0400
Subject: Switch to virtualenv and nose2 instead of zc.buildout and
zope.testing.
---
setup.py | 4 +--
src/mailman/__init__.py | 2 +-
src/mailman/testing/__init__.py | 39 --------------------------
src/mailman/testing/layers.py | 2 +-
src/mailman/testing/nose.py | 61 +++++++++++++++++++++++++++++++++++++++++
unittest.cfg | 10 +++++++
6 files changed, 75 insertions(+), 43 deletions(-)
create mode 100644 src/mailman/testing/nose.py
create mode 100644 unittest.cfg
(limited to 'setup.py')
diff --git a/setup.py b/setup.py
index 3e032f46c..63cea1187 100644
--- a/setup.py
+++ b/setup.py
@@ -101,14 +101,14 @@ case second `m'. Any other spelling is incorrect.""",
'lazr.config',
'lazr.smtptest',
'mock',
+ 'nose2',
'passlib',
'restish',
'storm',
- 'zc.buildout',
'zope.component',
'zope.configuration',
'zope.event',
'zope.interface',
- 'zope.testing<4',
],
+ test_suite = 'nose2.collector.collector',
)
diff --git a/src/mailman/__init__.py b/src/mailman/__init__.py
index 8690e77bd..87a2a2100 100644
--- a/src/mailman/__init__.py
+++ b/src/mailman/__init__.py
@@ -44,7 +44,7 @@ except ImportError:
#
# Do *not* do this if we're building the documentation.
if 'build_sphinx' not in sys.argv:
- if sys.argv[0].split(os.sep)[-1] == 'test':
+ if any('nose2' in arg for arg in sys.argv):
from mailman.testing.i18n import initialize
else:
from mailman.core.i18n import initialize
diff --git a/src/mailman/testing/__init__.py b/src/mailman/testing/__init__.py
index e6a5047b6..e69de29bb 100644
--- a/src/mailman/testing/__init__.py
+++ b/src/mailman/testing/__init__.py
@@ -1,39 +0,0 @@
-# Copyright (C) 2011-2013 by the Free Software Foundation, Inc.
-#
-# This file is part of GNU Mailman.
-#
-# GNU Mailman is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# GNU Mailman. If not, see .
-
-"""Set up testing.
-
-This is used as an interface to buildout.cfg's [test] section.
-zope.testrunner supports an initialization variable. It is set to import and
-run the following test initialization method.
-"""
-
-from __future__ import absolute_import, unicode_literals
-
-__metaclass__ = type
-__all__ = [
- 'initialize',
- ]
-
-
-
-def initialize(root_directory):
- """Initialize the test infrastructure."""
- from mailman.testing import layers
- layers.MockAndMonkeyLayer.testing_mode = True
- layers.ConfigLayer.enable_stderr();
- layers.ConfigLayer.set_root_directory(root_directory)
diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index e47d5c9e0..6d150815f 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -154,7 +154,7 @@ class ConfigLayer(MockAndMonkeyLayer):
continue
logger_name = 'mailman.' + sub_name
log = logging.getLogger(logger_name)
- log.propagate = True
+ #log.propagate = True
# Reopen the file to a new path that tests can get at. Instead of
# using the configuration file path though, use a path that's
# specific to the logger so that tests can find expected output
diff --git a/src/mailman/testing/nose.py b/src/mailman/testing/nose.py
new file mode 100644
index 000000000..c8a6a0798
--- /dev/null
+++ b/src/mailman/testing/nose.py
@@ -0,0 +1,61 @@
+# Copyright (C) 2013 by the Free Software Foundation, Inc.
+#
+# This file is part of GNU Mailman.
+#
+# GNU Mailman is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# GNU Mailman. If not, see .
+
+"""nose2 test infrastructure."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+ 'NosePlugin',
+ ]
+
+
+import os
+import re
+import mailman
+
+from mailman.testing.layers import ConfigLayer, MockAndMonkeyLayer
+from nose2.events import Plugin
+
+
+TOPDIR = os.path.dirname(mailman.__file__)
+
+
+class NosePlugin(Plugin):
+ configSection = 'mailman'
+
+ def __init__(self):
+ self.patterns = []
+ self.addArgument(self.patterns, 'P', 'pattern',
+ 'Add a test matching pattern')
+
+ def startTestRun(self, event):
+ MockAndMonkeyLayer.testing_mode = True
+ ConfigLayer.enable_stderr()
+
+ def getTestCaseNames(self, event):
+ if len(self.patterns) == 0:
+ # No filter patterns, so everything should be tested.
+ return
+ names = filter(event.isTestMethod, dir(event.testCase))
+ for name in names:
+ for pattern in self.patterns:
+ if re.search(pattern, name):
+ break
+ else:
+ event.excludedNames.append(name)
diff --git a/unittest.cfg b/unittest.cfg
new file mode 100644
index 000000000..d639a8ae3
--- /dev/null
+++ b/unittest.cfg
@@ -0,0 +1,10 @@
+[unittest]
+verbose = 2
+plugins = mailman.testing.nose
+ nose2.plugins.layers
+
+[mailman]
+always-on = True
+
+[log-capture]
+always-on = False
--
cgit v1.2.3-70-g09d2