diff options
| author | Neil Johnson <neil@matrix.org> | 2019-06-06 17:20:10 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-06-06 17:20:10 +0100 |
| commit | 027d8d70f2b94acc80f3202f9198cf549fcf805c (patch) | |
| tree | b73ddf48a1316d3626e31221f4ccb27de5113698 | |
| parent | Merge pull request #5089 from dnaf/m-heroes-empty-room-name (diff) | |
| download | synapse-027d8d70f2b94acc80f3202f9198cf549fcf805c.tar.xz | |
Set default room version to v4.
| -rw-r--r-- | changelog.d/5379.feature | 1 | ||||
| -rw-r--r-- | synapse/config/server.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_cleanup_extrems.py | 6 | ||||
| -rw-r--r-- | tests/utils.py | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/changelog.d/5379.feature b/changelog.d/5379.feature new file mode 100644 index 0000000000..7b64786fe6 --- /dev/null +++ b/changelog.d/5379.feature @@ -0,0 +1 @@ +Set default room version to v4. diff --git a/synapse/config/server.py b/synapse/config/server.py index 334921d421..7d56e2d141 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -36,7 +36,7 @@ logger = logging.Logger(__name__) # in the list. DEFAULT_BIND_ADDRESSES = ['::', '0.0.0.0'] -DEFAULT_ROOM_VERSION = "1" +DEFAULT_ROOM_VERSION = "4" class ServerConfig(Config): diff --git a/tests/storage/test_cleanup_extrems.py b/tests/storage/test_cleanup_extrems.py index 6dda66ecd3..6aa8b8b3c6 100644 --- a/tests/storage/test_cleanup_extrems.py +++ b/tests/storage/test_cleanup_extrems.py @@ -25,6 +25,11 @@ from tests.unittest import HomeserverTestCase class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase): """Test the background update to clean forward extremities table. """ + def make_homeserver(self, reactor, clock): + # Hack until we understand why test_forked_graph_cleanup fails with v4 + config = self.default_config() + config['default_room_version'] = '1' + return self.setup_test_homeserver(config=config) def prepare(self, reactor, clock, homeserver): self.store = homeserver.get_datastore() @@ -220,6 +225,7 @@ class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase): Where SF* are soft failed, and with them A, B and C marked as extremities. This should resolve to B and C being marked as extremity. """ + # Create the room graph event_id_a = self.create_and_send_event() event_id_b = self.create_and_send_event() diff --git a/tests/utils.py b/tests/utils.py index 200c1ceabe..7264be3a53 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -174,7 +174,7 @@ def default_config(name, parse=False): "use_frozen_dicts": False, # We need a sane default_room_version, otherwise attempts to create # rooms will fail. - "default_room_version": "1", + "default_room_version": "4", # disable user directory updates, because they get done in the # background, which upsets the test runner. "update_user_directory": False, |