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/handlers/test_presencelike.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/handlers/test_presencelike.py')
-rw-r--r-- | tests/handlers/test_presencelike.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_presencelike.py b/tests/handlers/test_presencelike.py index 6eeb1bb522..bba5dd4e53 100644 --- a/tests/handlers/test_presencelike.py +++ b/tests/handlers/test_presencelike.py @@ -71,7 +71,7 @@ class PresenceProfilelikeDataTestCase(unittest.TestCase): "set_profile_displayname", ]), handlers=None, - http_server=Mock(), + resource_for_federation=Mock(), http_client=None, replication_layer=MockReplication(), ) |