summaryrefslogtreecommitdiff
path: root/service/test
diff options
context:
space:
mode:
Diffstat (limited to 'service/test')
-rw-r--r--service/test/support/integration/app_test_client.py4
-rw-r--r--service/test/unit/config/test_site.py5
2 files changed, 4 insertions, 5 deletions
diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py
index d52c85c0..0ff1df31 100644
--- a/service/test/support/integration/app_test_client.py
+++ b/service/test/support/integration/app_test_client.py
@@ -437,9 +437,7 @@ def initialize_soledad(tempdir, uuid):
secret_path,
local_db_path,
server_url,
- cert_file,
- defer_encryption=False,
- syncable=False)
+ cert_file)
yield SoledadMailAdaptor().initialize_store(_soledad)
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"