summary refs log tree commit diff
path: root/tests/storage
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-12-03 12:31:28 +0000
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2021-12-03 12:31:28 +0000
commit8cd68b8102eeab1b525712097c1b2e9679c11896 (patch)
treeef3c2d1f709ba1ad9c236a6cef8b7ab758ed49ee /tests/storage
parentNewsfile (diff)
downloadsynapse-8cd68b8102eeab1b525712097c1b2e9679c11896.tar.xz
Revert accidental commits to develop.
Diffstat (limited to 'tests/storage')
-rw-r--r--tests/storage/test_base.py3
-rw-r--r--tests/storage/test_roommember.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py
index 3e4f0579c9..ddad44bd6c 100644
--- a/tests/storage/test_base.py
+++ b/tests/storage/test_base.py
@@ -23,8 +23,7 @@ from synapse.storage.database import DatabasePool
 from synapse.storage.engines import create_engine
 
 from tests import unittest
-from tests.server import TestHomeServer
-from tests.utils import default_config
+from tests.utils import TestHomeServer, default_config
 
 
 class SQLBaseStoreTestCase(unittest.TestCase):
diff --git a/tests/storage/test_roommember.py b/tests/storage/test_roommember.py
index 5cfdfe9b85..fccab733c0 100644
--- a/tests/storage/test_roommember.py
+++ b/tests/storage/test_roommember.py
@@ -19,8 +19,8 @@ from synapse.rest.client import login, room
 from synapse.types import UserID, create_requester
 
 from tests import unittest
-from tests.server import TestHomeServer
 from tests.test_utils import event_injection
+from tests.utils import TestHomeServer
 
 
 class RoomMemberStoreTestCase(unittest.HomeserverTestCase):