From 8c26f16c76b475e0ace7b58920d90368b180454c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:56:22 +0100
Subject: Fix up unit tests (#10723)

These were broken in an incorrect merge of GHSA-jj53-8fmw-f2w2 (cb35df9)
---
 changelog.d/10723.bugfix                  |  1 +
 tests/rest/client/v2_alpha/test_groups.py | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/10723.bugfix

diff --git a/changelog.d/10723.bugfix b/changelog.d/10723.bugfix
new file mode 100644
index 0000000000..e6ffdc9512
--- /dev/null
+++ b/changelog.d/10723.bugfix
@@ -0,0 +1 @@
+Fix unauthorised exposure of room metadata to communities.
diff --git a/tests/rest/client/v2_alpha/test_groups.py b/tests/rest/client/v2_alpha/test_groups.py
index bfa9336baa..ad0425ae65 100644
--- a/tests/rest/client/v2_alpha/test_groups.py
+++ b/tests/rest/client/v2_alpha/test_groups.py
@@ -1,5 +1,18 @@
-from synapse.rest.client.v1 import room
-from synapse.rest.client.v2_alpha import groups
+# Copyright 2021 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from synapse.rest.client import groups, room
 
 from tests import unittest
 from tests.unittest import override_config
-- 
cgit 1.4.1