diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2017-07-24 16:35:11 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2017-07-24 16:36:12 -0700 |
commit | 141b0f8ac30df980b27f441a7f923fb7e6d13efe (patch) | |
tree | f91e0a8cc4a8a715d8ac6ca61533e2572f8b5f31 /tests/db | |
parent | 7ea80606bb792ecd5b92826afc20621d1166781b (diff) |
tests/db/utils: share some mock biolerplate
Diffstat (limited to 'tests/db')
-rw-r--r-- | tests/db/utils_test.py | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/tests/db/utils_test.py b/tests/db/utils_test.py index 91b2cf88..59fd361f 100644 --- a/tests/db/utils_test.py +++ b/tests/db/utils_test.py @@ -14,7 +14,7 @@ import unittest import mock from alot.db import utils -from ..utilities import make_key +from ..utilities import make_key, make_uid class TestGetParams(unittest.TestCase): @@ -335,6 +335,17 @@ class TestAddSignatureHeaders(unittest.TestCase): def add_header(self, header, value): self.headers.append((header, value)) + def check(self, key, valid): + mail = self.FakeMail() + + with mock.patch('alot.db.utils.crypto.get_key', + mock.Mock(return_value=key)), \ + mock.patch('alot.db.utils.crypto.check_uid_validity', + mock.Mock(return_value=valid)): + utils.add_signature_headers(mail, [mock.Mock(fpr=None)], u'') + + return mail + def test_length_0(self): mail = self.FakeMail() utils.add_signature_headers(mail, [], u'') @@ -344,28 +355,16 @@ class TestAddSignatureHeaders(unittest.TestCase): mail.headers) def test_valid(self): - mail = self.FakeMail() key = make_key() - - with mock.patch('alot.db.utils.crypto.get_key', - mock.Mock(return_value=key)), \ - mock.patch('alot.db.utils.crypto.check_uid_validity', - mock.Mock(return_value=True)): - utils.add_signature_headers(mail, [mock.Mock(fpr=None)], u'') + mail = self.check(key, True) self.assertIn((utils.X_SIGNATURE_VALID_HEADER, u'True'), mail.headers) self.assertIn( (utils.X_SIGNATURE_MESSAGE_HEADER, u'Valid: mocked'), mail.headers) def test_untrusted(self): - mail = self.FakeMail() key = make_key() - - with mock.patch('alot.db.utils.crypto.get_key', - mock.Mock(return_value=key)), \ - mock.patch('alot.db.utils.crypto.check_uid_validity', - mock.Mock(return_value=False)): - utils.add_signature_headers(mail, [mock.Mock(fpr=None)], u'') + mail = self.check(key, False) self.assertIn((utils.X_SIGNATURE_VALID_HEADER, u'True'), mail.headers) self.assertIn( |