diff options
author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /tests/appservice/test_appservice.py | |
parent | Copy dict in update_membership too (diff) | |
parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'tests/appservice/test_appservice.py')
-rw-r--r-- | tests/appservice/test_appservice.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py index 7586ea9053..5b2b95860a 100644 --- a/tests/appservice/test_appservice.py +++ b/tests/appservice/test_appservice.py @@ -36,6 +36,7 @@ class ApplicationServiceTestCase(unittest.TestCase): id="unique_identifier", url="some_url", token="some_token", + hostname="matrix.org", # only used by get_groups_for_user namespaces={ ApplicationService.NS_USERS: [], ApplicationService.NS_ROOMS: [], |