summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-12-09 16:48:48 +0000
committerErik Johnston <erik@matrix.org>2016-12-09 16:48:48 +0000
commit8b34f71bea05f7190767ec9aebf85528e409c09d (patch)
tree2cbc928c604fb96cf8a37c6d89050e2424bf0f10
parentCorrectly handle timeout errors (diff)
downloadsynapse-8b34f71bea05f7190767ec9aebf85528e409c09d.tar.xz
Fix unit tests
Diffstat (limited to '')
-rw-r--r--tests/utils.py4
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):