diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-13 18:26:42 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-08-13 19:19:15 +0100 |
| commit | fc778e2bce34825b068e2a90eac09c05d8cce747 (patch) | |
| tree | e00146e84bc9b61cf4e152c9f7dd68eed80d4664 /tests/federation/test_federation.py | |
| parent | Set datastore's .hs field in SQLBaseStore rather than in the toplevel DataSto... (diff) | |
| download | synapse-fc778e2bce34825b068e2a90eac09c05d8cce747.tar.xz | |
Move MockClock into tests.utils so we can reüse it
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 12 |
1 files changed, 1 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() |