summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-01-22 20:06:08 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-01-22 20:06:28 +0000
commit3a243c53f41a719c4de62630db6018f97d5b94ae (patch)
treeb9953031a1556f12fc57eac5143694cac0795844 /tests
parentMuch merging of test case setUp() methods to make them much more (diff)
downloadsynapse-3a243c53f41a719c4de62630db6018f97d5b94ae.tar.xz
Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific
Diffstat (limited to 'tests')
-rw-r--r--tests/handlers/test_presence.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 805f3868bb..56e90177f1 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -188,7 +188,7 @@ class PresenceTestCase(unittest.TestCase):
         self.u_cabbage = hs.parse_userid("@cabbage:elsewhere")
 
 
-class MockedDatastoreTestCase(PresenceTestCase):
+class MockedDatastorePresenceTestCase(PresenceTestCase):
     def make_datastore_mock(self):
         datastore = Mock(spec=[
             # Bits that Federation needs
@@ -605,7 +605,7 @@ class PresenceInvitesTestCase(PresenceTestCase):
         ], presence)
 
 
-class PresencePushTestCase(MockedDatastoreTestCase):
+class PresencePushTestCase(MockedDatastorePresenceTestCase):
     """ Tests steady-state presence status updates.
 
     They assert that presence state update messages are pushed around the place
@@ -990,7 +990,7 @@ class PresencePushTestCase(MockedDatastoreTestCase):
         put_json.await_calls()
 
 
-class PresencePollingTestCase(MockedDatastoreTestCase):
+class PresencePollingTestCase(MockedDatastorePresenceTestCase):
     """ Tests presence status polling. """
 
     # For this test, we have three local users; apple is watching and is