OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Need to prepare() the SQLiteMemoryDbPool before passing it to HomeServer constructor, as DataStore's constructor will want it ready

pull/10/head
Paul "LeoNerd" Evans 2014-09-11 15:21:15 +01:00
parent 4385eadc28
commit 493b1e6d3c
6 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/handlers/test_directory.py
View File

@ -50,16 +50,17 @@ class DirectoryTestCase(unittest.TestCase):
self.query_handlers[query_type] = handler
self.mock_federation.register_query_handler = register_query_handler
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
hs = HomeServer("test",
db_pool=SQLiteMemoryDbPool(),
db_pool=db_pool,
http_client=None,
resource_for_federation=Mock(),
replication_layer=self.mock_federation,
)
hs.handlers = DirectoryHandlers(hs)
yield hs.get_db_pool().prepare()
self.handler = hs.get_handlers().directory_handler
self.store = hs.get_datastore()

7
tests/handlers/test_presence.py
View File

@ -68,17 +68,18 @@ class PresenceStateTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
hs = HomeServer("test",
clock=MockClock(),
db_pool=SQLiteMemoryDbPool(),
db_pool=db_pool,
handlers=None,
resource_for_federation=Mock(),
http_client=None,
)
hs.handlers = JustPresenceHandlers(hs)
yield hs.get_db_pool().prepare()
self.store = hs.get_datastore()
# Mock the RoomMemberHandler

7
tests/handlers/test_profile.py
View File

@ -49,8 +49,11 @@ class ProfileTestCase(unittest.TestCase):
self.query_handlers[query_type] = handler
self.mock_federation.register_query_handler = register_query_handler
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
hs = HomeServer("test",
db_pool=SQLiteMemoryDbPool(),
db_pool=db_pool,
http_client=None,
handlers=None,
resource_for_federation=Mock(),
@ -58,8 +61,6 @@ class ProfileTestCase(unittest.TestCase):
)
hs.handlers = ProfileHandlers(hs)
yield hs.get_db_pool().prepare()
self.store = hs.get_datastore()
self.frank = hs.parse_userid("@1234ABCD:test")

9
tests/storage/test_directory.py
View File

@ -27,11 +27,12 @@ class DirectoryStoreTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
hs = HomeServer("test",
db_pool=SQLiteMemoryDbPool(),
)
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
yield hs.get_db_pool().prepare()
hs = HomeServer("test",
db_pool=db_pool,
)
self.store = DirectoryStore(hs)

7
tests/storage/test_presence.py
View File

@ -27,13 +27,14 @@ class PresenceStoreTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
hs = HomeServer("test",
clock=MockClock(),
db_pool=SQLiteMemoryDbPool(),
db_pool=db_pool,
)
yield hs.get_db_pool().prepare()
self.store = PresenceStore(hs)
self.u_apple = hs.parse_userid("@apple:test")

9
tests/storage/test_profile.py
View File

@ -27,11 +27,12 @@ class ProfileStoreTestCase(unittest.TestCase):
@defer.inlineCallbacks
def setUp(self):
hs = HomeServer("test",
db_pool=SQLiteMemoryDbPool(),
)
db_pool = SQLiteMemoryDbPool()
yield db_pool.prepare()
yield hs.get_db_pool().prepare()
hs = HomeServer("test",
db_pool=db_pool,
)
self.store = ProfileStore(hs)