Merge pull request #1683 from matrix-org/erikj/notifier_sadness

Fix rare notifier bug where listeners dont timeout

1 files changed, 4 insertions, 0 deletions

diff --git a/tests/utils.py b/tests/utils.py

index 2d0bd205fd..d3d6c8021d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -294,6 +294,10 @@ class MockClock(object):
     def advance_time_msec(self, ms):
         self.advance_time(ms / 1000.)
 
+    def time_bound_deferred(self, d, *args, **kwargs):
+        # We don't bother timing things out for now.
+        return d
+
 
 class SQLiteMemoryDbPool(ConnectionPool, object):
     def __init__(self):