summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-09-27 17:08:50 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-09-27 17:18:10 +0100
commitce2448efbe470f6c652a5c74bfd77aca80f0b4ec (patch)
tree2e4f48244eef7fe7b751dca8fce07e0ba6eafb6b
parents/return/defer.returnValue/ (diff)
downloadsynapse-ce2448efbe470f6c652a5c74bfd77aca80f0b4ec.tar.xz
Fix git messing up
-rw-r--r--tests/rest/client/v2_alpha/test_account.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/rest/client/v2_alpha/test_account.py b/tests/rest/client/v2_alpha/test_account.py

index da68e4539d..32adf88c35 100644 --- a/tests/rest/client/v2_alpha/test_account.py +++ b/tests/rest/client/v2_alpha/test_account.py
@@ -23,8 +23,8 @@ from email.parser import Parser import pkg_resources import synapse.rest.admin -from synapse.api.constants import LoginType -from synapse.rest.client.v1 import login +from synapse.api.constants import LoginType, Membership +from synapse.rest.client.v1 import login, room from synapse.rest.client.v2_alpha import account, register from tests import unittest @@ -248,6 +248,7 @@ class DeactivateTestCase(unittest.HomeserverTestCase): synapse.rest.admin.register_servlets_for_client_rest_resource, login.register_servlets, account.register_servlets, + room.register_servlets, ] def make_homeserver(self, reactor, clock):