* Held messages can now be moderated through the REST API. Mailing list

   resources now accept a `held` path component.  GETing this returns all held
   messages for the mailing list.  POSTing to a specific request id under this
   url can dispose of the message using `Action` enums.
 * `IRequests` interface is removed.  Now just use adaptation from
   `IListRequests` directly (which takes an `IMailingList` object).
 * `handle_message()` now allows for `Action.hold` which is synonymous with
   `Action.defer` (since the message is already being held).
 * `IListRequests.get_request()` now takes an optional `request_type`
   argument to narrow the search for the given request.

- also, print_function is now a standard __future__ import.  The template has
  been updated, but add this to modules as you edit them.

1 files changed, 107 insertions, 0 deletions

diff --git a/src/mailman/rest/tests/test_moderation.py b/src/mailman/rest/tests/test_moderation.py
new file mode 100644
index 000000000..79b0c8b80
--- /dev/null
+++ b/src/mailman/rest/tests/test_moderation.py
@@ -0,0 +1,107 @@
+# Copyright (C) 2012 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/>.
+
+"""REST moderation tests."""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+__metaclass__ = type
+__all__ = [
+    ]
+
+
+import unittest
+
+from urllib2 import HTTPError
+
+from mailman.app.lifecycle import create_list
+from mailman.app.moderator import hold_message, hold_subscription
+from mailman.config import config
+from mailman.interfaces.member import DeliveryMode
+from mailman.testing.helpers import (
+    call_api, specialized_message_from_string as mfs)
+from mailman.testing.layers import RESTLayer
+
+
+
+class TestModeration(unittest.TestCase):
+    layer = RESTLayer
+
+    def setUp(self):
+        self._mlist = create_list('ant@example.com')
+        self._msg = mfs("""\
+From: anne@example.com
+To: ant@example.com
+Subject: Something
+Message-ID: <alpha>
+
+Something else.
+""")
+        config.db.commit()
+
+    def test_not_found(self):
+        # When a bogus mailing list is given, 404 should result.
+        try:
+            # For Python 2.6
+            call_api('http://localhost:9001/3.0/lists/bee@example.com/held')
+        except HTTPError as exc:
+            self.assertEqual(exc.code, 404)
+        else:
+            raise AssertionError('Expected HTTPError')
+
+    def test_bad_request_id(self):
+        # Bad request when request_id is not an integer.
+        try:
+            # For Python 2.6
+            call_api(
+                'http://localhost:9001/3.0/lists/ant@example.com/held/bogus')
+        except HTTPError as exc:
+            self.assertEqual(exc.code, 400)
+        else:
+            raise AssertionError('Expected HTTPError')
+
+    def test_subscription_request_as_held_message(self):
+        # Provide the request id of a subscription request using the held
+        # message API returns a not-found even though the request id is
+        # in the database.
+        held_id = hold_message(self._mlist, self._msg)
+        subscribe_id = hold_subscription(
+            self._mlist, 'bperson@example.net', 'Bart Person', 'xyz',
+            DeliveryMode.regular, 'en')
+        config.db.store.commit()
+        url = 'http://localhost:9001/3.0/lists/ant@example.com/held/{0}'
+        try:
+            call_api(url.format(subscribe_id))
+        except HTTPError as exc:
+            self.assertEqual(exc.code, 404)
+        else:
+            raise AssertionError('Expected HTTPError')
+        # But using the held_id returns a valid response.
+        response, content = call_api(url.format(held_id))
+        self.assertEqual(response['key'], '<alpha>')
+
+    def test_bad_action(self):
+        # POSTing to a held message with a bad action.
+        held_id = hold_message(self._mlist, self._msg)
+        url = 'http://localhost:9001/3.0/lists/ant@example.com/held/{0}'
+        try:
+            call_api(url.format(held_id), {'action': 'bogus'})
+        except HTTPError as exc:
+            self.assertEqual(exc.code, 400)
+            self.assertEqual(exc.msg, 'Cannot convert parameters: action')
+        else:
+            raise AssertionError('Expected HTTPError')