summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2016-02-29 21:51:04 -0500
committerBarry Warsaw2016-02-29 21:52:13 -0500
commit5505a9208581a9b0b015e78f61db12e645847189 (patch)
tree91a1278ec21c8ba4f84c9fffa3761c4772be3614 /src
parent0699f9dcb8680ea99346f915680903a3c6f25318 (diff)
downloadmailman-5505a9208581a9b0b015e78f61db12e645847189.tar.gz
mailman-5505a9208581a9b0b015e78f61db12e645847189.tar.zst
mailman-5505a9208581a9b0b015e78f61db12e645847189.zip
Diffstat (limited to 'src')
-rw-r--r--src/mailman/rest/lists.py7
-rw-r--r--src/mailman/rest/tests/test_header_matches.py12
-rw-r--r--src/mailman/rest/tests/test_lists.py5
3 files changed, 9 insertions, 15 deletions
diff --git a/src/mailman/rest/lists.py b/src/mailman/rest/lists.py
index 1ef077243..0273c5d3a 100644
--- a/src/mailman/rest/lists.py
+++ b/src/mailman/rest/lists.py
@@ -52,7 +52,6 @@ from mailman.rest.validator import Validator
from zope.component import getUtility
-
def member_matcher(request, segments):
"""A matcher of member URLs inside mailing lists.
@@ -98,7 +97,6 @@ def config_matcher(request, segments):
return None
-
class _ListBase(CollectionMixin):
"""Shared base class for mailing list representations."""
@@ -215,7 +213,6 @@ class AList(_ListBase):
return HeaderMatches(self._mlist)
-
class AllLists(_ListBase):
"""The mailing lists."""
@@ -241,7 +238,6 @@ class AllLists(_ListBase):
okay(response, etag(resource))
-
class MembersOfList(MemberCollection):
"""The members of a mailing list."""
@@ -275,7 +271,6 @@ class ListsForDomain(_ListBase):
return list(self._domain.mailing_lists)
-
class ArchiverGetterSetter(GetterSetter):
"""Resource for updating archiver statuses."""
@@ -328,7 +323,6 @@ class ListArchivers:
self.patch_put(request, response, is_optional=True)
-
class ListDigest:
"""Simple resource representing actions on a list's digest."""
@@ -363,7 +357,6 @@ class ListDigest:
accepted(response)
-
class Styles:
"""Simple resource representing all list styles."""
diff --git a/src/mailman/rest/tests/test_header_matches.py b/src/mailman/rest/tests/test_header_matches.py
index f2a957d79..26baddd34 100644
--- a/src/mailman/rest/tests/test_header_matches.py
+++ b/src/mailman/rest/tests/test_header_matches.py
@@ -27,8 +27,8 @@ import unittest
from mailman.app.lifecycle import create_list
from mailman.database.transaction import transaction
from mailman.interfaces.mailinglist import IHeaderMatchList
-from mailman.testing.layers import RESTLayer
from mailman.testing.helpers import call_api
+from mailman.testing.layers import RESTLayer
from urllib.error import HTTPError
@@ -39,7 +39,7 @@ class TestHeaderMatches(unittest.TestCase):
with transaction():
self._mlist = create_list('ant@example.com')
- def test_get_missing_hm(self):
+ def test_get_missing_header_match(self):
with self.assertRaises(HTTPError) as cm:
call_api('http://localhost:9001/3.0/lists/ant.example.com'
'/header-matches/0')
@@ -47,7 +47,7 @@ class TestHeaderMatches(unittest.TestCase):
self.assertEqual(cm.exception.reason,
b'No header match at this position: 0')
- def test_delete_missing_hm(self):
+ def test_delete_missing_header_match(self):
with self.assertRaises(HTTPError) as cm:
call_api('http://localhost:9001/3.0/lists/ant.example.com'
'/header-matches/0',
@@ -69,3 +69,9 @@ class TestHeaderMatches(unittest.TestCase):
self.assertEqual(cm.exception.code, 400)
self.assertEqual(cm.exception.reason,
b'This header match already exists')
+
+ def test_header_match_on_missing_list(self):
+ with self.assertRaises(HTTPError) as cm:
+ call_api('http://localhost:9001/3.0/lists/bee.example.com'
+ '/header-matches/')
+ self.assertEqual(cm.exception.code, 404)
diff --git a/src/mailman/rest/tests/test_lists.py b/src/mailman/rest/tests/test_lists.py
index f10767173..202725a99 100644
--- a/src/mailman/rest/tests/test_lists.py
+++ b/src/mailman/rest/tests/test_lists.py
@@ -48,7 +48,6 @@ from urllib.error import HTTPError
from zope.component import getUtility
-
class TestListsMissing(unittest.TestCase):
"""Test expected failures."""
@@ -83,7 +82,6 @@ class TestListsMissing(unittest.TestCase):
self.assertEqual(cm.exception.code, 404)
-
class TestLists(unittest.TestCase):
"""Test various aspects of mailing list resources."""
@@ -225,7 +223,6 @@ class TestLists(unittest.TestCase):
self.assertEqual(cm.exception.code, 404)
-
class TestListArchivers(unittest.TestCase):
"""Test corner cases for list archivers."""
@@ -305,7 +302,6 @@ class TestListArchivers(unittest.TestCase):
self.assertEqual(cm.exception.reason, b'Invalid boolean value: sure')
-
class TestListPagination(unittest.TestCase):
"""Test mailing list pagination functionality.
@@ -386,7 +382,6 @@ class TestListPagination(unittest.TestCase):
self.assertNotIn('entries', resource)
-
class TestListDigests(unittest.TestCase):
"""Test /lists/<list-id>/digest"""