diff options
| -rw-r--r-- | src/mailman/rest/tests/test_helpers.py | 15 | ||||
| -rw-r--r-- | src/mailman/rules/tests/test_no_subject.py | 8 | ||||
| -rw-r--r-- | src/mailman/rules/tests/test_suspicious.py | 9 |
3 files changed, 9 insertions, 23 deletions
diff --git a/src/mailman/rest/tests/test_helpers.py b/src/mailman/rest/tests/test_helpers.py index 31ed8c88b..3f19a9e5e 100644 --- a/src/mailman/rest/tests/test_helpers.py +++ b/src/mailman/rest/tests/test_helpers.py @@ -20,9 +20,9 @@ import json import unittest -from email.message import Message -from email.header import Header from datetime import timedelta +from email.header import Header +from email.message import Message from mailman.rest import helpers from mailman.testing.layers import ConfigLayer, RESTLayer @@ -79,7 +79,6 @@ class TestHelpers(unittest.TestCase): self.assertRaises(TypeError, helpers.etag, resource) - class TestJSONEncoder(unittest.TestCase): """Test the JSON ExtendedEncoder.""" @@ -93,15 +92,15 @@ class TestJSONEncoder(unittest.TestCase): result = json.dumps(msg, cls=helpers.ExtendedEncoder) except TypeError as e: self.fail(e) - self.assertEqual(result, - json.dumps('From: test@example.com\n\nTest content.')) + self.assertEqual( + result, json.dumps('From: test@example.com\n\nTest content.')) def test_encode_header(self): value = 'Contains non-ascii \u00e9 \u00e7 \u00e0' - header = Header(value, charset='utf-8') try: - result = json.dumps(Header(value, charset='utf-8'), - cls=helpers.ExtendedEncoder) + result = json.dumps( + Header(value, charset='utf-8'), + cls=helpers.ExtendedEncoder) except TypeError as e: self.fail(e) self.assertEqual(result, json.dumps(value)) diff --git a/src/mailman/rules/tests/test_no_subject.py b/src/mailman/rules/tests/test_no_subject.py index 1647f96d5..efe942af6 100644 --- a/src/mailman/rules/tests/test_no_subject.py +++ b/src/mailman/rules/tests/test_no_subject.py @@ -17,22 +17,16 @@ """Test the `no_subject` header rule.""" -__all__ = [ - 'TestNoSubject', - ] - -import os import unittest -from email.header import Header +from email.header import Header from mailman.app.lifecycle import create_list from mailman.email.message import Message from mailman.rules import no_subject from mailman.testing.layers import ConfigLayer - class TestNoSubject(unittest.TestCase): """Test the no_subject rule.""" diff --git a/src/mailman/rules/tests/test_suspicious.py b/src/mailman/rules/tests/test_suspicious.py index 1be0eb8e7..e1649928c 100644 --- a/src/mailman/rules/tests/test_suspicious.py +++ b/src/mailman/rules/tests/test_suspicious.py @@ -17,22 +17,16 @@ """Test the `suspicious` rule.""" -__all__ = [ - 'TestSuspicious', - ] - -import os import unittest -from email.header import Header +from email.header import Header from mailman.app.lifecycle import create_list from mailman.email.message import Message from mailman.rules import suspicious from mailman.testing.layers import ConfigLayer - class TestSuspicious(unittest.TestCase): """Test the suspicous rule.""" @@ -49,4 +43,3 @@ class TestSuspicious(unittest.TestCase): self._mlist.bounce_matching_headers = 'from: spam@example.com' result = self._rule.check(self._mlist, msg, {}) self.assertFalse(result) - |