diff options
| -rw-r--r-- | tests/federation/test_federation.py | 12 | ||||
| -rw-r--r-- | tests/utils.py | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index a3bcb5ede8..ec39c7ee33 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -20,7 +20,7 @@ from twisted.trial import unittest from mock import Mock import logging -from ..utils import MockHttpServer +from ..utils import MockHttpServer, MockClock from synapse.server import HomeServer from synapse.federation import initialize_http_replication @@ -48,16 +48,6 @@ def make_pdu(prev_pdus=[], **kwargs): return PduTuple(PduEntry(**pdu_fields), prev_pdus) -class MockClock(object): - now = 1000 - - def time(self): - return self.now - - def time_msec(self): - return self.time() * 1000 - - class FederationTestCase(unittest.TestCase): def setUp(self): self.mock_http_server = MockHttpServer() diff --git a/tests/utils.py b/tests/utils.py index 578866b4f4..e397712d82 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -95,6 +95,16 @@ 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 + + class MemoryDataStore(object): class RoomMember(namedtuple( |