summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-08-08 17:10:53 +0100
committerGitHub <noreply@github.com>2018-08-08 17:10:53 +0100
commit8521ae13e33301e06eb1fb5b36a8eef4e7f6453f (patch)
treefa2749c97eb5ada93e0d7dd620e429b19d00664f /tests
parentMerge pull request #3662 from matrix-org/neilj/reserved_users (diff)
parentDon't expose default_room_version as config opt (diff)
downloadsynapse-8521ae13e33301e06eb1fb5b36a8eef4e7f6453f.tar.xz
Merge pull request #3654 from matrix-org/rav/room_versions
Support for room versioning
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index e7894819c0..151db4b890 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -77,6 +77,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