Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Conflicts:
	synapse/storage/_base.py

1 files changed, 14 insertions, 0 deletions

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

index 578866b4f4..20a63316fd 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -95,6 +95,20 @@ class MockHttpServer(HttpServer):
         self.callbacks.append((method, path_pattern, callback))
 
 
+class MockClock(object):
+    now = 1000
+
+    def time(self):
+        return self.now
+
+    def time_msec(self):
+        return self.time() * 1000
+
+    # For unit testing
+    def advance_time(self, secs):
+        self.now += secs
+
+
 class MemoryDataStore(object):
 
     class RoomMember(namedtuple(