Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0

1 files changed, 3 insertions, 0 deletions

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

index ca2c33cf8e..91040c2efd 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -243,6 +243,9 @@ class MockClock(object):
             else:
                 self.timers.append(t)
 
+    def advance_time_msec(self, ms):
+        self.advance_time(ms / 1000.)
+
 
 class SQLiteMemoryDbPool(ConnectionPool, object):
     def __init__(self):