Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:16:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into server2server_signing

Browse source 
Conflicts:
	synapse/storage/__init__.py
	tests/rest/test_presence.py
This commit is contained in:
Mark Haines 2014-09-30 17:55:06 +01:00
commit 9605593d11
64 changed files with 2402 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/utils.py
View file

@ -182,7 +182,11 @@ class MemoryDataStore(object):
def get_user_by_token(self, token):
try:
return self.tokens_to_users[token]
return {
"name": self.tokens_to_users[token],
"admin": 0,
"device_id": None,
}
except:
raise StoreError(400, "User does not exist.")
@ -277,7 +281,10 @@ class MemoryDataStore(object):
return defer.succeed("invite")
def get_ops_levels(self, room_id):
return defer.succeed((5, 5))
return defer.succeed((5, 5, 5))
def insert_client_ip(self, user, device_id, access_token, ip, user_agent):
return defer.succeed(None)
def _format_call(args, kwargs):