From f8e3e9439882b8210432d5a5cfcd26b93228cd18 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 4 Mar 2022 17:22:07 +0000 Subject: [PATCH 1/5] Remove build flag and update comment for knocking tests --- tests/msc2403_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/msc2403_test.go b/tests/msc2403_test.go index 62077376..b2e4a768 100644 --- a/tests/msc2403_test.go +++ b/tests/msc2403_test.go @@ -1,7 +1,5 @@ -// +build msc2403 - -// This file contains tests for knocking, a currently experimental feature defined by MSC2403, -// which you can read here: https://github.com/matrix-org/matrix-doc/pull/2403 +// This file contains Client-Server and Federation API tests for knocking +// https://spec.matrix.org/1.2/client-server-api/#knocking-on-rooms package tests From 92d148e0adb5a537f863a8ddc335d1422c34d938 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 4 Mar 2022 17:22:52 +0000 Subject: [PATCH 2/5] Rename msc2403_test -> knocking_test --- tests/{msc2403_test.go => knocking_test.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{msc2403_test.go => knocking_test.go} (100%) diff --git a/tests/msc2403_test.go b/tests/knocking_test.go similarity index 100% rename from tests/msc2403_test.go rename to tests/knocking_test.go From cfabfd870cec56a34a7bcdcf24312444492023b5 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 4 Mar 2022 17:23:42 +0000 Subject: [PATCH 3/5] Remove msc2403 build flag from Synapse dockerfile --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a3f49dec..98d639ee 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: matrix: include: - homeserver: Synapse - tags: synapse_blacklist,msc2403,msc3083 + tags: synapse_blacklist,msc3083 - homeserver: Dendrite tags: msc2836 dendrite_blacklist From 9933ee46c72d8495f6e62146225c8cd9b4c5b4c5 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 4 Mar 2022 17:24:46 +0000 Subject: [PATCH 4/5] Remove msc2403_enabled experimental flag from Synapse config The flag no longer exists since Synapse v1.54.0. --- dockerfiles/synapse/homeserver.yaml | 2 -- dockerfiles/synapse/workers-shared.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/dockerfiles/synapse/homeserver.yaml b/dockerfiles/synapse/homeserver.yaml index 2826ca53..95eb922b 100644 --- a/dockerfiles/synapse/homeserver.yaml +++ b/dockerfiles/synapse/homeserver.yaml @@ -104,8 +104,6 @@ AS_REGISTRATION_FILES ## Experimental Features ## experimental_features: - # Enable knocking support - msc2403_enabled: true # Enable spaces support spaces_enabled: true # Enable history backfilling support diff --git a/dockerfiles/synapse/workers-shared.yaml b/dockerfiles/synapse/workers-shared.yaml index e217dcc2..9f4aa625 100644 --- a/dockerfiles/synapse/workers-shared.yaml +++ b/dockerfiles/synapse/workers-shared.yaml @@ -62,8 +62,6 @@ federation_rr_transactions_per_room_per_second: 9999 ## Experimental Features ## experimental_features: - # Enable knocking support - msc2403_enabled: true # Enable history backfilling support msc2716_enabled: true # Enable spaces support From 3d70e8fa0694a637d861f8a7d9f1f349869d8264 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 10 Mar 2022 17:12:37 +0000 Subject: [PATCH 5/5] Blacklist knocking tests on Dendrite --- tests/knocking_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/knocking_test.go b/tests/knocking_test.go index b2e4a768..258306fa 100644 --- a/tests/knocking_test.go +++ b/tests/knocking_test.go @@ -1,3 +1,7 @@ +// Knocking is not yet implemented on Dendrite +//go:build !dendrite_blacklist +// +build !dendrite_blacklist + // This file contains Client-Server and Federation API tests for knocking // https://spec.matrix.org/1.2/client-server-api/#knocking-on-rooms