summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
committerErik Johnston <erik@matrix.org>2016-05-18 11:38:24 +0100
commit5941346c5b8b0847a0adc643e80ba6ba8669c149 (patch)
tree0f7bd386246268177ca45ee4b6ddd992b333e085 /tests/utils.py
parentCorrectly order recents (diff)
parentAdd desc to get_presence_for_users (diff)
downloadsynapse-5941346c5b8b0847a0adc643e80ba6ba8669c149.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/paginate_sync
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 9d7978a642..59d985b5f2 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -50,7 +50,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): config.enable_registration = True config.macaroon_secret_key = "not even a little secret" config.expire_access_token = False - config.server_name = "server.under.test" + config.server_name = name config.trusted_third_party_id_servers = [] config.room_invite_state_types = []