Merge branch 'develop' of github.com:matrix-org/synapse into anoa/hom…

…eserver_copy * 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
matrix-org · Nov 14, 2019 · 473aced · 473aced
2 parents e1648dc + a42567e
commit 473aced
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/changelog.d/6220.feature b/changelog.d/6220.feature
@@ -0,0 +1 @@
+Increase default room version from 4 to 5, thereby enforcing server key validity period checks.
diff --git a/changelog.d/6361.misc b/changelog.d/6361.misc
@@ -0,0 +1 @@
+Temporarily blacklist the failing unit test PurgeRoomTestCase.test_purge_room.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -72,7 +72,7 @@ pid_file: DATADIR/homeserver.pid
 # For example, for room version 1, default_room_version should be set
 # to "1".
 #
-#default_room_version: "4"
+#default_room_version: "5"
 
 # The GC threshold parameters to pass to `gc.set_threshold`, if defined
 #

diff --git a/synapse/config/server.py b/synapse/config/server.py
@@ -41,7 +41,7 @@
 # in the list.
 DEFAULT_BIND_ADDRESSES = ["::", "0.0.0.0"]
 
-DEFAULT_ROOM_VERSION = "4"
+DEFAULT_ROOM_VERSION = "5"
 
 ROOM_COMPLEXITY_TOO_GREAT = (
     "Your homeserver is unable to join rooms this large or complex. "

diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py
@@ -641,3 +641,5 @@ def test_purge_room(self):
             )
 
             self.assertEqual(count, 0, msg="Rows not purged in {}".format(table))
+
+    test_purge_room.skip = "Disabled because it's currently broken"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Increase default room version from 4 to 5, thereby enforcing server key validity period checks.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Temporarily blacklist the failing unit test PurgeRoomTestCase.test_purge_room.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -641,3 +641,5 @@ def test_purge_room(self):
		)

		self.assertEqual(count, 0, msg="Rows not purged in {}".format(table))

		test_purge_room.skip = "Disabled because it's currently broken"