diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
commit | d05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch) | |
tree | 44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /tests/rest/test_presence.py | |
parent | Created m-file-input. A directive to open a file selection dialog on whatever... (diff) | |
parent | Honour the -w flag to enable the web client at /matrix/client (diff) | |
download | synapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tests/rest/test_presence.py')
-rw-r--r-- | tests/rest/test_presence.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py index f013abbee4..91d4d1ff6c 100644 --- a/tests/rest/test_presence.py +++ b/tests/rest/test_presence.py @@ -51,7 +51,8 @@ class PresenceStateTestCase(unittest.TestCase): hs = HomeServer("test", db_pool=None, http_client=None, - http_server=self.mock_server, + resource_for_client=self.mock_server, + resource_for_federation=self.mock_server, ) def _get_user_by_token(token=None): @@ -108,7 +109,8 @@ class PresenceListTestCase(unittest.TestCase): hs = HomeServer("test", db_pool=None, http_client=None, - http_server=self.mock_server, + resource_for_client=self.mock_server, + resource_for_federation=self.mock_server ) def _get_user_by_token(token=None): @@ -183,7 +185,8 @@ class PresenceEventStreamTestCase(unittest.TestCase): hs = HomeServer("test", db_pool=None, http_client=None, - http_server=self.mock_server, + resource_for_client=self.mock_server, + resource_for_federation=self.mock_server, datastore=Mock(spec=[ "set_presence_state", "get_presence_list", |