Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-03-02 05:29:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set default room version to v4. (#5379)

Browse Source 
Set default room version to v4.
This commit is contained in:
Neil Johnson 2019-06-06 20:13:47 +01:00 committed by GitHub
parent 1b8cb64393
commit a11865016e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5379.feature Normal file
View File

@ -0,0 +1 @@
Set default room version to v4.

2
docs/sample_config.yaml
View File

@ -91,7 +91,7 @@ pid_file: DATADIR/homeserver.pid
# For example, for room version 1, default_room_version should be set # For example, for room version 1, default_room_version should be set
# to "1". # to "1".
# #
#default_room_version: "1" #default_room_version: "4"
# The GC threshold parameters to pass to `gc.set_threshold`, if defined # The GC threshold parameters to pass to `gc.set_threshold`, if defined
# #

2
synapse/config/server.py
View File

@ -36,7 +36,7 @@ logger = logging.Logger(__name__)
# in the list. # in the list.
DEFAULT_BIND_ADDRESSES = ['::', '0.0.0.0'] DEFAULT_BIND_ADDRESSES = ['::', '0.0.0.0']
DEFAULT_ROOM_VERSION = "1" DEFAULT_ROOM_VERSION = "4"
class ServerConfig(Config): class ServerConfig(Config):

6
tests/storage/test_cleanup_extrems.py
View File

@ -25,6 +25,11 @@ from tests.unittest import HomeserverTestCase
class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase): class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase):
"""Test the background update to clean forward extremities table. """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): def prepare(self, reactor, clock, homeserver):
self.store = homeserver.get_datastore() 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 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. extremities. This should resolve to B and C being marked as extremity.
""" """
# Create the room graph # Create the room graph
event_id_a = self.create_and_send_event() event_id_a = self.create_and_send_event()
event_id_b = self.create_and_send_event() event_id_b = self.create_and_send_event()

3
tests/utils.py
View File

@ -31,6 +31,7 @@ from synapse.api.constants import EventTypes
from synapse.api.errors import CodeMessageException, cs_error from synapse.api.errors import CodeMessageException, cs_error
from synapse.api.room_versions import RoomVersions from synapse.api.room_versions import RoomVersions
from synapse.config.homeserver import HomeServerConfig from synapse.config.homeserver import HomeServerConfig
from synapse.config.server import DEFAULT_ROOM_VERSION
from synapse.federation.transport import server as federation_server from synapse.federation.transport import server as federation_server
from synapse.http.server import HttpServer from synapse.http.server import HttpServer
from synapse.server import HomeServer from synapse.server import HomeServer
@ -173,7 +174,7 @@ def default_config(name, parse=False):
"use_frozen_dicts": False, "use_frozen_dicts": False,
# We need a sane default_room_version, otherwise attempts to create # We need a sane default_room_version, otherwise attempts to create
# rooms will fail. # rooms will fail.
"default_room_version": "1", "default_room_version": DEFAULT_ROOM_VERSION,
# disable user directory updates, because they get done in the # disable user directory updates, because they get done in the
# background, which upsets the test runner. # background, which upsets the test runner.
"update_user_directory": False, "update_user_directory": False,