2 files changed, 64 insertions, 1 deletions

diff --git a/src/mailman/utilities/tests/test_modules.py b/src/mailman/utilities/tests/test_modules.py
index 20735486c..82d44cff4 100644
--- a/src/mailman/utilities/tests/test_modules.py
+++ b/src/mailman/utilities/tests/test_modules.py
@@ -23,7 +23,8 @@ import unittest
 
 from contextlib import ExitStack, contextmanager
 from mailman.interfaces.styles import IStyle
-from mailman.utilities.modules import add_components, find_components
+from mailman.utilities.modules import (
+    add_components, find_components, hacked_sys_modules)
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -228,3 +229,15 @@ class StyleA2:
                     'previously <mypackage.components.StyleA1 object at '
                     '.*>'):
                 add_components('mypackage', IStyle, {})
+
+    def test_hacked_sys_modules(self):
+        self.assertIsNone(sys.modules.get('mailman.not_a_module'))
+        with hacked_sys_modules('mailman.not_a_module', object()):
+            self.assertIsNotNone(sys.modules.get('mailman.not_a_module'))
+
+    def test_hacked_sys_modules_restore(self):
+        email_package = sys.modules['email']
+        sentinel = object()
+        with hacked_sys_modules('email', sentinel):
+            self.assertEqual(sys.modules.get('email'), sentinel)
+        self.assertEqual(sys.modules.get('email'), email_package)
diff --git a/src/mailman/utilities/tests/test_options.py b/src/mailman/utilities/tests/test_options.py
new file mode 100644
index 000000000..5885972fa
--- /dev/null
+++ b/src/mailman/utilities/tests/test_options.py
@@ -0,0 +1,50 @@
+# Copyright (C) 2017 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 <http://www.gnu.org/licenses/>.
+
+"""Test option utilities."""
+
+import click
+import unittest
+
+from mailman.utilities.options import validate_runner_spec
+
+
+class TestValidateRunnerSpec(unittest.TestCase):
+    def test_false_value(self):
+        self.assertIsNone(validate_runner_spec(None, None, None))
+
+    def test_runner_only(self):
+        specs = validate_runner_spec(None, None, 'incoming')
+        self.assertEqual(specs, ('incoming', 1, 1))
+
+    def test_full_runner_spec(self):
+        specs = validate_runner_spec(None, None, 'incoming:2:4')
+        self.assertEqual(specs, ('incoming', 2, 4))
+
+    def test_bad_runner_spec(self):
+        with self.assertRaises(click.BadParameter) as cm:
+            validate_runner_spec(None, None, 'incoming:not:int')
+        self.assertEqual(
+            cm.exception.message,
+            'slice and range must be integers: incoming:not:int')
+
+    def test_bad_runner_spec_parts(self):
+        with self.assertRaises(click.UsageError) as cm:
+            validate_runner_spec(None, None, 'incoming:2')
+        self.assertEqual(
+            cm.exception.message,
+            'Bad runner spec: incoming:2')