Merge pull request #1266 from mjg/message-from-bytes

Message from bytes

1 files changed, 23 insertions, 23 deletions

diff --git a/tests/db/utils_test.py b/tests/db/utils_test.py
index 9e411e3d..23885067 100644
--- a/tests/db/utils_test.py
+++ b/tests/db/utils_test.py
@@ -443,13 +443,13 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         m = email.message.Message()
         m.add_header(utils.X_SIGNATURE_VALID_HEADER, 'Bad')
-        message = utils.message_from_file(io.StringIO(m.as_string()))
+        message = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIs(message.get(utils.X_SIGNATURE_VALID_HEADER), None)
 
     def test_erase_alot_header_message(self):
         m = email.message.Message()
         m.add_header(utils.X_SIGNATURE_MESSAGE_HEADER, 'Bad')
-        message = utils.message_from_file(io.StringIO(m.as_string()))
+        message = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIs(message.get(utils.X_SIGNATURE_MESSAGE_HEADER), None)
 
     def test_plain_mail(self):
@@ -457,7 +457,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         m['Subject'] = 'test'
         m['From'] = 'me'
         m['To'] = 'Nobody'
-        message = utils.message_from_file(io.StringIO(m.as_string()))
+        message = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertEqual(message.get_payload(), 'This is some text')
 
     def _make_signed(self):
@@ -476,20 +476,20 @@ class TestMessageFromFile(TestCaseClassCleanup):
     def test_signed_headers_included(self):
         """Headers are added to the message."""
         m = self._make_signed()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn(utils.X_SIGNATURE_VALID_HEADER, m)
         self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
 
     def test_signed_valid(self):
         """Test that the signature is valid."""
         m = self._make_signed()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertEqual(m[utils.X_SIGNATURE_VALID_HEADER], 'True')
 
     def test_signed_correct_from(self):
         """Test that the signature is valid."""
         m = self._make_signed()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         # Don't test for valid/invalid since that might change
         self.assertIn(
             'ambig <ambig@example.com>', m[utils.X_SIGNATURE_MESSAGE_HEADER])
@@ -497,14 +497,14 @@ class TestMessageFromFile(TestCaseClassCleanup):
     def test_signed_wrong_mimetype_second_payload(self):
         m = self._make_signed()
         m.get_payload(1).set_type('text/plain')
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('expected Content-Type: ',
                       m[utils.X_SIGNATURE_MESSAGE_HEADER])
 
     def test_signed_wrong_micalg(self):
         m = self._make_signed()
         m.set_param('micalg', 'foo')
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('expected micalg=pgp-...',
                       m[utils.X_SIGNATURE_MESSAGE_HEADER])
 
@@ -526,7 +526,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         m = self._make_signed()
         m.set_param('micalg', 'PGP-SHA1')
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('expected micalg=pgp-',
                       m[utils.X_SIGNATURE_MESSAGE_HEADER])
 
@@ -541,7 +541,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         m = self._make_signed()
         m.attach(email.mime.text.MIMEText('foo'))
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('expected exactly two messages, got 3',
                       m[utils.X_SIGNATURE_MESSAGE_HEADER])
 
@@ -572,12 +572,12 @@ class TestMessageFromFile(TestCaseClassCleanup):
         # of the mail, rather than replacing the whole encrypted payload with
         # it's unencrypted equivalent
         m = self._make_encrypted()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertEqual(len(m.get_payload()), 3)
 
     def test_encrypted_unsigned_is_decrypted(self):
         m = self._make_encrypted()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         # Check using m.walk, since we're not checking for ordering, just
         # existence.
         self.assertIn('This is some text', [n.get_payload() for n in m.walk()])
@@ -587,13 +587,13 @@ class TestMessageFromFile(TestCaseClassCleanup):
         that there is a signature.
         """
         m = self._make_encrypted()
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertNotIn(utils.X_SIGNATURE_VALID_HEADER, m)
         self.assertNotIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
 
     def test_encrypted_signed_is_decrypted(self):
         m = self._make_encrypted(True)
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('This is some text', [n.get_payload() for n in m.walk()])
 
     def test_encrypted_signed_headers(self):
@@ -601,7 +601,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         there is a signature.
         """
         m = self._make_encrypted(True)
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
         self.assertIn(
             'ambig <ambig@example.com>', m[utils.X_SIGNATURE_MESSAGE_HEADER])
@@ -611,14 +611,14 @@ class TestMessageFromFile(TestCaseClassCleanup):
     def test_encrypted_wrong_mimetype_first_payload(self):
         m = self._make_encrypted()
         m.get_payload(0).set_type('text/plain')
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('Malformed OpenPGP message:',
                       m.get_payload(2).get_payload())
 
     def test_encrypted_wrong_mimetype_second_payload(self):
         m = self._make_encrypted()
         m.get_payload(1).set_type('text/plain')
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('Malformed OpenPGP message:',
                       m.get_payload(2).get_payload())
 
@@ -628,7 +628,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         s = self._make_signed()
         m = email.mime.multipart.MIMEMultipart('mixed', None, [s])
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn(utils.X_SIGNATURE_VALID_HEADER, m)
         self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
 
@@ -638,7 +638,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         s = self._make_encrypted()
         m = email.mime.multipart.MIMEMultipart('mixed', None, [s])
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('This is some text', [n.get_payload() for n in m.walk()])
         self.assertNotIn(utils.X_SIGNATURE_VALID_HEADER, m)
         self.assertNotIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
@@ -650,7 +650,7 @@ class TestMessageFromFile(TestCaseClassCleanup):
         """
         s = self._make_encrypted(True)
         m = email.mime.multipart.MIMEMultipart('mixed', None, [s])
-        m = utils.message_from_file(io.StringIO(m.as_string()))
+        m = utils.decrypted_message_from_file(io.StringIO(m.as_string()))
         self.assertIn('This is some text', [n.get_payload() for n in m.walk()])
         self.assertIn(utils.X_SIGNATURE_VALID_HEADER, m)
         self.assertIn(utils.X_SIGNATURE_MESSAGE_HEADER, m)
@@ -781,10 +781,10 @@ class TestExtractBody(unittest.TestCase):
 
 class TestMessageFromString(unittest.TestCase):
 
-    """Tests for message_from_string.
+    """Tests for decrypted_message_from_string.
 
     Because the implementation is that this is a wrapper around
-    message_from_file, it's not important to have a large swath of tests, just
+    decrypted_message_from_file, it's not important to have a large swath of tests, just
     enough to show that things are being passed correctly.
     """
 
@@ -793,5 +793,5 @@ class TestMessageFromString(unittest.TestCase):
         m['Subject'] = 'test'
         m['From'] = 'me'
         m['To'] = 'Nobody'
-        message = utils.message_from_string(m.as_string())
+        message = utils.decrypted_message_from_string(m.as_string())
         self.assertEqual(message.get_payload(), 'This is some text')