summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2021-08-31 12:56:22 +0100
committerGitHub <noreply@github.com>2021-08-31 12:56:22 +0100
commit8c26f16c76b475e0ace7b58920d90368b180454c (patch)
tree601ee30083d1d8cad2a63106562d12c63d7e94c3 /tests
parentMerge pull request from GHSA-jj53-8fmw-f2w2 (diff)
downloadsynapse-8c26f16c76b475e0ace7b58920d90368b180454c.tar.xz
Fix up unit tests (#10723)
These were broken in an incorrect merge of GHSA-jj53-8fmw-f2w2 (cb35df9)
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v2_alpha/test_groups.py17
1 files changed, 15 insertions, 2 deletions
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