diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 73dd289276..f6b41e2c4c 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -25,6 +25,7 @@ from synapse.server import HomeServer
from synapse.federation import initialize_http_replication
from synapse.api.events import SynapseEvent
+from synapse.storage.transactions import DestinationsTable
def make_pdu(prev_pdus=[], **kwargs):
"""Provide some default fields for making a PduTuple."""
@@ -55,10 +56,14 @@ class FederationTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
])
self.mock_persistence.get_received_txn_response.return_value = (
defer.succeed(None)
)
+ self.mock_persistence.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
self.mock_config = Mock()
self.mock_config.signing_key = [MockKey()]
self.clock = MockClock()
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 33016c16ef..fae33716a3 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -53,6 +53,8 @@ class FederationTestCase(unittest.TestCase):
"persist_event",
"store_room",
"get_room",
+ "get_destination_retry_timings",
+ "set_destination_retry_timings",
]),
resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]),
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index fe69ce47eb..b85a89052a 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -30,7 +30,7 @@ from synapse.api.constants import PresenceState
from synapse.api.errors import SynapseError
from synapse.handlers.presence import PresenceHandler, UserPresenceCache
from synapse.streams.config import SourcePaginationConfig
-
+from synapse.storage.transactions import DestinationsTable
OFFLINE = PresenceState.OFFLINE
UNAVAILABLE = PresenceState.UNAVAILABLE
@@ -528,6 +528,7 @@ class PresencePushTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
resource_for_client=Mock(),
@@ -539,6 +540,9 @@ class PresencePushTestCase(unittest.TestCase):
hs.handlers = JustPresenceHandlers(hs)
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
@@ -1037,6 +1041,7 @@ class PresencePollingTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
resource_for_client=Mock(),
@@ -1048,6 +1053,9 @@ class PresencePollingTestCase(unittest.TestCase):
hs.handlers = JustPresenceHandlers(hs)
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index adb5148351..7e6ed9a42f 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -25,6 +25,8 @@ from ..utils import MockHttpResource, MockClock, DeferredMockCallable, MockKey
from synapse.server import HomeServer
from synapse.handlers.typing import TypingNotificationHandler
+from synapse.storage.transactions import DestinationsTable
+
def _expect_edu(destination, edu_type, content, origin="test"):
return {
@@ -72,6 +74,7 @@ class TypingNotificationsTestCase(unittest.TestCase):
"delivered_txn",
"get_received_txn_response",
"set_received_txn_response",
+ "get_destination_retry_timings",
]),
handlers=None,
resource_for_client=Mock(),
@@ -89,6 +92,9 @@ class TypingNotificationsTestCase(unittest.TestCase):
self.handler.push_update_to_clients = self.mock_update_client
self.datastore = hs.get_datastore()
+ self.datastore.get_destination_retry_timings.return_value = (
+ defer.succeed(DestinationsTable.EntryType("", 0, 0))
+ )
def get_received_txn_response(*args):
return defer.succeed(None)
diff --git a/tests/test_test_utils.py b/tests/test_test_utils.py
new file mode 100644
index 0000000000..b42787dd25
--- /dev/null
+++ b/tests/test_test_utils.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from tests import unittest
+
+from tests.utils import MockClock
+
+class MockClockTestCase(unittest.TestCase):
+
+ def setUp(self):
+ self.clock = MockClock()
+
+ def test_advance_time(self):
+ start_time = self.clock.time()
+
+ self.clock.advance_time(20)
+
+ self.assertEquals(20, self.clock.time() - start_time)
+
+ def test_later(self):
+ invoked = [0, 0]
+
+ def _cb0():
+ invoked[0] = 1
+ self.clock.call_later(10, _cb0)
+
+ def _cb1():
+ invoked[1] = 1
+ self.clock.call_later(20, _cb1)
+
+ self.assertFalse(invoked[0])
+
+ self.clock.advance_time(15)
+
+ self.assertTrue(invoked[0])
+ self.assertFalse(invoked[1])
+
+ self.clock.advance_time(5)
+
+ self.assertTrue(invoked[1])
+
+ def test_cancel_later(self):
+ invoked = [0, 0]
+
+ def _cb0():
+ invoked[0] = 1
+ t0 = self.clock.call_later(10, _cb0)
+
+ def _cb1():
+ invoked[1] = 1
+ t1 = self.clock.call_later(20, _cb1)
+
+ self.clock.cancel_call_later(t0)
+
+ self.clock.advance_time(30)
+
+ self.assertFalse(invoked[0])
+ self.assertTrue(invoked[1])
diff --git a/tests/utils.py b/tests/utils.py
index d8be73dba8..f9a34748cd 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -18,6 +18,8 @@ from synapse.api.errors import cs_error, CodeMessageException, StoreError
from synapse.api.constants import Membership
from synapse.storage import prepare_database
+from synapse.util.logcontext import LoggingContext
+
from synapse.api.events.room import (
RoomMemberEvent, MessageEvent
)
@@ -134,16 +136,43 @@ class MockKey(object):
class MockClock(object):
now = 1000
+ def __init__(self):
+ # list of tuples of (absolute_time, callback) in no particular order
+ self.timers = []
+
def time(self):
return self.now
def time_msec(self):
return self.time() * 1000
+ def call_later(self, delay, callback):
+ current_context = LoggingContext.current_context()
+
+ def wrapped_callback():
+ LoggingContext.thread_local.current_context = current_context
+ callback()
+
+ t = (self.now + delay, wrapped_callback)
+ self.timers.append(t)
+ return t
+
+ def cancel_call_later(self, timer):
+ self.timers = [t for t in self.timers if t != timer]
+
# For unit testing
def advance_time(self, secs):
self.now += secs
+ timers = self.timers
+ self.timers = []
+
+ for time, callback in timers:
+ if self.now >= time:
+ callback()
+ else:
+ self.timers.append((time, callback))
+
class SQLiteMemoryDbPool(ConnectionPool, object):
def __init__(self):
|
