diff options
Diffstat (limited to 'service/test/unit')
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_keymanager.py | 20 | ||||
| -rw-r--r-- | service/test/unit/config/test_site.py | 5 |
2 files changed, 13 insertions, 12 deletions
diff --git a/service/test/unit/bitmask_libraries/test_keymanager.py b/service/test/unit/bitmask_libraries/test_keymanager.py index eb6ba79b..81ba7b65 100644 --- a/service/test/unit/bitmask_libraries/test_keymanager.py +++ b/service/test/unit/bitmask_libraries/test_keymanager.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -import datetime + from mock import patch, MagicMock from mockito import when from unittest import TestCase @@ -70,42 +70,42 @@ class KeymanagerTest(TestCase): def test_keymanager_generate_openpgp_key_generates_key_correctly(self): when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(None) - self.keymanager._gen_key = MagicMock() - self.keymanager._send_key_to_leap = MagicMock() + self.leap_keymanager.gen_key = MagicMock() + self.leap_keymanager.send_key = MagicMock() self.keymanager.generate_openpgp_key() - self.keymanager._gen_key.assert_called_once() - self.keymanager._send_key_to_leap.assert_called_once() + self.leap_keymanager.gen_key.assert_called_once() + self.leap_keymanager.send_key.assert_called_once() def test_keymanager_generate_openpgp_key_doesnt_regenerate_preexisting_key(self): mock_open_pgp_key = MagicMock() mock_open_pgp_key.needs_renewal = MagicMock(return_value=False) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) - self.keymanager._gen_key = MagicMock() + self.leap_keymanager.gen_key = MagicMock() self.keymanager.generate_openpgp_key() - self.keymanager._gen_key.assert_not_called() + self.leap_keymanager.gen_key.assert_not_called() def test_keymanager_generate_openpgp_key_doesnt_upload_preexisting_key(self): mock_open_pgp_key = MagicMock() mock_open_pgp_key.needs_renewal = MagicMock(return_value=False) when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(mock_open_pgp_key) - self.keymanager._send_key_to_leap = MagicMock() + self.leap_keymanager.send_key = MagicMock() self.keymanager.generate_openpgp_key() - self.keymanager._send_key_to_leap.assert_not_called() + self.leap_keymanager.send_key.assert_not_called() @defer.inlineCallbacks def test_keymanager_generate_openpgp_key_deletes_key_when_upload_fails(self): when(self.keymanager)._key_exists('test_user@some-server.test').thenReturn(None) self.keymanager.delete_key_pair = MagicMock() - when(self.keymanager)._send_key_to_leap().thenRaise(Exception('Could not upload key')) + when(self.leap_keymanager).send_key().thenRaise(Exception('Could not upload key')) with self.assertRaises(UploadKeyError): yield self.keymanager.generate_openpgp_key() diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py index 6911b4a5..63ac9f1a 100644 --- a/service/test/unit/config/test_site.py +++ b/service/test/unit/config/test_site.py @@ -1,10 +1,11 @@ from twisted.trial import unittest -from mockito import mock +from mock import MagicMock from pixelated.config.site import PixelatedSite from twisted.protocols.basic import LineReceiver class TestPixelatedSite(unittest.TestCase): + def test_add_security_headers(self): request = self.create_request() request.process() @@ -36,7 +37,7 @@ class TestPixelatedSite(unittest.TestCase): def create_request(self): channel = LineReceiver() - channel.site = PixelatedSite(mock()) + channel.site = PixelatedSite(MagicMock()) request = PixelatedSite.requestFactory(channel=channel, queued=True) request.method = "GET" request.uri = "localhost" |