diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index d95b9013a3..8d277d6612 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -19,7 +19,7 @@ from tests import unittest
# python imports
from mock import Mock, ANY
-from ..utils import MockHttpResource, MockClock
+from ..utils import MockHttpResource, MockClock, MockKey
from synapse.server import HomeServer
from synapse.federation import initialize_http_replication
@@ -64,6 +64,8 @@ class FederationTestCase(unittest.TestCase):
self.mock_persistence.get_received_txn_response.return_value = (
defer.succeed(None)
)
+ self.mock_config = Mock()
+ self.mock_config.signing_key = [MockKey()]
self.clock = MockClock()
hs = HomeServer("test",
resource_for_federation=self.mock_resource,
@@ -71,6 +73,8 @@ class FederationTestCase(unittest.TestCase):
db_pool=None,
datastore=self.mock_persistence,
clock=self.clock,
+ config=self.mock_config,
+ keyring=Mock(),
)
self.federation = initialize_http_replication(hs)
self.distributor = hs.get_distributor()
@@ -182,7 +186,7 @@ class FederationTestCase(unittest.TestCase):
},
]
},
- on_send_callback=ANY,
+ json_data_callback=ANY,
)
@defer.inlineCallbacks
@@ -214,9 +218,10 @@ class FederationTestCase(unittest.TestCase):
}
],
},
- on_send_callback=ANY,
+ json_data_callback=ANY,
)
+
@defer.inlineCallbacks
def test_recv_edu(self):
recv_observer = Mock()
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 7208afdb3b..35c3a4df7b 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -26,12 +26,16 @@ from synapse.federation.units import Pdu
from mock import NonCallableMock, ANY
-from ..utils import get_mock_call_args
+from ..utils import get_mock_call_args, MockKey
class FederationTestCase(unittest.TestCase):
def setUp(self):
+
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
+
self.hostname = "test"
hs = HomeServer(
self.hostname,
@@ -48,6 +52,7 @@ class FederationTestCase(unittest.TestCase):
"room_member_handler",
"federation_handler",
]),
+ config=self.mock_config,
)
self.datastore = hs.get_datastore()
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 765929d204..15022b8d05 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -17,11 +17,12 @@
from tests import unittest
from twisted.internet import defer, reactor
-from mock import Mock, call, ANY
+from mock import Mock, call, ANY, NonCallableMock, patch
import json
from tests.utils import (
- MockHttpResource, MockClock, DeferredMockCallable, SQLiteMemoryDbPool
+ MockHttpResource, MockClock, DeferredMockCallable, SQLiteMemoryDbPool,
+ MockKey
)
from synapse.server import HomeServer
@@ -58,7 +59,6 @@ class JustPresenceHandlers(object):
def __init__(self, hs):
self.presence_handler = PresenceHandler(hs)
-
class PresenceStateTestCase(unittest.TestCase):
""" Tests presence management. """
@@ -67,12 +67,17 @@ class PresenceStateTestCase(unittest.TestCase):
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
+
hs = HomeServer("test",
clock=MockClock(),
db_pool=db_pool,
handlers=None,
resource_for_federation=Mock(),
http_client=None,
+ config=self.mock_config,
+ keyring=Mock(),
)
hs.handlers = JustPresenceHandlers(hs)
@@ -214,6 +219,9 @@ class PresenceInvitesTestCase(unittest.TestCase):
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
+
hs = HomeServer("test",
clock=MockClock(),
db_pool=db_pool,
@@ -221,6 +229,8 @@ class PresenceInvitesTestCase(unittest.TestCase):
resource_for_client=Mock(),
resource_for_federation=self.mock_federation_resource,
http_client=self.mock_http_client,
+ config=self.mock_config,
+ keyring=Mock(),
)
hs.handlers = JustPresenceHandlers(hs)
@@ -290,7 +300,7 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observed_user": "@cabbage:elsewhere",
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -319,7 +329,7 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observed_user": "@apple:test",
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -355,7 +365,7 @@ class PresenceInvitesTestCase(unittest.TestCase):
"observed_user": "@durian:test",
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -503,6 +513,9 @@ class PresencePushTestCase(unittest.TestCase):
self.mock_federation_resource = MockHttpResource()
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
+
hs = HomeServer("test",
clock=self.clock,
db_pool=None,
@@ -520,6 +533,8 @@ class PresencePushTestCase(unittest.TestCase):
resource_for_client=Mock(),
resource_for_federation=self.mock_federation_resource,
http_client=self.mock_http_client,
+ config=self.mock_config,
+ keyring=Mock(),
)
hs.handlers = JustPresenceHandlers(hs)
@@ -771,7 +786,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -787,7 +802,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -913,7 +928,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -928,7 +943,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -958,7 +973,7 @@ class PresencePushTestCase(unittest.TestCase):
],
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -995,6 +1010,9 @@ class PresencePollingTestCase(unittest.TestCase):
self.mock_federation_resource = MockHttpResource()
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
+
hs = HomeServer("test",
clock=MockClock(),
db_pool=None,
@@ -1009,6 +1027,8 @@ class PresencePollingTestCase(unittest.TestCase):
resource_for_client=Mock(),
resource_for_federation=self.mock_federation_resource,
http_client=self.mock_http_client,
+ config=self.mock_config,
+ keyring=Mock(),
)
hs.handlers = JustPresenceHandlers(hs)
@@ -1155,7 +1175,7 @@ class PresencePollingTestCase(unittest.TestCase):
"poll": [ "@potato:remote" ],
},
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1168,7 +1188,7 @@ class PresencePollingTestCase(unittest.TestCase):
"push": [ {"user_id": "@clementine:test" }],
},
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1197,7 +1217,7 @@ class PresencePollingTestCase(unittest.TestCase):
"push": [ {"user_id": "@fig:test" }],
},
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1230,7 +1250,7 @@ class PresencePollingTestCase(unittest.TestCase):
"unpoll": [ "@potato:remote" ],
},
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -1262,7 +1282,7 @@ class PresencePollingTestCase(unittest.TestCase):
],
},
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index a1a2e80492..c88d1c8840 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -24,6 +24,7 @@ from synapse.api.constants import Membership
from synapse.handlers.room import RoomMemberHandler, RoomCreationHandler
from synapse.handlers.profile import ProfileHandler
from synapse.server import HomeServer
+from ..utils import MockKey
from mock import Mock, NonCallableMock
@@ -31,6 +32,8 @@ from mock import Mock, NonCallableMock
class RoomMemberHandlerTestCase(unittest.TestCase):
def setUp(self):
+ self.mock_config = NonCallableMock()
+ self.mock_config.signing_key = [MockKey()]
self.hostname = "red"
hs = HomeServer(
self.hostname,
@@ -38,7 +41,6 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
ratelimiter=NonCallableMock(spec_set=[
"send_message",
]),
- config=NonCallableMock(),
datastore=NonCallableMock(spec_set=[
"persist_event",
"get_joined_hosts_for_room",
@@ -57,6 +59,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
]),
auth=NonCallableMock(spec_set=["check"]),
state_handler=NonCallableMock(spec_set=["handle_new_event"]),
+ config=self.mock_config,
)
self.federation = NonCallableMock(spec_set=[
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index a66f208abf..064b04c217 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -20,7 +20,7 @@ from twisted.internet import defer
from mock import Mock, call, ANY
import json
-from ..utils import MockHttpResource, MockClock, DeferredMockCallable
+from ..utils import MockHttpResource, MockClock, DeferredMockCallable, MockKey
from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
@@ -61,6 +61,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.mock_federation_resource = MockHttpResource()
+ self.mock_config = Mock()
+ self.mock_config.signing_key = [MockKey()]
+
hs = HomeServer("test",
clock=self.clock,
db_pool=None,
@@ -75,6 +78,8 @@ class TypingNotificationsTestCase(unittest.TestCase):
resource_for_client=Mock(),
resource_for_federation=self.mock_federation_resource,
http_client=self.mock_http_client,
+ config=self.mock_config,
+ keyring=Mock(),
)
hs.handlers = JustTypingNotificationHandlers(hs)
@@ -170,7 +175,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
"typing": True,
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
@@ -221,7 +226,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
"typing": False,
}
),
- on_send_callback=ANY,
+ json_data_callback=ANY,
),
defer.succeed((200, "OK"))
)
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index e2dc3dec81..769c7824bc 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -20,7 +20,7 @@ from twisted.internet import defer
from mock import Mock
-from ..utils import MockHttpResource
+from ..utils import MockHttpResource, MockKey
from synapse.api.constants import PresenceState
from synapse.handlers.presence import PresenceHandler
@@ -45,7 +45,8 @@ class PresenceStateTestCase(unittest.TestCase):
def setUp(self):
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
-
+ self.mock_config = Mock()
+ self.mock_config.signing_key = [MockKey()]
hs = HomeServer("test",
db_pool=None,
datastore=Mock(spec=[
@@ -56,7 +57,7 @@ class PresenceStateTestCase(unittest.TestCase):
http_client=None,
resource_for_client=self.mock_resource,
resource_for_federation=self.mock_resource,
- config=Mock(),
+ config=self.mock_config,
)
hs.handlers = JustPresenceHandlers(hs)
@@ -125,6 +126,8 @@ class PresenceListTestCase(unittest.TestCase):
def setUp(self):
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
+ self.mock_config = Mock()
+ self.mock_config.signing_key = [MockKey()]
hs = HomeServer("test",
db_pool=None,
@@ -142,7 +145,7 @@ class PresenceListTestCase(unittest.TestCase):
http_client=None,
resource_for_client=self.mock_resource,
resource_for_federation=self.mock_resource,
- config=Mock(),
+ config=self.mock_config,
)
hs.handlers = JustPresenceHandlers(hs)
@@ -237,6 +240,9 @@ class PresenceEventStreamTestCase(unittest.TestCase):
def setUp(self):
self.mock_resource = MockHttpResource(prefix=PATH_PREFIX)
+ self.mock_config = Mock()
+ self.mock_config.signing_key = [MockKey()]
+
# HIDEOUS HACKERY
# TODO(paul): This should be injected in via the HomeServer DI system
from synapse.streams.events import (
@@ -267,6 +273,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
"cancel_call_later",
"time_msec",
]),
+ config=self.mock_config,
)
hs.get_clock().time_msec.return_value = 1000000
diff --git a/tests/utils.py b/tests/utils.py
index e7c4bc4cad..60fd6085ac 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -76,6 +76,13 @@ class MockHttpResource(HttpServer):
mock_content.configure_mock(**config)
mock_request.content = mock_content
+ mock_request.method = http_method
+ mock_request.uri = path
+
+ mock_request.requestHeaders.getRawHeaders.return_value=[
+ "X-Matrix origin=test,key=,sig="
+ ]
+
# return the right path if the event requires it
mock_request.path = path
@@ -108,6 +115,21 @@ class MockHttpResource(HttpServer):
self.callbacks.append((method, path_pattern, callback))
+class MockKey(object):
+ alg = "mock_alg"
+ version = "mock_version"
+
+ @property
+ def verify_key(self):
+ return self
+
+ def sign(self, message):
+ return b"\x9a\x87$"
+
+ def verify(self, message, sig):
+ assert sig == b"\x9a\x87$"
+
+
class MockClock(object):
now = 1000
|
