summaryrefslogtreecommitdiff
path: root/tests/db
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-07-14 14:27:04 -0700
committerDylan Baker <dylan@pnwbakers.com>2017-08-17 10:59:49 -0700
commitc64d4507d858f1d443eee0926000e14fe9755adc (patch)
tree6273853837ddf0fbf94d12b57ccd0d17a1234cf4 /tests/db
parente024d670a3ba363df3b15b8d45fc87ac80c3de6b (diff)
db/utils: Allow encrypted messages to be put in mixed payloads as well
Since a multipart/mixed can contain anything that a normal message could, this should be allowed. The only case that I can think of this actually happening is if an email server takes the original message, puts it in a multipart/mixed, and then attaches it's own message, like on of the annoying "this mail scanned for viruses by <product>".
Diffstat (limited to 'tests/db')
-rw-r--r--tests/db/utils_test.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/db/utils_test.py b/tests/db/utils_test.py
index d2c92577..26768597 100644
--- a/tests/db/utils_test.py
+++ b/tests/db/utils_test.py
@@ -603,7 +603,6 @@ class TestMessageFromFile(TestCaseClassCleanup):
self.assertIn(utils.X_SIGNATURE_VALID_HEADER, m)
self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
- @unittest.expectedFailure
def test_encrypted_unsigned_in_multipart_mixed(self):
"""It is valid to encapsulate a multipart/encrypted payload inside a
multipart/mixed payload, verify that works.
@@ -615,7 +614,6 @@ class TestMessageFromFile(TestCaseClassCleanup):
self.assertNotIn(utils.X_SIGNATURE_VALID_HEADER, m)
self.assertNotIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
- @unittest.expectedFailure
def test_encrypted_signed_in_multipart_mixed(self):
"""It is valid to encapsulate a multipart/encrypted payload inside a
multipart/mixed payload, verify that works when the multipart/encrypted