Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-04 15:28:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix up the various presence-related tests so that if they're not skipped, they still PASS

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-27 18:29:45 +01:00
parent 407c86c013
commit d027e859cd
3 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/rest/test_presence.py
View file

@ -229,11 +229,19 @@ class PresenceEventStreamTestCase(unittest.TestCase):
# HIDEOUS HACKERY
# TODO(paul): This should be injected in via the HomeServer DI system
from synapse.handlers.events import EventStreamHandler
from synapse.handlers.presence import PresenceStreamData
EventStreamHandler.stream_data_classes = [
PresenceStreamData
]
from synapse.streams.events import (
PresenceSource, NullSource, EventSources
)
old_SOURCE_TYPES = EventSources.SOURCE_TYPES
def tearDown():
EventSources.SOURCE_TYPES = old_SOURCE_TYPES
self.tearDown = tearDown
EventSources.SOURCE_TYPES = {
k: NullSource for k in old_SOURCE_TYPES.keys()
}
EventSources.SOURCE_TYPES["presence"] = PresenceSource
hs = HomeServer("test",
db_pool=None,
@ -288,7 +296,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
# all be ours
# I'll already get my own presence state change
self.assertEquals({"start": "1", "end": "1", "chunk": []}, response)
self.assertEquals({"start": "0_1", "end": "0_1", "chunk": []}, response)
self.mock_datastore.set_presence_state.return_value = defer.succeed(
{"state": ONLINE})
@ -299,10 +307,10 @@ class PresenceEventStreamTestCase(unittest.TestCase):
state={"state": ONLINE})
(code, response) = yield self.mock_resource.trigger("GET",
"/events?from=1&timeout=0", None)
"/events?from=0_1&timeout=0", None)
self.assertEquals(200, code)
self.assertEquals({"start": "1", "end": "2", "chunk": [
self.assertEquals({"start": "0_1", "end": "0_2", "chunk": [
{"type": "m.presence",
"content": {
"user_id": "@banana:test",