diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-08 16:13:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 16:13:03 +0000 |
commit | 5298d79fb58b8792bc0dd3b4a34b84339d4f4845 (patch) | |
tree | daedd358c898cd879bb5eb365f0f466d6944883b /tests/utils.py | |
parent | Merge branch 'develop' into neilj/disable_hs (diff) | |
parent | Merge pull request #3654 from matrix-org/rav/room_versions (diff) | |
download | synapse-5298d79fb58b8792bc0dd3b4a34b84339d4f4845.tar.xz |
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py index 5e4d77920c..d378de7b41 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -79,6 +79,10 @@ def setup_test_homeserver(name="test", datastore=None, config=None, reactor=None config.max_mau_value = 50 config.mau_limits_reserved_threepids = [] + # we need a sane default_room_version, otherwise attempts to create rooms will + # fail. + config.default_room_version = "1" + # disable user directory updates, because they get done in the # background, which upsets the test runner. config.update_user_directory = False |